Index: /trunk/src/VBox/Devices/Builtins.cpp
===================================================================
--- /trunk/src/VBox/Devices/Builtins.cpp	(revision 30865)
+++ /trunk/src/VBox/Devices/Builtins.cpp	(revision 30866)
@@ -121,4 +121,9 @@
     if (RT_FAILURE(rc))
         return rc;
+#ifdef VBOX_WITH_AUDIO_INTELHD
+    rc = pCallbacks->pfnRegister(pCallbacks, &g_DeviceICHINTELHD);
+    if (RT_FAILURE(rc))
+        return rc;
+#endif
     rc = pCallbacks->pfnRegister(pCallbacks, &g_DeviceAudioSniffer);
     if (RT_FAILURE(rc))
Index: /trunk/src/VBox/Devices/Builtins.h
===================================================================
--- /trunk/src/VBox/Devices/Builtins.h	(revision 30865)
+++ /trunk/src/VBox/Devices/Builtins.h	(revision 30866)
@@ -61,4 +61,7 @@
 extern const PDMDEVREG g_DeviceICHAC97;
 extern const PDMDEVREG g_DeviceSB16;
+#ifdef VBOX_WITH_AUDIO_INTELHD
+extern const PDMDEVREG g_DeviceICHINTELHD;
+#endif
 extern const PDMDEVREG g_DeviceAudioSniffer;
 extern const PDMDEVREG g_DeviceOHCI;
Index: /trunk/src/VBox/Devices/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Devices/Makefile.kmk	(revision 30865)
+++ /trunk/src/VBox/Devices/Makefile.kmk	(revision 30866)
@@ -318,4 +318,11 @@
 	Serial/DevSerial.cpp \
 	Parallel/DevParallel.cpp
+
+ifdef VBOX_WITH_AUDIO_INTELHD
+    DevicesR3_SOURCES += Audio/DevIchIntelHDA.cpp
+    DevicesR3_SOURCES += Audio/DevCodec.cpp
+    DevicesR3_DEFS    += VBOX_WITH_AUDIO_INTELHD
+    VBoxDD_DEFS    += VBOX_WITH_AUDIO_INTELHD
+endif
 
 ifdef VBOX_DYNAMIC_NET_ATTACH