Index: /trunk/include/VBox/vmm/cpumctx.h
===================================================================
--- /trunk/include/VBox/vmm/cpumctx.h	(revision 41269)
+++ /trunk/include/VBox/vmm/cpumctx.h	(revision 41270)
@@ -96,7 +96,5 @@
  * CPU context core.
  */
-#ifndef VBOX_FOR_DTRACE_LIB
-# pragma pack(1)
-#endif
+#pragma pack(1)
 typedef struct CPUMCTXCORE
 {
@@ -197,8 +195,5 @@
 
 } CPUMCTXCORE;
-
-# ifndef VBOX_FOR_DTRACE_LIB
-#  pragma pack()
-# endif
+#pragma pack()
 
 
@@ -206,7 +201,5 @@
  * CPU context.
  */
-#ifndef VBOX_FOR_DTRACE_LIB
-# pragma pack(1)
-#endif
+#pragma pack(1)
 typedef struct CPUMCTX
 {
@@ -376,12 +369,10 @@
     /** @} */
 
-# if 0
+#if 0
     /** Padding to align the size on a 64 byte boundary. */
     uint32_t        padding[6];
-# endif
+#endif
 } CPUMCTX;
-# ifndef VBOX_FOR_DTRACE_LIB
-#  pragma pack()
-# endif
+#pragma pack()
 
 #ifndef VBOX_FOR_DTRACE_LIB
Index: /trunk/include/iprt/x86.h
===================================================================
--- /trunk/include/iprt/x86.h	(revision 41269)
+++ /trunk/include/iprt/x86.h	(revision 41270)
@@ -2258,4 +2258,5 @@
 typedef const X86DESCATTR *PCX86DESCATTR;
 
+#ifndef VBOX_FOR_DTRACE_LIB
 
 /**
@@ -2329,7 +2330,4 @@
     unsigned    u16OffsetHigh : 16;
 } X86DESCGATE;
-#ifndef VBOX_FOR_DTRACE_LIB
-AssertCompileSize(X86DESCGATE, 8);
-#endif
 /** Pointer to a Call-, Interrupt-, Trap- or Task-gate descriptor entry. */
 typedef X86DESCGATE *PX86DESCGATE;
@@ -2337,4 +2335,6 @@
 typedef const X86DESCGATE *PCX86DESCGATE;
 
+#endif /* VBOX_FOR_DTRACE_LIB */
+
 /**
  * Descriptor table entry.
@@ -2343,8 +2343,10 @@
 typedef union X86DESC
 {
+#ifndef VBOX_FOR_DTRACE_LIB
     /** Generic descriptor view. */
     X86DESCGENERIC  Gen;
     /** Gate descriptor view. */
     X86DESCGATE     Gate;
+#endif
 
     /** 8 bit unsigned integer view. */
@@ -2389,4 +2391,5 @@
         ( (desc.u >> (16+16+8)) & UINT32_C(0xf0ff) ) /** @todo do we have a define for 0xf0ff? */
 
+#ifndef VBOX_FOR_DTRACE_LIB
 
 /**
@@ -2519,7 +2522,5 @@
     unsigned    u32Reserved : 32;
 } X86DESC64GATE;
-#ifndef VBOX_FOR_DTRACE_LIB
 AssertCompileSize(X86DESC64GATE, 16);
-#endif
 /** Pointer to a Call-, Interrupt-, Trap- or Task-gate descriptor entry. */
 typedef X86DESC64GATE *PX86DESC64GATE;
@@ -2527,4 +2528,5 @@
 typedef const X86DESC64GATE *PCX86DESC64GATE;
 
+#endif /* VBOX_FOR_DTRACE_LIB */
 
 /**
@@ -2534,4 +2536,5 @@
 typedef union X86DESC64
 {
+#ifndef VBOX_FOR_DTRACE_LIB
     /** Generic descriptor view. */
     X86DESC64GENERIC    Gen;
@@ -2540,4 +2543,5 @@
     /** Gate descriptor view. */
     X86DESC64GATE       Gate;
+#endif
 
     /** 8 bit unsigned integer view. */