Index: /trunk/src/VBox/Devices/Builtins.cpp
===================================================================
--- /trunk/src/VBox/Devices/Builtins.cpp	(revision 29521)
+++ /trunk/src/VBox/Devices/Builtins.cpp	(revision 29522)
@@ -83,14 +83,4 @@
         return rc;
 #endif
-#ifdef VBOX_WITH_SMC
-    rc = pCallbacks->pfnRegister(pCallbacks, &g_DeviceSMC);
-    if (RT_FAILURE(rc))
-        return rc;
-#endif
-#ifdef VBOX_WITH_LPC
-    rc = pCallbacks->pfnRegister(pCallbacks, &g_DeviceLPC);
-    if (RT_FAILURE(rc))
-        return rc;
-#endif
 #ifdef VBOX_WITH_EFI
     rc = pCallbacks->pfnRegister(pCallbacks, &g_DeviceEFI);
Index: /trunk/src/VBox/Devices/Builtins.h
===================================================================
--- /trunk/src/VBox/Devices/Builtins.h	(revision 29521)
+++ /trunk/src/VBox/Devices/Builtins.h	(revision 29522)
@@ -80,10 +80,4 @@
 extern const PDMDEVREG g_DeviceLsiLogicSAS;
 #endif
-#ifdef VBOX_WITH_SMC
-extern const PDMDEVREG g_DeviceSMC;
-#endif
-#ifdef VBOX_WITH_LPC
-extern const PDMDEVREG g_DeviceLPC;
-#endif
 #ifdef VBOX_WITH_EFI
 extern const PDMDEVREG g_DeviceEFI;
Index: /trunk/src/VBox/Devices/Builtins2.cpp
===================================================================
--- /trunk/src/VBox/Devices/Builtins2.cpp	(revision 29521)
+++ /trunk/src/VBox/Devices/Builtins2.cpp	(revision 29522)
@@ -1,9 +1,9 @@
 /* $Id $ */
 /** @file
- * Built-in drivers & devices (part 2).
+ * Built-in drivers & devices part 2.
  */
 
 /*
- * Copyright (C) 2006-2007 Oracle Corporation
+ * Copyright (C) 2006-2010 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -61,4 +61,14 @@
     if (RT_FAILURE(rc))
         return rc;
+#ifdef VBOX_WITH_SMC
+    rc = pCallbacks->pfnRegister(pCallbacks, &g_DeviceSMC);
+    if (RT_FAILURE(rc))
+        return rc;
+#endif
+#ifdef VBOX_WITH_LPC
+    rc = pCallbacks->pfnRegister(pCallbacks, &g_DeviceLPC);
+    if (RT_FAILURE(rc))
+        return rc;
+#endif
 
     return VINF_SUCCESS;
Index: /trunk/src/VBox/Devices/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Devices/Makefile.kmk	(revision 29521)
+++ /trunk/src/VBox/Devices/Makefile.kmk	(revision 29522)
@@ -180,7 +180,4 @@
  VBoxDD_DEFS           += VBOX_WITH_SMC
 endif
-ifdef VBOX_WITH_LPC
- VBoxDD_DEFS           += VBOX_WITH_LPC
-endif
 ifdef VBOX_WITH_EFI
  VBoxDD_DEFS           += VBOX_WITH_EFI
@@ -250,4 +247,5 @@
 VBoxDD_LDFLAGS.l4       = -Wl,--no-undefined
 
+
 #
 # VBoxDD2 (shared object)
@@ -260,4 +258,12 @@
 	Builtins2.cpp \
 	PC/DevAPIC.cpp
+ifdef VBOX_WITH_SMC
+ VBoxDD2_DEFS          += VBOX_WITH_SMC
+ VBoxDD2_SOURCES       += PC/DevSMC.cpp
+endif
+ifdef VBOX_WITH_LPC
+ VBoxDD2_DEFS          += VBOX_WITH_LPC
+ VBoxDD2_SOURCES       += PC/DevLPC.cpp
+endif
 VBoxDD2_LIBS            = \
 	$(PATH_LIB)/PcBiosBin$(VBOX_SUFF_LIB) \
@@ -425,14 +431,4 @@
 endif
 
-ifdef VBOX_WITH_SMC
- DevicesR3_DEFS        += VBOX_WITH_SMC
- DevicesR3_SOURCES     += PC/DevSMC.cpp
-endif
-
-ifdef VBOX_WITH_LPC
- DevicesR3_DEFS        += VBOX_WITH_LPC
- DevicesR3_SOURCES     += PC/DevLPC.cpp
-endif
-
 ifdef VBOX_WITH_EFI
  DevicesR3_DEFS        += VBOX_WITH_EFI
@@ -796,4 +792,10 @@
 VBoxDD2R0_SOURCES        = \
         PC/DevAPIC.cpp
+
+ifdef VBOX_WITH_SMC
+ VBoxDD2R0_DEFS         += VBOX_WITH_SMC
+ VBoxDD2R0_SOURCES      += PC/DevSMC.cpp
+endif
+
 if1of ($(VBOX_LDR_FMT), pe lx)
 VBoxDD2R0_LIBS           = $(PATH_LIB)/VMMR0Imp$(VBOX_SUFF_LIB)
Index: /trunk/src/VBox/Devices/PC/DevLPC.cpp
===================================================================
--- /trunk/src/VBox/Devices/PC/DevLPC.cpp	(revision 29521)
+++ /trunk/src/VBox/Devices/PC/DevLPC.cpp	(revision 29522)
@@ -3,4 +3,5 @@
  * DevLPC - LPC device emulation
  */
+
 /*
  * Copyright (C) 2006-2010 Oracle Corporation
@@ -53,5 +54,5 @@
 #include <iprt/string.h>
 
-#include "../Builtins.h"
+#include "../Builtins2.h"
 
 #define RCBA_BASE                0xFED1C000
@@ -314,9 +315,9 @@
     "lpc",
     /* szRCMod */
-    "VBoxDDGC.gc",
+    "VBoxDD2GC.gc",
     /* szR0Mod */
-    "VBoxDDR0.r0",
+    "VBoxDD2R0.r0",
     /* pszDescription */
-    " Low Pin Count (LPC) Bus",
+    "Low Pin Count (LPC) Bus",
     /* fFlags */
     PDM_DEVREG_FLAGS_HOST_BITS_DEFAULT | PDM_DEVREG_FLAGS_GUEST_BITS_32_64 | PDM_DEVREG_FLAGS_PAE36,
Index: /trunk/src/VBox/Devices/PC/DevSMC.cpp
===================================================================
--- /trunk/src/VBox/Devices/PC/DevSMC.cpp	(revision 29521)
+++ /trunk/src/VBox/Devices/PC/DevSMC.cpp	(revision 29522)
@@ -1,7 +1,7 @@
 /* $Id$ */
-/**
- * @file
+/** @file
  * DevSMC - SMC device emulation.
  */
+
 /*
  * Copyright (C) 2006-2010 Oracle Corporation
@@ -57,5 +57,5 @@
 #include <iprt/string.h>
 
-#include "../Builtins.h"
+#include "../Builtins2.h"
 
 /* data port used by Apple SMC */
@@ -438,9 +438,9 @@
     "smc",
     /* szRCMod */
-    "VBoxDDGC.gc",
+    "VBoxDD2GC.gc",
     /* szR0Mod */
-    "VBoxDDR0.r0",
+    "VBoxDD2R0.r0",
     /* pszDescription */
-    " System Management Controller (SMC) Device",
+    "System Management Controller (SMC) Device",
     /* fFlags */
     PDM_DEVREG_FLAGS_HOST_BITS_DEFAULT | PDM_DEVREG_FLAGS_GUEST_BITS_32_64 | PDM_DEVREG_FLAGS_PAE36,