We don't need translation-block.h as the TB flags are local and the
only bits needed come from cpu-ops.h. The vmstate is a system only
concerns so we can guard against including it for linux-user.

Finally tidy up the order to keep things together with the local cpu.h
kept at the end.

Signed-off-by: Alex Bennée <[email protected]>
---
 target/m68k/cpu.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/target/m68k/cpu.c b/target/m68k/cpu.c
index c721a23b966..d849a4a90fc 100644
--- a/target/m68k/cpu.c
+++ b/target/m68k/cpu.c
@@ -19,12 +19,15 @@
  */
 
 #include "qemu/osdep.h"
+#include "accel/tcg/cpu-ops.h"
+#include "fpu/softfloat.h"
 #include "qapi/error.h"
-#include "cpu.h"
+
+#ifndef CONFIG_USER_ONLY
 #include "migration/vmstate.h"
-#include "fpu/softfloat.h"
-#include "exec/translation-block.h"
-#include "accel/tcg/cpu-ops.h"
+#endif
+
+#include "cpu.h"
 
 static void m68k_cpu_set_pc(CPUState *cs, vaddr value)
 {
-- 
2.47.3


Reply via email to