Adding VBoxGuestCoreTypes.h for avoiding having to include VMMDev.h from VBoxGuestLib.h. Dropped a few unnecessary VMMDev.h includes here and there.

git-svn-id: https://www.virtualbox.org/svn/vbox/trunk@68630 cfe28804-0f27-0410-a406-dd0f0b0b656f

26 files changed, 69 insertions, 31 deletions

diff --git a/src/VBox/Additions/WINNT/Graphics/Video/common/xpdm/VBoxVideoIOCTL.h b/src/VBox/Additions/WINNT/Graphics/Video/common/xpdm/VBoxVideoIOCTL.h
index fa1ed9cd058..6547fbccdfc 100644
--- a/src/VBox/Additions/WINNT/Graphics/Video/common/xpdm/VBoxVideoIOCTL.h
+++ b/src/VBox/Additions/WINNT/Graphics/Video/common/xpdm/VBoxVideoIOCTL.h
@@ -19,7 +19,7 @@
 #ifndef VBOXVIDEOIOCTL_H
 #define VBOXVIDEOIOCTL_H
 
-#include <VBox/VMMDev.h>
+#include <VBox/VMMDev.h> /* VBVAMEMORY */
 #include <HGSMI.h>
 
 /* ==================== Virtual Box specific VRP's ==================== */
diff --git a/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/VBoxUhgsmiBase.cpp b/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/VBoxUhgsmiBase.cpp
index 8cb67cfd52a..db4c0ebee1e 100644
--- a/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/VBoxUhgsmiBase.cpp
+++ b/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/VBoxUhgsmiBase.cpp
@@ -16,6 +16,8 @@
  */
 
 #include "VBoxDispD3DCmn.h"
+#include <VBox/VMMDev.h>  /* for HGCMFunctionParameter */
+
 
 DECLCALLBACK(int) vboxUhgsmiBaseEscBufferLock(PVBOXUHGSMI_BUFFER pBuf, uint32_t offLock, uint32_t cbLock,
                                               VBOXUHGSMI_BUFFER_LOCK_FLAGS fFlags, void**pvLock)
diff --git a/src/VBox/Additions/WINNT/Graphics/Video/mp/common/VBoxMPHGSMI.cpp b/src/VBox/Additions/WINNT/Graphics/Video/mp/common/VBoxMPHGSMI.cpp
index 22df1e2a831..409c776c96b 100644
--- a/src/VBox/Additions/WINNT/Graphics/Video/mp/common/VBoxMPHGSMI.cpp
+++ b/src/VBox/Additions/WINNT/Graphics/Video/mp/common/VBoxMPHGSMI.cpp
@@ -17,7 +17,6 @@
 
 #include "VBoxMPHGSMI.h"
 #include "VBoxMPCommon.h"
-#include <VBox/VMMDev.h>
 #include <iprt/alloc.h>
 
 static DECLCALLBACK(void *) hgsmiEnvAlloc(void *pvEnv, HGSMISIZE cb)
diff --git a/src/VBox/Additions/WINNT/Graphics/Video/mp/common/VBoxMPHGSMI.h b/src/VBox/Additions/WINNT/Graphics/Video/mp/common/VBoxMPHGSMI.h
index fe322a25606..a4b8ce15151 100644
--- a/src/VBox/Additions/WINNT/Graphics/Video/mp/common/VBoxMPHGSMI.h
+++ b/src/VBox/Additions/WINNT/Graphics/Video/mp/common/VBoxMPHGSMI.h
@@ -26,4 +26,4 @@ void VBoxSetupDisplaysHGSMI(PVBOXMP_COMMON pCommon, PHYSICAL_ADDRESS phVRAM, uin
 void VBoxFreeDisplaysHGSMI(PVBOXMP_COMMON pCommon);
 RT_C_DECLS_END
 
-#endif /*VBOXMPHGSMI_H*/
+#endif /*!VBOXMPHGSMI_H*/
diff --git a/src/VBox/Additions/WINNT/Graphics/Video/mp/common/VBoxMPUtils.cpp b/src/VBox/Additions/WINNT/Graphics/Video/mp/common/VBoxMPUtils.cpp
index 94a42d307f9..9c2e99c7ac7 100644
--- a/src/VBox/Additions/WINNT/Graphics/Video/mp/common/VBoxMPUtils.cpp
+++ b/src/VBox/Additions/WINNT/Graphics/Video/mp/common/VBoxMPUtils.cpp
@@ -1,5 +1,4 @@
 /* $Id$ */
-
 /** @file
  * VBox Miniport utils
  */
diff --git a/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPMisc.cpp b/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPMisc.cpp
index a072a90fc20..d6a8929c102 100644
--- a/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPMisc.cpp
+++ b/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPMisc.cpp
@@ -17,6 +17,7 @@
 
 #include "VBoxMPWddm.h"
 #include <VBoxVideoVBE.h>
+#include <iprt/param.h>
 #include <stdio.h>
 
 /* simple handle -> value table API */
@@ -68,7 +69,7 @@ NTSTATUS vboxWddmHTableRealloc(PVBOXWDDM_HTABLE pTbl, uint32_t cNewSize)
         pTbl->paData = pvNewData;
         return STATUS_SUCCESS;
     }
-    else if (cNewSize >= pTbl->cData)
+    if (cNewSize >= pTbl->cData)
     {
         AssertFailed();
         return STATUS_NOT_IMPLEMENTED;
diff --git a/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPVModes.cpp b/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPVModes.cpp
index 41169cb64f2..067aab2ebb2 100644
--- a/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPVModes.cpp
+++ b/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPVModes.cpp
@@ -17,8 +17,9 @@
 
 #include "VBoxMPWddm.h"
 #include "common/VBoxMPCommon.h"
+#include <iprt/param.h> /* PAGE_OFFSET_MASK */
 
-#include <stdio.h>
+#include <stdio.h> /* for swprintf */
 
 
 int VBoxVModesInit(VBOX_VMODES *pModes, uint32_t cTargets)
diff --git a/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPWddm.cpp b/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPWddm.cpp
index 0b3591e3207..769e1d47dfd 100644
--- a/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPWddm.cpp
+++ b/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPWddm.cpp
@@ -22,9 +22,10 @@
 #include "VBoxMPVidPn.h"
 
 #include <iprt/asm.h>
-//#include <iprt/initterm.h>
+#include <iprt/param.h>
 
 #include <VBox/VBoxGuestLib.h>
+#include <VBox/VMMDev.h> /* for VMMDevVideoSetVisibleRegion */
 #include <VBoxVideo.h>
 #include <wingdi.h> /* needed for RGNDATA definition */
 #include <VBoxDisplay.h> /* this is from Additions/WINNT/include/ to include escape codes */
diff --git a/src/VBox/Additions/WINNT/Mouse/NT5/VBoxMF.h b/src/VBox/Additions/WINNT/Mouse/NT5/VBoxMF.h
index 9df98a0b166..b36c62031cb 100644
--- a/src/VBox/Additions/WINNT/Mouse/NT5/VBoxMF.h
+++ b/src/VBox/Additions/WINNT/Mouse/NT5/VBoxMF.h
@@ -30,7 +30,7 @@ RT_C_DECLS_BEGIN
 #include <ntddkbd.h>
 #include <ntdd8042.h>
 RT_C_DECLS_END
-#include <VBox/VMMDev.h>
+#include <VBox/VMMDev.h> /* for VMMDevReqMouseStatus */
 
 #define IOCTL_INTERNAL_MOUSE_CONNECT CTL_CODE(FILE_DEVICE_MOUSE, 0x0080, METHOD_NEITHER, FILE_ANY_ACCESS)
 
diff --git a/src/VBox/Additions/WINNT/SharedFolders/np/vboxmrxnp.cpp b/src/VBox/Additions/WINNT/SharedFolders/np/vboxmrxnp.cpp
index 5c4419a14bd..09207739601 100644
--- a/src/VBox/Additions/WINNT/SharedFolders/np/vboxmrxnp.cpp
+++ b/src/VBox/Additions/WINNT/SharedFolders/np/vboxmrxnp.cpp
@@ -15,6 +15,9 @@
  * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
  */
 
+/*********************************************************************************************************************************
+*   Header Files                                                                                                                 *
+*********************************************************************************************************************************/
 #include <iprt/win/windows.h>
 #include <winsvc.h>
 #include <winnetwk.h>
@@ -22,14 +25,13 @@
 #include <devioctl.h>
 #include <stdio.h>
 
-#include "..\driver\vbsfshared.h"
+#include "../driver/vbsfshared.h"
 
 #include <iprt/alloc.h>
 #include <iprt/initterm.h>
 #include <iprt/string.h>
 #include <iprt/log.h>
 #include <VBox/version.h>
-#include <VBox/VMMDev.h>
 #include <VBox/VBoxGuestLib.h>
 #include <VBox/Log.h>
 
diff --git a/src/VBox/Additions/WINNT/VBoxCredProv/VBoxCredProvPoller.cpp b/src/VBox/Additions/WINNT/VBoxCredProv/VBoxCredProvPoller.cpp
index a4bd9a34d69..f9ddf99b282 100644
--- a/src/VBox/Additions/WINNT/VBoxCredProv/VBoxCredProvPoller.cpp
+++ b/src/VBox/Additions/WINNT/VBoxCredProv/VBoxCredProvPoller.cpp
@@ -23,7 +23,6 @@
 
 #include <VBox/VBoxGuest.h>
 #include <VBox/VBoxGuestLib.h>
-#include <VBox/VMMDev.h>
 #include <iprt/string.h>
 
 #include "VBoxCredProvProvider.h"
diff --git a/src/VBox/Additions/WINNT/VBoxGINA/Dialog.cpp b/src/VBox/Additions/WINNT/VBoxGINA/Dialog.cpp
index 48d12d9601b..3b516efd2e2 100644
--- a/src/VBox/Additions/WINNT/VBoxGINA/Dialog.cpp
+++ b/src/VBox/Additions/WINNT/VBoxGINA/Dialog.cpp
@@ -20,6 +20,7 @@
 #include <stdio.h>      /* Needed for swprintf() */
 
 #include <VBox/VBoxGuestLib.h>
+#include <VBox/err.h>
 
 #include "Dialog.h"
 #include "WinWlx.h"
diff --git a/src/VBox/Additions/WINNT/VBoxGINA/VBoxGINA.cpp b/src/VBox/Additions/WINNT/VBoxGINA/VBoxGINA.cpp
index fe128e2a3a5..419f79ac6eb 100644
--- a/src/VBox/Additions/WINNT/VBoxGINA/VBoxGINA.cpp
+++ b/src/VBox/Additions/WINNT/VBoxGINA/VBoxGINA.cpp
@@ -20,6 +20,7 @@
 #include <iprt/buildconfig.h>
 #include <iprt/initterm.h>
 #include <iprt/ldr.h>
+#include <iprt/err.h>
 
 #include <VBox/VBoxGuestLib.h>
 
diff --git a/src/VBox/Additions/WINNT/VBoxHook/VBoxHook.cpp b/src/VBox/Additions/WINNT/VBoxHook/VBoxHook.cpp
index b93533b646d..a67280aa916 100644
--- a/src/VBox/Additions/WINNT/VBoxHook/VBoxHook.cpp
+++ b/src/VBox/Additions/WINNT/VBoxHook/VBoxHook.cpp
@@ -22,7 +22,9 @@
 #include <iprt/win/windows.h>
 #include <VBoxHook.h>
 #include <VBox/VBoxGuestLib.h>
-#include <stdio.h>
+#ifdef DEBUG
+# include <stdio.h>
+#endif
 
 
 /*********************************************************************************************************************************
diff --git a/src/VBox/Additions/WINNT/VBoxTray/VBoxClipboard.cpp b/src/VBox/Additions/WINNT/VBoxTray/VBoxClipboard.cpp
index 242a00d8b24..61093456634 100644
--- a/src/VBox/Additions/WINNT/VBoxTray/VBoxClipboard.cpp
+++ b/src/VBox/Additions/WINNT/VBoxTray/VBoxClipboard.cpp
@@ -15,6 +15,9 @@
  * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
  */
 
+/*********************************************************************************************************************************
+*   Header Files                                                                                                                 *
+*********************************************************************************************************************************/
 #include "VBoxTray.h"
 #include "VBoxHelpers.h"
 
@@ -24,14 +27,17 @@
 #include <VBox/HostServices/VBoxClipboardSvc.h>
 #include <strsafe.h>
 
-#include <VBox/VMMDev.h>
-#ifdef DEBUG
+#ifdef DEBUG /** @todo r=bird: these are all default values. sigh. */
 # define LOG_ENABLED
 # define LOG_GROUP LOG_GROUP_SHARED_CLIPBOARD
 #endif
 #include <VBox/log.h>
 
- /* Dynamically load clipboard functions from User32.dll. */
+
+/*********************************************************************************************************************************
+*   Structures and Typedefs                                                                                                      *
+*********************************************************************************************************************************/
+/* Dynamically load clipboard functions from User32.dll. */
 typedef BOOL WINAPI FNADDCLIPBOARDFORMATLISTENER(HWND);
 typedef FNADDCLIPBOARDFORMATLISTENER *PFNADDCLIPBOARDFORMATLISTENER;
 
@@ -55,12 +61,17 @@ typedef struct _VBOXCLIPBOARDCONTEXT
     PFNREMOVECLIPBOARDFORMATLISTENER pfnRemoveClipboardFormatListener;
 } VBOXCLIPBOARDCONTEXT, *PVBOXCLIPBOARDCONTEXT;
 
+enum { CBCHAIN_TIMEOUT = 5000 /* ms */ };
+
+
+/*********************************************************************************************************************************
+*   Header Files                                                                                                                 *
+*********************************************************************************************************************************/
 /** Static since it is the single instance. Directly used in the windows proc. */
 static VBOXCLIPBOARDCONTEXT g_Ctx = { NULL };
 
 static char s_szClipWndClassName[] = "VBoxSharedClipboardClass";
 
-enum { CBCHAIN_TIMEOUT = 5000 /* ms */ };
 
 static void vboxClipboardInitNewAPI(VBOXCLIPBOARDCONTEXT *pCtx)
 {
diff --git a/src/VBox/Additions/WINNT/VBoxTray/VBoxDisplay.cpp b/src/VBox/Additions/WINNT/VBoxTray/VBoxDisplay.cpp
index 0d92b7287e9..d5f33310eea 100644
--- a/src/VBox/Additions/WINNT/VBoxTray/VBoxDisplay.cpp
+++ b/src/VBox/Additions/WINNT/VBoxTray/VBoxDisplay.cpp
@@ -14,29 +14,35 @@
  * VirtualBox OSE distribution. VirtualBox OSE is distributed in the
  * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
  */
+
+
+/*********************************************************************************************************************************
+*   Header Files                                                                                                                 *
+*********************************************************************************************************************************/
 #include "VBoxTray.h"
 #include "VBoxHelpers.h"
 #include "VBoxSeamless.h"
 
-#include <malloc.h>
-
+#include <iprt/alloca.h>
 #include <iprt/assert.h>
 #ifdef VBOX_WITH_WDDM
 # include <iprt/asm.h>
 #endif
 
-#ifdef DEBUG
+#ifdef DEBUG /** @todo r=bird: these are all default values. sigh. */
 # define LOG_ENABLED
 # define LOG_GROUP LOG_GROUP_DEFAULT
 #endif
 #include <VBox/log.h>
-#include <VBox/VMMDev.h>
+#include <VBox/VMMDev.h> /* for VMMDEV_EVENT_DISPLAY_CHANGE_REQUEST & VMMDEV_EVENT_MOUSE_CAPABILITIES_CHANGED */
 
 #include <VBoxDisplay.h>
 #include <VBoxHook.h>
 
 
-
+/*********************************************************************************************************************************
+*   Structures and Typedefs                                                                                                      *
+*********************************************************************************************************************************/
 typedef struct _VBOXDISPLAYCONTEXT
 {
     const VBOXSERVICEENV *pEnv;
@@ -49,8 +55,6 @@ typedef struct _VBOXDISPLAYCONTEXT
     VBOXDISPIF dispIf;
 } VBOXDISPLAYCONTEXT, *PVBOXDISPLAYCONTEXT;
 
-static VBOXDISPLAYCONTEXT g_Ctx = { 0 };
-
 typedef enum
 {
     VBOXDISPLAY_DRIVER_TYPE_UNKNOWN = 0,
@@ -58,7 +62,18 @@ typedef enum
     VBOXDISPLAY_DRIVER_TYPE_WDDM    = 2
 } VBOXDISPLAY_DRIVER_TYPE;
 
-static VBOXDISPLAY_DRIVER_TYPE getVBoxDisplayDriverType (VBOXDISPLAYCONTEXT *pCtx);
+
+/*********************************************************************************************************************************
+*   Global Variables                                                                                                             *
+*********************************************************************************************************************************/
+static VBOXDISPLAYCONTEXT g_Ctx = { 0 };
+
+
+/*********************************************************************************************************************************
+*   Internal Functions                                                                                                           *
+*********************************************************************************************************************************/
+static VBOXDISPLAY_DRIVER_TYPE getVBoxDisplayDriverType(VBOXDISPLAYCONTEXT *pCtx);
+
 
 static DECLCALLBACK(int) VBoxDisplayInit(const PVBOXSERVICEENV pEnv, void **ppInstance)
 {
@@ -550,8 +565,8 @@ static BOOL ResizeDisplayDevice(PVBOXDISPLAYCONTEXT pCtx,
 
     LogFlowFunc(("ResizeDisplayDevice: Found total %d devices. err %d\n", NumDevices, GetLastError ()));
 
-    DISPLAY_DEVICE *paDisplayDevices = (DISPLAY_DEVICE *)alloca (sizeof (DISPLAY_DEVICE) * NumDevices);
-    DEVMODE *paDeviceModes = (DEVMODE *)alloca (sizeof (DEVMODE) * NumDevices);
+    DISPLAY_DEVICE *paDisplayDevices = (DISPLAY_DEVICE *)alloca(sizeof (DISPLAY_DEVICE) * NumDevices);
+    DEVMODE *paDeviceModes = (DEVMODE *)alloca(sizeof (DEVMODE) * NumDevices);
     RECTL *paRects = (RECTL *)alloca (sizeof (RECTL) * NumDevices);
     DWORD DevNum = 0;
     DWORD DevPrimaryNum = 0;
diff --git a/src/VBox/Additions/WINNT/VBoxTray/VBoxIPC.cpp b/src/VBox/Additions/WINNT/VBoxTray/VBoxIPC.cpp
index c96fab2079e..957bcf44820 100644
--- a/src/VBox/Additions/WINNT/VBoxTray/VBoxIPC.cpp
+++ b/src/VBox/Additions/WINNT/VBoxTray/VBoxIPC.cpp
@@ -37,8 +37,7 @@
 #include <iprt/mem.h>
 #include <iprt/process.h>
 
-#include <VBox/VMMDev.h>
-#ifdef DEBUG
+#ifdef DEBUG /** @todo r=bird: these are all default settings...  */
 # define LOG_ENABLED
 # define LOG_GROUP LOG_GROUP_DEFAULT
 #endif
diff --git a/src/VBox/Additions/WINNT/VBoxTray/VBoxSeamless.cpp b/src/VBox/Additions/WINNT/VBoxTray/VBoxSeamless.cpp
index fa3da2a54fe..b0ce02f6395 100644
--- a/src/VBox/Additions/WINNT/VBoxTray/VBoxSeamless.cpp
+++ b/src/VBox/Additions/WINNT/VBoxTray/VBoxSeamless.cpp
@@ -29,7 +29,7 @@
 # define LOG_GROUP LOG_GROUP_DEFAULT
 #endif
 #include <VBox/log.h>
-#include <VBox/VMMDev.h>
+#include <VBox/VMMDev.h> /* for VMMDEV_EVENT_SEAMLESS_MODE_CHANGE_REQUEST */
 
 #include "VBoxTray.h"
 #include "VBoxHelpers.h"
diff --git a/src/VBox/Additions/WINNT/VBoxTray/VBoxTray.cpp b/src/VBox/Additions/WINNT/VBoxTray/VBoxTray.cpp
index 15f122dfac8..23c63ae5522 100644
--- a/src/VBox/Additions/WINNT/VBoxTray/VBoxTray.cpp
+++ b/src/VBox/Additions/WINNT/VBoxTray/VBoxTray.cpp
@@ -44,6 +44,7 @@
 #include <iprt/asm.h>
 #include <iprt/buildconfig.h>
 #include <iprt/ldr.h>
+#include <iprt/path.h>
 #include <iprt/process.h>
 #include <iprt/system.h>
 #include <iprt/time.h>
diff --git a/src/VBox/Additions/WINNT/VBoxTray/VBoxVRDP.cpp b/src/VBox/Additions/WINNT/VBoxTray/VBoxVRDP.cpp
index a1e934973f5..b8a90cf1689 100644
--- a/src/VBox/Additions/WINNT/VBoxTray/VBoxVRDP.cpp
+++ b/src/VBox/Additions/WINNT/VBoxTray/VBoxVRDP.cpp
@@ -22,7 +22,7 @@
 #include "VBoxHelpers.h"
 #include "VBoxVRDP.h"
 
-#include <VBox/VMMDev.h>
+#include <VBox/VMMDev.h> /* for VMMDEV_EVENT_VRDP and VRDP_EXPERIENCE_LEVEL_XXX */
 #ifdef DEBUG
 # define LOG_ENABLED
 # define LOG_GROUP LOG_GROUP_DEFAULT
diff --git a/src/VBox/Additions/common/VBoxGuest/freebsd/files_vboxguest b/src/VBox/Additions/common/VBoxGuest/freebsd/files_vboxguest
index 9dfde1718d6..0c3eb7a2d52 100644
--- a/src/VBox/Additions/common/VBoxGuest/freebsd/files_vboxguest
+++ b/src/VBox/Additions/common/VBoxGuest/freebsd/files_vboxguest
@@ -71,6 +71,7 @@ FILES_VBOXGUEST_NOBIN=" \
     ${PATH_ROOT}/include/VBox/VMMDev.h=>include/VBox/VMMDev.h \
     ${PATH_ROOT}/include/VBox/VMMDevCoreTypes.h=>include/VBox/VMMDevCoreTypes.h \
     ${PATH_ROOT}/include/VBox/VBoxGuest.h=>include/VBox/VBoxGuest.h \
+    ${PATH_ROOT}/include/VBox/VBoxGuestCoreTypes.h=>include/VBox/VBoxGuestCoreTypes.h \
     ${PATH_ROOT}/include/VBox/VBoxGuestLib.h=>include/VBox/VBoxGuestLib.h \
     ${PATH_ROOT}/include/VBox/VBoxGuestMangling.h=>include/VBox/VBoxGuestMangling.h \
     ${PATH_ROOT}/include/VBox/version.h=>include/VBox/version.h \
diff --git a/src/VBox/Additions/common/VBoxGuest/linux/files_vboxguest b/src/VBox/Additions/common/VBoxGuest/linux/files_vboxguest
index 6c694caf9a5..a6370a4f9a4 100644
--- a/src/VBox/Additions/common/VBoxGuest/linux/files_vboxguest
+++ b/src/VBox/Additions/common/VBoxGuest/linux/files_vboxguest
@@ -67,6 +67,7 @@ FILES_VBOXGUEST_NOBIN=" \
     ${PATH_ROOT}/include/VBox/VMMDev.h=>include/VBox/VMMDev.h \
     ${PATH_ROOT}/include/VBox/VMMDevCoreTypes.h=>include/VBox/VMMDevCoreTypes.h \
     ${PATH_ROOT}/include/VBox/VBoxGuest.h=>include/VBox/VBoxGuest.h \
+    ${PATH_ROOT}/include/VBox/VBoxGuestCoreTypes.h=>include/VBox/VBoxGuestCoreTypes.h \
     ${PATH_ROOT}/include/VBox/VBoxGuestLib.h=>include/VBox/VBoxGuestLib.h \
     ${PATH_ROOT}/include/VBox/VBoxGuestMangling.h=>include/VBox/VBoxGuestMangling.h \
     ${PATH_ROOT}/include/VBox/version.h=>include/VBox/version.h \
diff --git a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR0LibInternal.h b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR0LibInternal.h
index f8813cdb0e8..21a3fb5fa8a 100644
--- a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR0LibInternal.h
+++ b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR0LibInternal.h
@@ -60,6 +60,7 @@ struct VBGLIDCHANDLEPRIVATE
 /** Indicate that the structure is present. */
 #define VBGLIDCHANDLEPRIVATE_DECLARED 1
 
+#include <VBox/VBoxGuest.h>
 #include <VBox/VBoxGuestLib.h>
 AssertCompile(RT_SIZEOFMEMB(VBGLIDCHANDLE, apvPadding) >= sizeof(struct VBGLIDCHANDLEPRIVATE));
 
diff --git a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibSeamless.cpp b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibSeamless.cpp
index 1aa0a226ee0..5bac7b37b80 100644
--- a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibSeamless.cpp
+++ b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibSeamless.cpp
@@ -31,7 +31,6 @@
 #include <iprt/assert.h>
 #include <iprt/string.h>
 
-#include <VBox/VMMDev.h>
 #include <VBox/log.h>
 
 #include "VBGLR3Internal.h"
diff --git a/src/VBox/Additions/common/VBoxService/VBoxServiceStats.cpp b/src/VBox/Additions/common/VBoxService/VBoxServiceStats.cpp
index 598b8f72482..4117d45819c 100644
--- a/src/VBox/Additions/common/VBoxService/VBoxServiceStats.cpp
+++ b/src/VBox/Additions/common/VBoxService/VBoxServiceStats.cpp
@@ -60,6 +60,7 @@
 #include <iprt/system.h>
 #include <iprt/time.h>
 #include <iprt/thread.h>
+#include <VBox/VMMDev.h> /* For VMMDevReportGuestStats and indirectly VbglR3StatReport. */
 #include <VBox/VBoxGuestLib.h>
 #include "VBoxServiceInternal.h"
 #include "VBoxServiceUtils.h"
diff --git a/src/VBox/Additions/linux/sharedfolders/files_vboxsf b/src/VBox/Additions/linux/sharedfolders/files_vboxsf
index 20ceea6ab0a..14aa004a9af 100644
--- a/src/VBox/Additions/linux/sharedfolders/files_vboxsf
+++ b/src/VBox/Additions/linux/sharedfolders/files_vboxsf
@@ -50,6 +50,7 @@ FILES_VBOXSF_NOBIN=" \
     ${PATH_ROOT}/include/VBox/shflsvc.h=>include/VBox/shflsvc.h \
     ${PATH_ROOT}/include/VBox/types.h=>include/VBox/types.h \
     ${PATH_ROOT}/include/VBox/VBoxGuest.h=>include/VBox/VBoxGuest.h \
+    ${PATH_ROOT}/include/VBox/VBoxGuestCoreTypes.h=>include/VBox/VBoxGuestCoreTypes.h \
     ${PATH_ROOT}/include/VBox/VBoxGuestLib.h=>include/VBox/VBoxGuestLib.h \
     ${PATH_ROOT}/include/VBox/VBoxGuestLibSharedFolders.h=>include/VBox/VBoxGuestLibSharedFolders.h \
     ${PATH_ROOT}/include/VBox/VBoxGuestMangling.h=>include/VBox/VBoxGuestMangling.h \