Index: /trunk/src/VBox/Devices/PC/apic.c
===================================================================
--- /trunk/src/VBox/Devices/PC/apic.c	(revision 482)
+++ /trunk/src/VBox/Devices/PC/apic.c	(revision 483)
@@ -182,4 +182,7 @@
     int count_shift;
     uint32_t initial_count;
+#ifdef VBOX
+    uint32_t Alignment0;
+#endif
     int64_t initial_count_load_time, next_time;
 #ifndef VBOX
@@ -194,4 +197,6 @@
     /** The APIC timer - HC Ptr. */
     PTMTIMERHC      pTimerHC;
+    /** Pointer to the APIC R0 helpers. */
+    PCPDMAPICHLPR0  pApicHlpR0;
 
     /** GC pointer to the device instance. */
@@ -202,7 +207,4 @@
     PTMTIMERGC      pTimerGC;
 
-    /** Pointer to the APIC R0 helpers. */
-    PCPDMAPICHLPR0  pApicHlpR0;
-
     /** Number of attempts made to optimize TPR accesses. */
     uint32_t        ulTPRPatchAttempts;
@@ -237,5 +239,7 @@
     /** Pointer to the IOAPIC R0 helpers. */
     PCPDMIOAPICHLPR0    pIoApicHlpR0;
-
+# if HC_ARCH_BITS == 32
+    uint32_t            Alignment0;
+# endif
 # ifdef VBOX_WITH_STATISTICS
     STAMCOUNTER StatMMIOReadGC;
@@ -253,4 +257,5 @@
 #endif /* VBOX */
 
+#ifndef VBOX_DEVICE_STRUCT_TESTCASE
 #ifndef VBOX
 static int apic_io_memory;
@@ -2066,2 +2071,4 @@
 
 #endif /* IN_RING3 */
+#endif /* !VBOX_DEVICE_STRUCT_TESTCASE */
+