diff --git a/stubs/gdbstub.c b/stubs/gdbstub.c
index c1dbfe7fb7f2767b6fcd3cedae08b60a7466ceb1..f6a4553a310a0760682c16d5ac18a8dc092d424b 100644
--- a/stubs/gdbstub.c
+++ b/stubs/gdbstub.c
@@ -1,4 +1,6 @@
-#include "qemu-common.h"
+#include "stdbool.h"            /* bool (in exec/gdbstub.h) */
+#include "stddef.h"             /* NULL */
+#include "exec/gdbstub.h"       /* xml_builtin */
 
 const char *const xml_builtin[][2] = {
   { NULL, NULL }