Index: /trunk/include/VBox/vmm/hm.h
===================================================================
--- /trunk/include/VBox/vmm/hm.h	(revision 66021)
+++ /trunk/include/VBox/vmm/hm.h	(revision 66022)
@@ -30,4 +30,5 @@
 #include <VBox/vmm/cpum.h>
 #include <VBox/vmm/vmm.h>
+#include <VBox/vmm/hm_svm.h>
 #include <iprt/mp.h>
 
@@ -151,4 +152,6 @@
                                                   uint64_t uExitInfo2);
 VMM_INT_DECL(void)              HMVmxNstGstVmExit(PVMCPU pVCpu, uint16_t uBasicExitReason);
+VMM_INT_DECL(VBOXSTRICTRC)      HMSvmVmmcall(PVMCPU pVCpu, PCPUMCTX pCtx, bool *pfRipUpdated);
+VMM_INT_DECL(VBOXSTRICTRC)      HMSvmVmrun(PVMCPU pVCpu, PCPUMCTX pCtx, PSVMVMCB pVmcb, PSVMHOSTSTATE pHostState);
 
 #ifndef IN_RC
Index: /trunk/include/VBox/vmm/hm_svm.h
===================================================================
--- /trunk/include/VBox/vmm/hm_svm.h	(revision 66021)
+++ /trunk/include/VBox/vmm/hm_svm.h	(revision 66022)
@@ -29,5 +29,4 @@
 #include <VBox/types.h>
 #include <VBox/err.h>
-#include <VBox/vmm/cpumctx.h>
 #include <iprt/assert.h>
 #include <iprt/asm.h>
@@ -970,7 +969,4 @@
 
 
-VMM_INT_DECL(VBOXSTRICTRC)      HMSvmVmmcall(PVMCPU pVCpu, PCPUMCTX pCtx, bool *pfRipUpdated);
-VMM_INT_DECL(VBOXSTRICTRC)      HMSvmVmrun(PVMCPU pVCpu, PCPUMCTX pCtx, PSVMVMCB pVmcb, PSVMHOSTSTATE pHostState);
-
 /** @} */
 
Index: /trunk/src/VBox/HostDrivers/Support/linux/files_vboxdrv
===================================================================
--- /trunk/src/VBox/HostDrivers/Support/linux/files_vboxdrv	(revision 66021)
+++ /trunk/src/VBox/HostDrivers/Support/linux/files_vboxdrv	(revision 66022)
@@ -79,5 +79,4 @@
     ${PATH_ROOT}/include/VBox/SUPDrvMangling.h=>include/VBox/SUPDrvMangling.h \
     ${PATH_ROOT}/include/VBox/VBoxTpG.h=>include/VBox/VBoxTpG.h \
-    ${PATH_ROOT}/include/VBox/vmm/cpumctx.h=>include/VBox/vmm/cpumctx.h \
     ${PATH_ROOT}/include/VBox/vmm/hm_vmx.h=>include/VBox/vmm/hm_vmx.h \
     ${PATH_ROOT}/include/VBox/vmm/hm_svm.h=>include/VBox/vmm/hm_svm.h \