Index: /trunk/include/VBox/VMMDev.h
===================================================================
--- /trunk/include/VBox/VMMDev.h	(revision 46690)
+++ /trunk/include/VBox/VMMDev.h	(revision 46691)
@@ -35,6 +35,8 @@
 #include <iprt/assert.h>
 
-
+ 
+#pragma pack(4) /* force structure dword packing here. */
 RT_C_DECLS_BEGIN
+
 
 /** @defgroup grp_vmmdev    VMM Device
@@ -233,5 +235,4 @@
 #define VMMDEV_REQUEST_HEADER_VERSION (0x10001)
 
-#pragma pack(4) /* force structure dword packing here. */
 
 /**
@@ -960,5 +961,4 @@
  * Used by VMMDevReq_QueryCredentials.
  */
-#pragma pack(4)
 typedef struct
 {
@@ -975,5 +975,4 @@
 } VMMDevCredentials;
 AssertCompileSize(VMMDevCredentials, 24+4+3*128);
-#pragma pack()
 
 /** @name Credentials request flag (VMMDevCredentials::u32Flags)
@@ -1423,6 +1422,4 @@
 
 
-#pragma pack()
-
 
 #ifdef VBOX_WITH_HGCM
@@ -1435,6 +1432,4 @@
 # define VBOX_HGCM_REQ_CANCELLED (0x2)
 /** @} */
-
-# pragma pack(4)
 
 /**
@@ -1780,5 +1775,4 @@
 AssertCompileSize(HGCMPageListInfo, 4+2+2+8);
 
-# pragma pack()
 
 /** Get the pointer to the first parmater of a HGCM call request.  */
@@ -1981,5 +1975,4 @@
  * @todo Where does this fit in?
  */
-#pragma pack(1) /* unnecessary */
 typedef struct VBVACMDHDR
 {
@@ -1990,5 +1983,5 @@
    uint16_t h;
 } VBVACMDHDR;
-#pragma pack()
+AssertCompileSize(VBVACMDHDR, 8);
 
 /** @name VBVA ring defines.
@@ -2039,5 +2032,4 @@
  * This is a subsection of the VMMDevMemory structure.
  */
-#pragma pack(1) /* paranoia */
 typedef struct VBVAMEMORY
 {
@@ -2066,5 +2058,4 @@
 
 } VBVAMEMORY;
-#pragma pack()
 AssertCompileSize(VBVAMEMORY, 12 + (_4M-_1K) + 4*64 + 12);
 
@@ -2073,5 +2064,4 @@
  * The layout of VMMDEV RAM region that contains information for guest.
  */
-#pragma pack(1) /* paranoia */
 typedef struct VMMDevMemory
 {
@@ -2102,5 +2092,5 @@
 } VMMDevMemory;
 AssertCompileSize(VMMDevMemory, 8+8 + (12 + (_4M-_1K) + 4*64 + 12) );
-#pragma pack()
+AssertCompileMemberOffset(VMMDevMemory, vbvaMemory, 16);
 
 /** Version of VMMDevMemory structure (VMMDevMemory::u32Version). */
@@ -2108,5 +2098,7 @@
 
 /** @} */
+
 RT_C_DECLS_END
+#pragma pack()
 
 #endif