diff --git a/reactos/hal/hal.rbuild b/reactos/hal/hal.rbuild
index 1ea85734b32..2e37cc8290b 100644
--- a/reactos/hal/hal.rbuild
+++ b/reactos/hal/hal.rbuild
@@ -25,7 +25,7 @@
 	</if>
 	<if property="ARCH" value="amd64">
 		<directory name="halx86">
-			<xi:include href="halx86/hal_generic_amd64.rbuild" />
+			<xi:include href="halx86/hal_generic.rbuild" />
 		</directory>
 		<directory name="halamd64">
 			<xi:include href="halamd64/directory.rbuild" />
diff --git a/reactos/hal/halamd64/generic/generic.rbuild b/reactos/hal/halamd64/generic/generic.rbuild
index 4880c41cf9b..da566068ca9 100644
--- a/reactos/hal/halamd64/generic/generic.rbuild
+++ b/reactos/hal/halamd64/generic/generic.rbuild
@@ -1,20 +1,16 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
-	<module name="hal_generic" type="objectlibrary">
-		<include base="hal_generic">../include</include>
+	<module name="hal_generic_amd64" type="objectlibrary">
+		<include base="hal_generic_amd64">../include</include>
 		<include base="ntoskrnl">include</include>
 		<define name="_DISABLE_TIDENTS" />
 		<define name="_NTHAL_" />
-		<define name="_X86BIOS_" />
 		<file>halinit.c</file>
-		<file>irq.S</file>
 		<file>misc.c</file>
 		<file>mps.S</file>
-		<file>systimer.S</file>
 		<file>usage.c</file>
 		<file>pic.c</file>
-		<file>x86bios.c</file>
 		<pch>../include/hal.h</pch>
 	</module>
 </group>
diff --git a/reactos/hal/halamd64/generic/irq.S b/reactos/hal/halx86/generic/amd64/irq.S
similarity index 100%
rename from reactos/hal/halamd64/generic/irq.S
rename to reactos/hal/halx86/generic/amd64/irq.S
diff --git a/reactos/hal/halamd64/generic/systimer.S b/reactos/hal/halx86/generic/amd64/systimer.S
similarity index 100%
rename from reactos/hal/halamd64/generic/systimer.S
rename to reactos/hal/halx86/generic/amd64/systimer.S
diff --git a/reactos/hal/halamd64/generic/x86bios.c b/reactos/hal/halx86/generic/x86bios.c
similarity index 100%
rename from reactos/hal/halamd64/generic/x86bios.c
rename to reactos/hal/halx86/generic/x86bios.c
diff --git a/reactos/hal/halx86/hal_generic.rbuild b/reactos/hal/halx86/hal_generic.rbuild
index 294a11c13c6..3b465cc819e 100644
--- a/reactos/hal/halx86/hal_generic.rbuild
+++ b/reactos/hal/halx86/hal_generic.rbuild
@@ -5,35 +5,49 @@
 		<include>include</include>
 		<include base="ntoskrnl">include</include>
 		<define name="_NTHAL_" />
+		<define name="_X86BIOS_" />
 		<directory name="generic">
 			<directory name="bus">
 				<file>bushndlr.c</file>
 				<file>isabus.c</file>
 				<file>halbus.c</file>
+				<file>pcibus.c</file>
 				<file>pcidata.c</file>
 				<file>sysbus.c</file>
 			</directory>
 			<file>beep.c</file>
-			<file>bios.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>profil.c</file>
 			<file>reboot.c</file>
 			<file>sysinfo.c</file>
 			<file>timer.c</file>
-			<file>usage.c</file>
+			<file>x86bios.c</file>
 			<if property="ARCH" value="i386">
+				<file>bios.c</file>
+				<file>halinit.c</file>
+				<file>misc.c</file>
+				<file>usage.c</file>
 				<directory name="i386">
 					<file>portio.c</file>
 					<file>systimer.S</file>
 					<file>v86.s</file>
 				</directory>
 			</if>
+			<if property="ARCH" value="amd64">
+				<directory name="amd64">
+					<file>irq.s</file>
+					<file>systimer.S</file>
+				</directory>
+			</if>
 		</directory>
+		<if property="ARCH" value="amd64">
+			<directory name="mp">
+				<file>apic.c</file>
+			</directory>
+		</if>
 		<directory name="include">
 			<pch>hal.h</pch>
 		</directory>
diff --git a/reactos/hal/halx86/hal_generic_amd64.rbuild b/reactos/hal/halx86/hal_generic_amd64.rbuild
deleted file mode 100644
index 157c41d60ad..00000000000
--- a/reactos/hal/halx86/hal_generic_amd64.rbuild
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd">
-<group>
-	<module name="hal_generic_amd64" type="objectlibrary">
-		<include>include</include>
-		<include base="ntoskrnl">include</include>
-		<define name="_DISABLE_TIDENTS" />
-		<define name="_NTHAL_" />
-		<directory name="generic">
-			<directory name="bus">
-				<file>bushndlr.c</file>
-				<file>isabus.c</file>
-				<file>halbus.c</file>
-				<file>pcibus.c</file>
-				<file>pcidata.c</file>
-				<file>sysbus.c</file>
-			</directory>
-			<file>beep.c</file>
-			<file>cmos.c</file>
-			<file>dma.c</file>
-			<file>drive.c</file>
-			<file>display.c</file>
-			<file>profil.c</file>
-			<file>reboot.c</file>
-			<file>sysinfo.c</file>
-			<file>timer.c</file>
-		</directory>
-		<directory name="mp">
-			<file>apic.c</file>
-		</directory>
-		<directory name="include">
-			<pch>hal.h</pch>
-		</directory>
-	</module>
-</group>