aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gdbstub.c2
-rw-r--r--linux-user/exit.c1
-rw-r--r--linux-user/main.c1
-rw-r--r--linux-user/qemu.h1
-rw-r--r--linux-user/signal.c2
-rw-r--r--semihosting/arm-compat-semi.c2
-rw-r--r--target/m68k/m68k-semi.c2
-rw-r--r--target/nios2/nios2-semi.c2
8 files changed, 8 insertions, 5 deletions
diff --git a/gdbstub.c b/gdbstub.c
index 5d8e6ae..36b85aa 100644
--- a/gdbstub.c
+++ b/gdbstub.c
@@ -31,13 +31,13 @@
#include "qemu/cutils.h"
#include "qemu/module.h"
#include "trace/trace-root.h"
+#include "exec/gdbstub.h"
#ifdef CONFIG_USER_ONLY
#include "qemu.h"
#else
#include "monitor/monitor.h"
#include "chardev/char.h"
#include "chardev/char-fe.h"
-#include "exec/gdbstub.h"
#include "hw/cpu/cluster.h"
#include "hw/boards.h"
#endif
diff --git a/linux-user/exit.c b/linux-user/exit.c
index 68a3a6f..fa6ef0b 100644
--- a/linux-user/exit.c
+++ b/linux-user/exit.c
@@ -17,6 +17,7 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include "qemu/osdep.h"
+#include "exec/gdbstub.h"
#include "qemu.h"
#include "user-internals.h"
#ifdef CONFIG_GPROF
diff --git a/linux-user/main.c b/linux-user/main.c
index 9edc0b2..5ce17e4 100644
--- a/linux-user/main.c
+++ b/linux-user/main.c
@@ -40,6 +40,7 @@
#include "qemu/module.h"
#include "qemu/plugin.h"
#include "exec/exec-all.h"
+#include "exec/gdbstub.h"
#include "tcg/tcg.h"
#include "qemu/timer.h"
#include "qemu/envlist.h"
diff --git a/linux-user/qemu.h b/linux-user/qemu.h
index 92290a5..fda90fc 100644
--- a/linux-user/qemu.h
+++ b/linux-user/qemu.h
@@ -11,7 +11,6 @@
#include "syscall_defs.h"
#include "target_syscall.h"
-#include "exec/gdbstub.h"
/*
* This is the size of the host kernel's sigset_t, needed where we make
diff --git a/linux-user/signal.c b/linux-user/signal.c
index 6af6612..f8346f5 100644
--- a/linux-user/signal.c
+++ b/linux-user/signal.c
@@ -18,6 +18,8 @@
*/
#include "qemu/osdep.h"
#include "qemu/bitops.h"
+#include "exec/gdbstub.h"
+
#include <sys/ucontext.h>
#include <sys/resource.h>
diff --git a/semihosting/arm-compat-semi.c b/semihosting/arm-compat-semi.c
index 1c29146..01badea 100644
--- a/semihosting/arm-compat-semi.c
+++ b/semihosting/arm-compat-semi.c
@@ -37,12 +37,12 @@
#include "semihosting/console.h"
#include "semihosting/common-semi.h"
#include "qemu/timer.h"
+#include "exec/gdbstub.h"
#ifdef CONFIG_USER_ONLY
#include "qemu.h"
#define COMMON_SEMI_HEAP_SIZE (128 * 1024 * 1024)
#else
-#include "exec/gdbstub.h"
#include "qemu/cutils.h"
#ifdef TARGET_ARM
#include "hw/arm/boot.h"
diff --git a/target/m68k/m68k-semi.c b/target/m68k/m68k-semi.c
index d919245..44ec7e4 100644
--- a/target/m68k/m68k-semi.c
+++ b/target/m68k/m68k-semi.c
@@ -20,11 +20,11 @@
#include "qemu/osdep.h"
#include "cpu.h"
+#include "exec/gdbstub.h"
#if defined(CONFIG_USER_ONLY)
#include "qemu.h"
#define SEMIHOSTING_HEAP_SIZE (128 * 1024 * 1024)
#else
-#include "exec/gdbstub.h"
#include "exec/softmmu-semi.h"
#include "hw/boards.h"
#endif
diff --git a/target/nios2/nios2-semi.c b/target/nios2/nios2-semi.c
index e508b2f..fe5598b 100644
--- a/target/nios2/nios2-semi.c
+++ b/target/nios2/nios2-semi.c
@@ -24,11 +24,11 @@
#include "qemu/osdep.h"
#include "cpu.h"
+#include "exec/gdbstub.h"
#if defined(CONFIG_USER_ONLY)
#include "qemu.h"
#else
#include "qemu-common.h"
-#include "exec/gdbstub.h"
#include "exec/softmmu-semi.h"
#endif
#include "qemu/log.h"