Index: /trunk/src/VBox/Devices/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Devices/Makefile.kmk	(revision 38912)
+++ /trunk/src/VBox/Devices/Makefile.kmk	(revision 38913)
@@ -722,5 +722,5 @@
 
  if defined(VBOX_WITH_PCI_PASSTHROUGH_IMPL) && !defined(VBOX_WITH_EXTPACK_PUEL)
-  VBoxDDR0_SOURCES      +=
+  VBoxDDR0_SOURCES      += \
 	Bus/DevPciRaw.cpp
  endif
@@ -938,13 +938,18 @@
 
  ifdef VBOX_WITH_UDPTUNNEL
- Drivers_SOURCES += \
+  Drivers_SOURCES += \
 	Network/DrvUDPTunnel.cpp
- Drivers_DEFS += VBOX_WITH_UDPTUNNEL
+  Drivers_DEFS += VBOX_WITH_UDPTUNNEL
  endif
  ifdef VBOX_WITH_VDE
- Drivers_SOURCES += \
+  Drivers_SOURCES += \
  	Network/DrvVDE.cpp \
  	Network/VDEPlug.cpp
- Drivers_DEFS += VBOX_WITH_VDE
+  Drivers_DEFS += VBOX_WITH_VDE
+ endif
+ if defined(VBOX_WITH_PCI_PASSTHROUGH_IMPL) && !defined(VBOX_WITH_EXTPACK_PUEL)
+  Drivers_SOURCES += \
+	Bus/DrvPciRaw.cpp
+  Drivers_DEFS += VBOX_WITH_PCI_PASSTHROUGH_IMPL
  endif
 
Index: /trunk/src/VBox/Devices/build/VBoxDD.cpp
===================================================================
--- /trunk/src/VBox/Devices/build/VBoxDD.cpp	(revision 38912)
+++ /trunk/src/VBox/Devices/build/VBoxDD.cpp	(revision 38913)
@@ -316,5 +316,5 @@
 #ifdef VBOX_WITH_PCI_PASSTHROUGH_IMPL
     rc = pCallbacks->pfnRegister(pCallbacks, &g_DrvPciRaw);
-    if (RT_FAILURED(rc))
+    if (RT_FAILURE(rc))
         return rc;
 #endif
Index: /trunk/src/VBox/Devices/build/VBoxDD.h
===================================================================
--- /trunk/src/VBox/Devices/build/VBoxDD.h	(revision 38912)
+++ /trunk/src/VBox/Devices/build/VBoxDD.h	(revision 38913)
@@ -124,4 +124,7 @@
 extern const PDMDRVREG g_DrvDiskIntegrity;
 #endif
+#ifdef VBOX_WITH_PCI_PASSTHROUGH_IMPL
+extern const PDMDRVREG g_DrvPciRaw;
+#endif
 
 #ifdef VBOX_WITH_USB
Index: /trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk	(revision 38912)
+++ /trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk	(revision 38913)
@@ -109,4 +109,5 @@
 	$(if $(VBOX_WITH_VDE),VBOX_WITH_VDE) \
 	$(if $(VBOX_WITH_UDPTUNNEL),VBOX_WITH_UDPTUNNEL) \
+	$(if $(VBOX_WITH_EXTPACK),VBOX_WITH_EXTPACK) \
 	$(if $(VBOX_WITH_EHCI),VBOX_WITH_EHCI) \
 	$(if $(VBOX_WITH_CRHGSMI),VBOX_WITH_CRHGSMI) \
Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsUSB.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsUSB.cpp	(revision 38912)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsUSB.cpp	(revision 38913)
@@ -470,4 +470,6 @@
 {
     /* USB 2.0 Extension Pack presence test: */
+    NOREF(strWarningText);
+#ifdef VBOX_WITH_EXTPACK
     CExtPack extPack = vboxGlobal().virtualBox().GetExtensionPackManager().Find(UI_ExtPackName);
     if (mGbUSB->isChecked() && mCbUSB2->isChecked() && (extPack.isNull() || !extPack.GetUsable()))
@@ -482,4 +484,5 @@
         return true;
     }
+#endif
     return true;
 }
Index: /trunk/src/VBox/Main/src-client/ConsoleImpl.cpp
===================================================================
--- /trunk/src/VBox/Main/src-client/ConsoleImpl.cpp	(revision 38912)
+++ /trunk/src/VBox/Main/src-client/ConsoleImpl.cpp	(revision 38913)
@@ -6428,5 +6428,7 @@
         if (FAILED(rc))
             throw rc;
+#ifdef VBOX_WITH_EXTPACK
         mptrExtPackManager->dumpAllToReleaseLog();
+#endif
 
 #ifdef RT_OS_SOLARIS