diff --git a/reactos/hal/hal.rbuild b/reactos/hal/hal.rbuild
index d112ab05462..b2f85e41607 100644
--- a/reactos/hal/hal.rbuild
+++ b/reactos/hal/hal.rbuild
@@ -6,7 +6,12 @@
 	</directory>
 	<if property="ARCH" value="i386">
 		<directory name="halx86">
-			<xi:include href="halx86/directory.rbuild" />
+			<xi:include href="halx86/hal_generic.rbuild" />
+			<xi:include href="halx86/hal_generic_up.rbuild" />
+			<xi:include href="halx86/hal_generic_pc.rbuild" />
+			<xi:include href="halx86/halup.rbuild" />
+			<xi:include href="halx86/halmp.rbuild" />
+			<xi:include href="halx86/halxbox.rbuild" />
 		</directory>
 	</if>
 	<if property="ARCH" value="powerpc">
diff --git a/reactos/hal/halx86/directory.rbuild b/reactos/hal/halx86/directory.rbuild
deleted file mode 100644
index a50373a7f7e..00000000000
--- a/reactos/hal/halx86/directory.rbuild
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd">
-<group xmlns:xi="http://www.w3.org/2001/XInclude">
-	<directory name="generic">
-		<xi:include href="generic/generic.rbuild" />
-	</directory>
-
-	<module name="halup" type="kernelmodedll" entrypoint="0">
-		<importlibrary definition="../hal/hal_i386.def" />
-		<bootstrap installbase="$(CDOUTPUT)" nameoncd="hal.dll" />
-		<include>include</include>
-		<include base="ntoskrnl">include</include>
-		<define name="_DISABLE_TIDENTS" />
-		<define name="_NTHAL_" />
-		<library>hal_generic</library>
-		<library>hal_generic_up</library>
-		<library>hal_generic_pc</library>
-		<library>ntoskrnl</library>
-		<directory name="up">
-			<file>halinit_up.c</file>
-			<file>halup.rc</file>
-		</directory>
-	</module>
-	<module name="halmp" type="kernelmodedll" entrypoint="0">
-		<importlibrary definition="../hal/hal_i386.def" />
-		<bootstrap installbase="$(CDOUTPUT)" />
-		<include>include</include>
-		<include base="ntoskrnl">include</include>
-		<define name="_DISABLE_TIDENTS" />
-		<define name="CONFIG_SMP" />
-		<define name="_NTHAL_" />
-		<library>hal_generic</library>
-		<library>hal_generic_pc</library>
-		<library>ntoskrnl</library>
-		<directory name="mp">
-			<file>apic.c</file>
-			<file>halinit_mp.c</file>
-			<file>ioapic.c</file>
-			<file>ipi_mp.c</file>
-			<file>mpconfig.c</file>
-			<file>mps.S</file>
-			<file>mpsboot.asm</file>
-			<file>mpsirql.c</file>
-			<file>processor_mp.c</file>
-			<file>spinlock.c</file>
-			<file>halmp.rc</file>
-		</directory>
-	</module>
-	<module name="halxbox" type="kernelmodedll" entrypoint="0" allowwarnings="true">
-		<importlibrary definition="../hal/hal_i386.def" />
-		<include>include</include>
-		<include base="ntoskrnl">include</include>
-		<define name="_DISABLE_TIDENTS" />
-		<define name="_NTHAL_" />
-		<define name="SARCH_XBOX" />
-		<library>hal_generic</library>
-		<library>hal_generic_up</library>
-		<library>ntoskrnl</library>
-		<directory name="generic">
-			<file>pci.c</file>
-		</directory>
-		<directory name="xbox">
-			<file>halinit_xbox.c</file>
-			<file>part_xbox.c</file>
-			<file>halxbox.rc</file>
-			<pch>halxbox.h</pch>
-		</directory>
-	</module>
-</group>
diff --git a/reactos/hal/halx86/hal_generic.rbuild b/reactos/hal/halx86/hal_generic.rbuild
new file mode 100644
index 00000000000..0c680aa54f2
--- /dev/null
+++ b/reactos/hal/halx86/hal_generic.rbuild
@@ -0,0 +1,31 @@
+<?xml version="1.0"?>
+<!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd">
+<group>
+	<module name="hal_generic" type="objectlibrary">
+		<include>include</include>
+		<include base="ntoskrnl">include</include>
+		<define name="_DISABLE_TIDENTS" />
+		<define name="_NTHAL_" />
+		<directory name="generic">
+			<file>beep.c</file>
+			<file>bios.c</file>
+			<file>bus.c</file>
+			<file>cmos.c</file>
+			<file>dma.c</file>
+			<file>drive.c</file>
+			<file>display.c</file>
+			<file>halinit.c</file>
+			<file>misc.c</file>
+			<file>portio.c</file>
+			<file>profil.c</file>
+			<file>reboot.c</file>
+			<file>sysinfo.c</file>
+			<file>timer.c</file>
+			<file>systimer.S</file>
+			<file>v86.s</file>
+		</directory>
+		<directory name="include">
+			<pch>hal.h</pch>
+		</directory>
+	</module>
+</group>
diff --git a/reactos/hal/halx86/hal_generic_pc.rbuild b/reactos/hal/halx86/hal_generic_pc.rbuild
new file mode 100644
index 00000000000..3571a42117a
--- /dev/null
+++ b/reactos/hal/halx86/hal_generic_pc.rbuild
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd">
+<group>
+	<module name="hal_generic_pc" type="objectlibrary">
+		<include>include</include>
+		<include base="ntoskrnl">include</include>
+		<define name="_DISABLE_TIDENTS" />
+		<define name="_NTHAL_" />
+		<directory name="generic">
+			<file>pci.c</file>
+		</directory>
+	</module>
+</group>
diff --git a/reactos/hal/halx86/hal_generic_up.rbuild b/reactos/hal/halx86/hal_generic_up.rbuild
new file mode 100644
index 00000000000..abb58c330dd
--- /dev/null
+++ b/reactos/hal/halx86/hal_generic_up.rbuild
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd">
+<group>
+	<module name="hal_generic_up" type="objectlibrary">
+		<include>include</include>
+		<include base="ntoskrnl">include</include>
+		<define name="_DISABLE_TIDENTS" />
+		<define name="_NTHAL_" />
+		<directory name="generic">
+			<file>irq.S</file>
+			<file>processor.c</file>
+			<file>spinlock.c</file>
+		</directory>
+	</module>
+</group>
diff --git a/reactos/hal/halx86/halmp.rbuild b/reactos/hal/halx86/halmp.rbuild
new file mode 100644
index 00000000000..1e31984ce44
--- /dev/null
+++ b/reactos/hal/halx86/halmp.rbuild
@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+<!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd">
+<group xmlns:xi="http://www.w3.org/2001/XInclude">
+	<module name="halmp" type="kernelmodedll" entrypoint="0">
+		<importlibrary base="hal" definition="hal_i386.def" />
+		<bootstrap installbase="$(CDOUTPUT)" />
+		<include>include</include>
+		<include base="ntoskrnl">include</include>
+		<define name="_DISABLE_TIDENTS" />
+		<define name="CONFIG_SMP" />
+		<define name="_NTHAL_" />
+		<library>hal_generic</library>
+		<library>hal_generic_pc</library>
+		<library>ntoskrnl</library>
+		<directory name="mp">
+			<file>apic.c</file>
+			<file>halinit_mp.c</file>
+			<file>ioapic.c</file>
+			<file>ipi_mp.c</file>
+			<file>mpconfig.c</file>
+			<file>mps.S</file>
+			<file>mpsboot.asm</file>
+			<file>mpsirql.c</file>
+			<file>processor_mp.c</file>
+			<file>spinlock.c</file>
+			<file>halmp.rc</file>
+		</directory>
+	</module>
+</group>
diff --git a/reactos/hal/halx86/halup.rbuild b/reactos/hal/halx86/halup.rbuild
new file mode 100644
index 00000000000..fe87ba7a169
--- /dev/null
+++ b/reactos/hal/halx86/halup.rbuild
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd">
+<group xmlns:xi="http://www.w3.org/2001/XInclude">
+	<module name="halup" type="kernelmodedll" entrypoint="0">
+		<importlibrary base="hal" definition="hal_i386.def" />
+		<bootstrap installbase="$(CDOUTPUT)" nameoncd="hal.dll" />
+		<include>include</include>
+		<include base="ntoskrnl">include</include>
+		<define name="_DISABLE_TIDENTS" />
+		<define name="_NTHAL_" />
+		<library>hal_generic</library>
+		<library>hal_generic_up</library>
+		<library>hal_generic_pc</library>
+		<library>ntoskrnl</library>
+		<directory name="up">
+			<file>halinit_up.c</file>
+			<file>halup.rc</file>
+		</directory>
+	</module>
+</group>
diff --git a/reactos/hal/halx86/halxbox.rbuild b/reactos/hal/halx86/halxbox.rbuild
new file mode 100644
index 00000000000..3002bde5f14
--- /dev/null
+++ b/reactos/hal/halx86/halxbox.rbuild
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd">
+<group xmlns:xi="http://www.w3.org/2001/XInclude">
+	<module name="halxbox" type="kernelmodedll" entrypoint="0" allowwarnings="true">
+		<importlibrary base="hal" definition="hal_i386.def" />
+		<include>include</include>
+		<include base="ntoskrnl">include</include>
+		<define name="_DISABLE_TIDENTS" />
+		<define name="_NTHAL_" />
+		<define name="SARCH_XBOX" />
+		<library>hal_generic</library>
+		<library>hal_generic_up</library>
+		<library>ntoskrnl</library>
+		<directory name="generic">
+			<file>pci.c</file>
+		</directory>
+		<directory name="xbox">
+			<file>halinit_xbox.c</file>
+			<file>part_xbox.c</file>
+			<file>halxbox.rc</file>
+			<pch>halxbox.h</pch>
+		</directory>
+	</module>
+</group>