Index: /trunk/src/VBox/Devices/PC/DevACPI.cpp
===================================================================
--- /trunk/src/VBox/Devices/PC/DevACPI.cpp	(revision 490)
+++ /trunk/src/VBox/Devices/PC/DevACPI.cpp	(revision 491)
@@ -38,5 +38,5 @@
 
 /* the compiled DSL */
-#ifdef IN_RING3
+#if defined(IN_RING3) && !defined(VBOX_DEVICE_STRUCT_TESTCASE)
 #include <vboxaml.hex>
 #endif /* !IN_RING3 */
@@ -159,4 +159,5 @@
     uint16_t            pm1a_sts;
     uint16_t            pm1a_ctl;
+    uint16_t            Alignment0;
     int64_t             pm_timer_initial;
     PTMTIMERHC          tsHC;
@@ -183,9 +184,9 @@
     PDMIACPIPORT        IACPIPort;
     /** Pointer to the device instance. */
-    PPDMDEVINS          pDevIns;
+    PPDMDEVINSR3        pDevIns;
     /** Pointer to the driver base interface */
-    PPDMIBASE           pDrvBase;
+    R3PTRTYPE(PPDMIBASE) pDrvBase;
     /** Pointer to the driver connector interface */
-    PPDMIACPICONNECTOR  pDrv;
+    R3PTRTYPE(PPDMIACPICONNECTOR) pDrv;
 };
 
@@ -401,4 +402,6 @@
 #pragma pack()
 
+
+#ifndef VBOX_DEVICE_STRUCT_TESTCASE
 __BEGIN_DECLS
 IO_READ_PROTO  (acpiPMTmrRead);
@@ -1748,2 +1751,4 @@
 
 #endif /* IN_RING3 */
+#endif /* !VBOX_DEVICE_STRUCT_TESTCASE */
+