diff --git a/bochs/CHANGES b/bochs/CHANGES
index 55aa85675..b86d424a5 100644
--- a/bochs/CHANGES
+++ b/bochs/CHANGES
@@ -2,6 +2,7 @@
 Changes in 2.7 (Not yet released):
 
 Brief summary :
+  - Bugfixes for CPU emulation correctness (CPUID/VMX/SVM fixes to support Windows Hyper-V as guest in Bochs)
   - Improvements for the plugin handling to simplify Bochs extensions
   - Added "multiple NICs" support to the NE2000 and E1000 devices
   - Added experimental FTP service for networking modules 'vnet' and 'socket'
diff --git a/bochs/bochs.h b/bochs/bochs.h
index aa9289357..572260a6e 100644
--- a/bochs/bochs.h
+++ b/bochs/bochs.h
@@ -307,13 +307,6 @@ void CDECL bx_signal_handler(int signum);
 BOCHSAPI_MSVCONLY int bx_atexit(void);
 BOCHSAPI extern bx_debug_t bx_dbg;
 
-enum {
-#define bx_define_cpudb(model) bx_cpudb_##model,
-#include "cpudb.h"
-  bx_cpudb_model_last
-};
-#undef bx_define_cpudb
-
 #if BX_SUPPORT_SMP
   #define BX_SMP_PROCESSORS (bx_cpu_count)
 #else
diff --git a/bochs/cpu/init.cc b/bochs/cpu/init.cc
index 1e853945e..d784e4219 100644
--- a/bochs/cpu/init.cc
+++ b/bochs/cpu/init.cc
@@ -70,6 +70,13 @@ BX_CPU_C::BX_CPU_C(unsigned id): bx_cpuid(id)
 
 #include "generic_cpuid.h"
 
+enum {
+#define bx_define_cpudb(model) bx_cpudb_##model,
+#include "cpudb.h"
+  bx_cpudb_model_last
+};
+#undef bx_define_cpudb
+
 #define bx_define_cpudb(model) \
   extern bx_cpuid_t *create_ ##model##_cpuid(BX_CPU_C *cpu);