diff --git a/reactos/hal/halx86/hal_generic_up.rbuild b/reactos/hal/halx86/hal_generic_up.rbuild
index 609dfe01682..7b9bdc99661 100644
--- a/reactos/hal/halx86/hal_generic_up.rbuild
+++ b/reactos/hal/halx86/hal_generic_up.rbuild
@@ -6,7 +6,7 @@
include
- pic.c
+ pic.c
irq.S
processor.c
spinlock.c
diff --git a/reactos/hal/halx86/mp/apic.c b/reactos/hal/halx86/mp/apic.c
index 3b28024f174..32b5dd51a15 100644
--- a/reactos/hal/halx86/mp/apic.c
+++ b/reactos/hal/halx86/mp/apic.c
@@ -20,7 +20,7 @@
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
- * FILE: hal/halx86/apic.c
+ * FILE: hal/halx86/mp/apic.c
* PURPOSE:
* PROGRAMMER:
*/
diff --git a/reactos/hal/halx86/mp/halinit_mp.c b/reactos/hal/halx86/mp/halinit_mp.c
index d3e1faf89d5..e8d80e54af5 100644
--- a/reactos/hal/halx86/mp/halinit_mp.c
+++ b/reactos/hal/halx86/mp/halinit_mp.c
@@ -2,8 +2,8 @@
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
- * FILE: ntoskrnl/hal/x86/halinit.c
- * PURPOSE: Initalize the x86 hal
+ * FILE: hal/halx86/mp/halinit_mp.c
+ * PURPOSE: Initalize the x86 mp hal
* PROGRAMMER: David Welch (welch@cwcom.net)
* UPDATE HISTORY:
* 11/06/98: Created
diff --git a/reactos/hal/halx86/mp/ioapic.c b/reactos/hal/halx86/mp/ioapic.c
index 414147816aa..15710d93534 100644
--- a/reactos/hal/halx86/mp/ioapic.c
+++ b/reactos/hal/halx86/mp/ioapic.c
@@ -2,7 +2,7 @@
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
- * FILE: hal/halx86/generic/ioapic.c
+ * FILE: hal/halx86/mp/ioapic.c
* PURPOSE:
* PROGRAMMER:
*/
diff --git a/reactos/hal/halx86/mp/mpconfig.c b/reactos/hal/halx86/mp/mpconfig.c
index b7e40ad250f..42e2ac36a47 100644
--- a/reactos/hal/halx86/mp/mpconfig.c
+++ b/reactos/hal/halx86/mp/mpconfig.c
@@ -2,7 +2,7 @@
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
- * FILE: hal/halx86/generic/mpconfig.c
+ * FILE: hal/halx86/mp/mpconfig.c
* PURPOSE:
* PROGRAMMER:
*/
diff --git a/reactos/hal/halx86/mp/mps.S b/reactos/hal/halx86/mp/mps.S
index a73ccf687cf..094780f4826 100644
--- a/reactos/hal/halx86/mp/mps.S
+++ b/reactos/hal/halx86/mp/mps.S
@@ -2,7 +2,7 @@
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
- * FILE: ntoskrnl/hal/x86/mps.S
+ * FILE: hal/halx86/mp/mps.S
* PURPOSE: Intel MultiProcessor specification support
* PROGRAMMER: Casper S. Hornstrup (chorns@users.sourceforge.net)
* UPDATE HISTORY:
diff --git a/reactos/hal/halx86/mp/mpsboot.asm b/reactos/hal/halx86/mp/mpsboot.asm
index 2683eaa301c..2557e22ba82 100644
--- a/reactos/hal/halx86/mp/mpsboot.asm
+++ b/reactos/hal/halx86/mp/mpsboot.asm
@@ -1,7 +1,7 @@
;
; COPYRIGHT: See COPYING in the top level directory
; PROJECT: ReactOS kernel
-; FILE: ntoskrnl/hal/x86/mpsboot.c
+; FILE: hal/halx86/mp/mpsboot.c
; PURPOSE: Bootstrap code for application processors
; PROGRAMMER: Casper S. Hornstrup (chorns@users.sourceforge.net)
; UPDATE HISTORY:
diff --git a/reactos/hal/halx86/mp/mpsirql.c b/reactos/hal/halx86/mp/mpsirql.c
index 957cffd8f98..dc4984cfe70 100644
--- a/reactos/hal/halx86/mp/mpsirql.c
+++ b/reactos/hal/halx86/mp/mpsirql.c
@@ -1,7 +1,7 @@
/*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
- * FILE: ntoskrnl/hal/x86/mpsirql.c
+ * FILE: hal/halx86/mp/mpsirql.c
* PURPOSE: Implements IRQLs for multiprocessor systems
* PROGRAMMERS: David Welch (welch@cwcom.net)
* Casper S. Hornstrup (chorns@users.sourceforge.net)
diff --git a/reactos/hal/halx86/mp/spinlock.c b/reactos/hal/halx86/mp/spinlock.c
index 746088ffcfa..c8506adf02b 100644
--- a/reactos/hal/halx86/mp/spinlock.c
+++ b/reactos/hal/halx86/mp/spinlock.c
@@ -1,7 +1,7 @@
/*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
- * FILE: ntoskrnl/hal/x86/spinlock.c
+ * FILE: hal/halx86/mp/spinlock.c
* PURPOSE: Implements spinlocks
* PROGRAMMER: David Welch (welch@cwcom.net)
* Eric Kohl