Index: /trunk/include/Makefile.kmk
===================================================================
--- /trunk/include/Makefile.kmk	(revision 13717)
+++ /trunk/include/Makefile.kmk	(revision 13718)
@@ -39,9 +39,11 @@
 	VBox/VBoxHDD.h \
 	iprt/tcp.h \
+	iprt/localipc.h
 
 hdrs := $(filter-out \
 	VBox/VBoxGuest16.h \
 	VBox/tapwin32.h \
-	VBox/usblib-win.h, \
+	VBox/usblib-win.h \
+	VBox/usblib-solaris.h, \
 	$(wildcard VBox/*.h iprt/*.h))
 
Index: /trunk/include/VBox/hwacc_vmx.h
===================================================================
--- /trunk/include/VBox/hwacc_vmx.h	(revision 13717)
+++ /trunk/include/VBox/hwacc_vmx.h	(revision 13718)
@@ -35,4 +35,5 @@
 #include <iprt/assert.h>
 #include <iprt/asm.h>
+#include <VBox/x86.h>
 
 /** @defgroup grp_vmx   vmx Types and Definitions
@@ -52,4 +53,6 @@
 /**
  * EPT Page Directory Pointer Entry. Bit view.
+ * @todo uint64_t isn't safe for bitfields (gcc pedantic warnings, and IIRC,
+ *       this did cause trouble with one compiler/version).
  */
 #pragma pack(1)
Index: /trunk/include/VBox/selm.h
===================================================================
--- /trunk/include/VBox/selm.h	(revision 13717)
+++ /trunk/include/VBox/selm.h	(revision 13718)
@@ -79,8 +79,8 @@
 
 VMMDECL(int)        SELMToFlatEx(PVM pVM, DIS_SELREG SelReg, PCCPUMCTXCORE pCtxCore, RTGCPTR Addr, unsigned fFlags, PRTGCPTR ppvGC);
-VMMDECL(int)        SELMToFlatBySelEx(PVM pVM, X86EFLAGS eflags, RTSEL Sel, RTGCPTR Addr, CPUMSELREGHID *pHiddenSel, unsigned fFlags, PRTGCPTR ppvGC, uint32_t *pcb);
+VMMDECL(int)        SELMToFlatBySelEx(PVM pVM, X86EFLAGS eflags, RTSEL Sel, RTGCPTR Addr, PCPUMSELREGHID pHiddenSel, unsigned fFlags, PRTGCPTR ppvGC, uint32_t *pcb);
 VMMDECL(int)        SELMValidateAndConvertCSAddr(PVM pVM, X86EFLAGS eflags, RTSEL SelCPL, RTSEL SelCS, PCPUMSELREGHID pHiddenCSSel, RTGCPTR Addr, PRTGCPTR ppvFlat);
 VMMDECL(int)        SELMValidateAndConvertCSAddrGCTrap(PVM pVM, X86EFLAGS eflags, RTSEL SelCPL, RTSEL SelCS, RTGCPTR Addr, PRTGCPTR ppvFlat, uint32_t *pcBits);
-VMMDECL(DISCPUMODE) SELMGetCpuModeFromSelector(PVM pVM, X86EFLAGS eflags, RTSEL Sel, CPUMSELREGHID *pHiddenSel);
+VMMDECL(DISCPUMODE) SELMGetCpuModeFromSelector(PVM pVM, X86EFLAGS eflags, RTSEL Sel, PCPUMSELREGHID pHiddenSel);
 VMMDECL(int)        SELMGetLDTFromSel(PVM pVM, RTSEL SelLdt, PRTGCPTR ppvLdt, unsigned *pcbLimit);
 
Index: /trunk/include/iprt/autores.h
===================================================================
--- /trunk/include/iprt/autores.h	(revision 13717)
+++ /trunk/include/iprt/autores.h	(revision 13718)
@@ -32,5 +32,4 @@
 
 #include <iprt/types.h>
-#include <iprt/mem.h>
 #include <iprt/assert.h>
 
@@ -209,4 +208,8 @@
 };
 
+
+/* include after template definition */
+#include <iprt/mem.h>
+
 #endif
 
Index: /trunk/include/iprt/mem.h
===================================================================
--- /trunk/include/iprt/mem.h	(revision 13717)
+++ /trunk/include/iprt/mem.h	(revision 13718)
@@ -370,4 +370,5 @@
 
 #ifdef __cplusplus
+# include <iprt/assert.h>
 
 /**