Index: /trunk/src/VBox/VMM/PGMInternal.h
===================================================================
--- /trunk/src/VBox/VMM/PGMInternal.h	(revision 22918)
+++ /trunk/src/VBox/VMM/PGMInternal.h	(revision 22919)
@@ -2760,7 +2760,5 @@
     DECLRCCALLBACKMEMBER(int,       pfnRCBthMapCR3,(PVMCPU pVCpu, RTGCPHYS GCPhysCR3));
     DECLRCCALLBACKMEMBER(int,       pfnRCBthUnmapCR3,(PVMCPU pVCpu));
-#if HC_ARCH_BITS == 64
     RTRCPTR                         alignment2; /**< structure size alignment. */
-#endif
     /** @} */
 
Index: /trunk/src/VBox/VMM/testcase/tstVMStructGC.cpp
===================================================================
--- /trunk/src/VBox/VMM/testcase/tstVMStructGC.cpp	(revision 22918)
+++ /trunk/src/VBox/VMM/testcase/tstVMStructGC.cpp	(revision 22919)
@@ -487,4 +487,6 @@
     GEN_CHECK_OFF(PGMCPU, pStatTrap0eAttributionR0);
     GEN_CHECK_OFF(PGMCPU, pStatTrap0eAttributionRC);
+    GEN_CHECK_OFF(PGMCPU, StatSyncPtPD);
+    GEN_CHECK_OFF(PGMCPU, StatR3Prefetch);
 #endif
     GEN_CHECK_OFF(PGM, offVM);
Index: /trunk/src/VBox/VMM/testcase/tstVMStructSize.cpp
===================================================================
--- /trunk/src/VBox/VMM/testcase/tstVMStructSize.cpp	(revision 22918)
+++ /trunk/src/VBox/VMM/testcase/tstVMStructSize.cpp	(revision 22919)
@@ -202,13 +202,6 @@
     }
     CHECK_MEMBER_ALIGNMENT(VM, trpm.s.aIdt, 16);
-    CHECK_MEMBER_ALIGNMENT(VM, cpum, 64);
-    CHECK_MEMBER_ALIGNMENT(VM, aCpus[0], 64);
-    CHECK_MEMBER_ALIGNMENT(VM, aCpus[1], 64);
-    CHECK_MEMBER_ALIGNMENT(VM, aCpus[0].cpum, 64);
-    CHECK_MEMBER_ALIGNMENT(VM, aCpus[0].hwaccm, 64);
-    CHECK_MEMBER_ALIGNMENT(VM, aCpus[0].pgm, 64);
-    CHECK_MEMBER_ALIGNMENT(VM, aCpus[0].em, 64);
-    CHECK_MEMBER_ALIGNMENT(VM, aCpus[0].tm, 64);
-    CHECK_MEMBER_ALIGNMENT(VM, aCpus[0].vmm, 64);
+    CHECK_MEMBER_ALIGNMENT(VM, aCpus[0], PAGE_SIZE);
+    CHECK_MEMBER_ALIGNMENT(VM, aCpus[1], PAGE_SIZE);
     CHECK_MEMBER_ALIGNMENT(VM, aCpus[0].cpum.s.Host, 64);
     CHECK_MEMBER_ALIGNMENT(VM, aCpus[0].cpum.s.Guest, 64);
@@ -291,4 +284,17 @@
     CHECK_PADDING(PDMDRVINS, Internal, 1);
     CHECK_PADDING2(PDMCRITSECT);
+
+    /* pgm */
+#ifdef VBOX_WITH_2X_4GB_ADDR_SPACE
+    CHECK_MEMBER_ALIGNMENT(PGMCPU, AutoSet, 8);
+#endif
+    CHECK_MEMBER_ALIGNMENT(PGMCPU, GCPhysCR3, sizeof(RTGCPHYS));
+    CHECK_MEMBER_ALIGNMENT(PGMCPU, aGCPhysGstPaePDs, sizeof(RTGCPHYS));
+    CHECK_MEMBER_ALIGNMENT(PGMCPU, DisState, 8);
+    CHECK_MEMBER_ALIGNMENT(PGMCPU, cPoolAccessHandler, 8);
+#ifdef VBOX_WITH_STATISTICS
+    CHECK_MEMBER_ALIGNMENT(PGMCPU, StatSyncPtPD, 8);
+    CHECK_MEMBER_ALIGNMENT(PGMCPU, StatR3Prefetch, 8);
+#endif
     CHECK_MEMBER_ALIGNMENT(PGMPOOLPAGE, idx, sizeof(uint16_t));
     CHECK_MEMBER_ALIGNMENT(PGMPOOLPAGE, pvPageR3, sizeof(RTHCPTR));
@@ -305,4 +311,8 @@
     CHECK_SIZE_ALIGNMENT(REMHANDLERNOTIFICATION, 8);
     CHECK_MEMBER_ALIGNMENT(REMHANDLERNOTIFICATION, u.PhysicalDeregister.GCPhys, 8);
+
+    /* TM */
+    CHECK_MEMBER_ALIGNMENT(TM, TimerCritSect, sizeof(uintptr_t));
+    CHECK_MEMBER_ALIGNMENT(TM, VirtualSyncLock, sizeof(uintptr_t));
 
     /* misc */
@@ -315,8 +325,4 @@
     PRINT_OFFSET(VM, StatGCToQemu);
 #endif
-
-    /* TM */
-    CHECK_MEMBER_ALIGNMENT(TM, TimerCritSect, sizeof(uintptr_t));
-    CHECK_MEMBER_ALIGNMENT(TM, VirtualSyncLock, sizeof(uintptr_t));
 
     CHECK_MEMBER_ALIGNMENT(IOM, EmtLock, sizeof(uintptr_t));