diff --git a/hw/hyperv/hyperv.c b/hw/hyperv/hyperv.c
index 49c05cfd6382..8475debf6890 100644
--- a/hw/hyperv/hyperv.c
+++ b/hw/hyperv/hyperv.c
@@ -22,7 +22,6 @@
 #include "qemu/rcu_queue.h"
 #include "hw/hyperv/hyperv.h"
 #include "qom/object.h"
-#include "exec/cpu-all.h"
 #include "exec/target_page.h"
 
 struct SynICState {
diff --git a/include/hw/hyperv/hyperv-proto.h b/include/hw/hyperv/hyperv-proto.h
index fffc5ce342f2..eb9fb4b45886 100644
--- a/include/hw/hyperv/hyperv-proto.h
+++ b/include/hw/hyperv/hyperv-proto.h
@@ -73,6 +73,18 @@
 
 #define HV_X64_SYNDBG_OPTION_USE_HCALLS         BIT(2)
 
+/*
+ * Synthetic debugger control definitions
+ */
+#define HV_SYNDBG_CONTROL_SEND              (1u << 0)
+#define HV_SYNDBG_CONTROL_RECV              (1u << 1)
+#define HV_SYNDBG_CONTROL_SEND_SIZE(ctl)    ((ctl >> 16) & 0xffff)
+#define HV_SYNDBG_STATUS_INVALID            (0)
+#define HV_SYNDBG_STATUS_SEND_SUCCESS       (1u << 0)
+#define HV_SYNDBG_STATUS_RECV_SUCCESS       (1u << 2)
+#define HV_SYNDBG_STATUS_RESET              (1u << 3)
+#define HV_SYNDBG_STATUS_SET_SIZE(st, sz)   (st | (sz << 16))
+
 /*
  * Message flags
  */
diff --git a/target/i386/kvm/hyperv-proto.h b/target/i386/kvm/hyperv-proto.h
index a9f056f2f3ee..010f8c8caafb 100644
--- a/target/i386/kvm/hyperv-proto.h
+++ b/target/i386/kvm/hyperv-proto.h
@@ -189,16 +189,4 @@
 
 #define HV_STIMER_COUNT                       4
 
-/*
- * Synthetic debugger control definitions
- */
-#define HV_SYNDBG_CONTROL_SEND              (1u << 0)
-#define HV_SYNDBG_CONTROL_RECV              (1u << 1)
-#define HV_SYNDBG_CONTROL_SEND_SIZE(ctl)    ((ctl >> 16) & 0xffff)
-#define HV_SYNDBG_STATUS_INVALID            (0)
-#define HV_SYNDBG_STATUS_SEND_SUCCESS       (1u << 0)
-#define HV_SYNDBG_STATUS_RECV_SUCCESS       (1u << 2)
-#define HV_SYNDBG_STATUS_RESET              (1u << 3)
-#define HV_SYNDBG_STATUS_SET_SIZE(st, sz)   (st | (sz << 16))
-
 #endif