3 files changed, 13 insertions, 8 deletions
diff --git a/balloon.h b/balloon.h
index c3a1ad365d..8c019eb78b 100644
--- a/balloon.h
+++ b/balloon.h
@@ -14,8 +14,6 @@
 #ifndef _QEMU_BALLOON_H
 #define _QEMU_BALLOON_H
 
-#include "cpu-defs.h"
-
 typedef void (QEMUBalloonEvent)(void *opaque, ram_addr_t target,
                                 MonitorCompletion cb, void *cb_data);
 
diff --git a/gdbstub.h b/gdbstub.h
index 5740041c76..54d753cfd4 100644
--- a/gdbstub.h
+++ b/gdbstub.h
@@ -10,6 +10,7 @@
 #define GDB_WATCHPOINT_READ      3
 #define GDB_WATCHPOINT_ACCESS    4
 
+#ifdef NEED_CPU_H
 typedef void (*gdb_syscall_complete_cb)(CPUState *env,
                                         target_ulong ret, target_ulong err);
 
@@ -21,10 +22,7 @@ int gdb_queuesig (void);
 int gdb_handlesig (CPUState *, int);
 void gdb_exit(CPUState *, int);
 void gdb_signalled(CPUState *, int);
-int gdbserver_start(int);
 void gdbserver_fork(CPUState *);
-#else
-int gdbserver_start(const char *port);
 #endif
 /* Get or set a register.  Returns the size of the register.  */
 typedef int (*gdb_reg_cb)(CPUState *env, uint8_t *buf, int reg);
@@ -33,3 +31,11 @@ void gdb_register_coprocessor(CPUState *env,
                               int num_regs, const char *xml, int g_pos);
 
 #endif
+
+#ifdef CONFIG_USER_ONLY
+int gdbserver_start(int);
+#else
+int gdbserver_start(const char *port);
+#endif
+
+#endif
diff --git a/kvm.h b/kvm.h
index fd8d0c16c8..4f77188e26 100644
--- a/kvm.h
+++ b/kvm.h
@@ -14,12 +14,12 @@
 #ifndef QEMU_KVM_H
 #define QEMU_KVM_H
 
-#include "config.h"
+#include "config-host.h"
 #include "qemu-queue.h"
 
-#ifdef CONFIG_KVM
 extern int kvm_allowed;
 
+#ifdef CONFIG_KVM
 #define kvm_enabled() (kvm_allowed)
 #else
 #define kvm_enabled() (0)
@@ -31,6 +31,7 @@ struct kvm_run;
 
 int kvm_init(int smp_cpus);
 
+#ifdef NEED_CPU_H
 int kvm_init_vcpu(CPUState *env);
 
 int kvm_cpu_exec(CPUState *env);
@@ -160,5 +161,5 @@ static inline void cpu_synchronize_post_init(CPUState *env)
         kvm_cpu_synchronize_post_init(env);
     }
 }
-
+#endif
 #endif