Index: hal/hal.rbuild
===================================================================
--- hal/hal.rbuild	(revision 33290)
+++ hal/hal.rbuild	(working copy)
@@ -10,13 +10,4 @@
 		<file>hal.c</file>
 		<file>hal.rc</file>
 	</module>
-	<if property="ARCH" value="i386">
-		<module ifnot="false" name="halupalias" type="alias" installbase="system32" installname="hal.dll" aliasof="halup">
-		</module>
-		<module if="false" name="halmpalias" type="alias" installbase="system32" installname="hal.dll" aliasof="halmp">
-		</module>
-	</if>
-	<if property="ARCH" value="powerpc">
-		<module name="halupalias" type="alias" installbase="system32" installname="hal.dll" aliasof="halppc_up"/>
-	</if>
 </group>
Index: halarm/directory.rbuild
===================================================================
--- halarm/directory.rbuild	(revision 33290)
+++ halarm/directory.rbuild	(working copy)
@@ -4,7 +4,19 @@
 	<directory name="generic">
 		<xi:include href="generic/generic.rbuild" />
 	</directory>
-	<directory name="up">
-		<xi:include href="up/halup.rbuild" />
-	</directory>
+
+	<module name="halup" type="kernelmodedll" installname="hal.dll">
+		<importlibrary definition="../../hal/hal_arm.def" />
+		<bootstrap installbase="$(CDOUTPUT)" nameoncd="hal.dll" />
+		<include base="halarm_generic">../include</include>
+		<include base="ntoskrnl">include</include>
+		<define name="_DISABLE_TIDENTS" />
+		<define name="_NTHAL_" />
+		<library>halarm_generic</library>
+		<library>ntoskrnl</library>
+		<directory name="up">
+			<file>halinit_up.c</file>
+			<file>halup.rc</file>
+		</directory>
+	</module>
 </group>
Index: halppc/directory.rbuild
===================================================================
--- halppc/directory.rbuild	(revision 33290)
+++ halppc/directory.rbuild	(working copy)
@@ -4,7 +4,19 @@
 	<directory name="generic">
 		<xi:include href="generic/generic.rbuild" />
 	</directory>
-	<directory name="up">
-		<xi:include href="up/halup.rbuild" />
-	</directory>
+
+	<module name="halup" type="kernelmodedll" installname="hal.dll">
+		<importlibrary definition="../../hal/hal.def" />
+		<bootstrap installbase="$(CDOUTPUT)" nameoncd="hal.dll" />
+		<include base="halppc_generic">../include</include>
+		<include base="ntoskrnl">include</include>
+		<define name="_DISABLE_TIDENTS" />
+		<define name="_NTHAL_" />
+		<library>halppc_generic</library>
+		<library>ntoskrnl</library>
+		<directory name="up">
+			<file>halinit_up.c</file>
+			<file>halup.rc</file>
+		</directory>
+	</module>
 </group>
Index: halppc/up/halup.rbuild
===================================================================
--- halppc/up/halup.rbuild	(revision 33290)
+++ halppc/up/halup.rbuild	(working copy)
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-<module name="halppc_up" type="kernelmodedll">
-	<importlibrary definition="../../hal/hal.def" />
-	<bootstrap installbase="$(CDOUTPUT)" nameoncd="hal.dll" />
-	<include base="halppc_generic">../include</include>
-	<include base="ntoskrnl">include</include>
-	<define name="_DISABLE_TIDENTS" />
-	<define name="_NTHAL_" />
-	<library>halppc_generic</library>
-	<library>ntoskrnl</library>
-	<file>halinit_up.c</file>
-	<file>halup.rc</file>
-</module>
Index: halx86/directory.rbuild
===================================================================
--- halx86/directory.rbuild	(revision 33290)
+++ halx86/directory.rbuild	(working copy)
@@ -5,65 +5,73 @@
 		<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>
+	<if property="SARCH" value="">
+		<module name="halup" type="kernelmodedll" entrypoint="0" installname="hal.dll">
+			<importlibrary definition="../hal/hal_i386.def" />
+			<bootstrap installbase="$(CDOUTPUT)" nameoncd="hal.dll" />
+			<include>include</include>
+			<include base="hal">.</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" installname="halmp.dll">
+			<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>
+	</if>
+
+	<if property="SARCH" value="xbox">
+		<module name="halup" type="kernelmodedll" entrypoint="0" allowwarnings="true" installname="hal.dll">
+			<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>
+	</if>
+
 </group>