diff --git a/vl.h b/vl.h
index 5091ca1..0fe94ac 100644
--- a/vl.h
+++ b/vl.h
@@ -71,6 +71,7 @@
 #else
 
 #include "cpu.h"
+#include "gdbstub.h"
 
 #endif /* !defined(QEMU_TOOL) */
 
@@ -829,10 +830,4 @@
 void readline_start(const char *prompt, int is_password,
                     ReadLineFunc *readline_func, void *opaque);
 
-/* gdbstub.c */
-
-#define DEFAULT_GDBSTUB_PORT 1234
-
-int gdbserver_start(int port);
-
 #endif /* VL_H */