Ditto for HAL
Modified: trunk/reactos/hal/hal/hal.c
Modified: trunk/reactos/hal/halx86/generic/adapter.c
Modified: trunk/reactos/hal/halx86/generic/beep.c
Modified: trunk/reactos/hal/halx86/generic/bus.c
Modified: trunk/reactos/hal/halx86/generic/display.c
Modified: trunk/reactos/hal/halx86/generic/dma.c
Modified: trunk/reactos/hal/halx86/generic/drive.c
Modified: trunk/reactos/hal/halx86/generic/enum.c
Modified: trunk/reactos/hal/halx86/generic/fmutex.c
Modified: trunk/reactos/hal/halx86/generic/halinit.c
Modified: trunk/reactos/hal/halx86/generic/ipi.c
Modified: trunk/reactos/hal/halx86/generic/irql.c
Modified: trunk/reactos/hal/halx86/generic/isa.c
Modified: trunk/reactos/hal/halx86/generic/kdbg.c
Modified: trunk/reactos/hal/halx86/generic/mca.c
Modified: trunk/reactos/hal/halx86/generic/misc.c
Modified: trunk/reactos/hal/halx86/generic/pci.c
Modified: trunk/reactos/hal/halx86/generic/portio.c
Modified: trunk/reactos/hal/halx86/generic/processor.c
Modified: trunk/reactos/hal/halx86/generic/reboot.c
Modified: trunk/reactos/hal/halx86/generic/resource.c
Modified: trunk/reactos/hal/halx86/generic/spinlock.c
Modified: trunk/reactos/hal/halx86/generic/sysbus.c
Modified: trunk/reactos/hal/halx86/generic/sysinfo.c
Modified: trunk/reactos/hal/halx86/generic/time.c
Modified: trunk/reactos/hal/halx86/generic/timer.c
Modified: trunk/reactos/hal/halx86/include/hal.h
Modified: trunk/reactos/hal/halx86/mp/apic.c
Modified: trunk/reactos/hal/halx86/mp/halinit_mp.c
Modified: trunk/reactos/hal/halx86/mp/ioapic.c
Modified: trunk/reactos/hal/halx86/mp/ipi_mp.c
Modified: trunk/reactos/hal/halx86/mp/mpconfig.c
Modified: trunk/reactos/hal/halx86/mp/mpsirql.c
Modified: trunk/reactos/hal/halx86/mp/processor_mp.c
Modified: trunk/reactos/hal/halx86/mp/resource_mp.c
Modified: trunk/reactos/hal/halx86/up/halinit_up.c
Modified: trunk/reactos/hal/halx86/xbox/font.c
Modified: trunk/reactos/hal/halx86/xbox/halinit_xbox.c
Modified: trunk/reactos/hal/halx86/xbox/halxbox.xml
Modified: trunk/reactos/hal/halx86/xbox/part_xbox.c
Modified: trunk/reactos/hal/halx86/xbox/pci_xbox.c

Modified: trunk/reactos/hal/hal/hal.c
--- trunk/reactos/hal/hal/hal.c	2005-06-19 22:50:59 UTC (rev 16126)
+++ trunk/reactos/hal/hal/hal.c	2005-06-19 22:53:49 UTC (rev 16127)
@@ -14,8 +14,9 @@
 #include <ddk/ntddk.h>
 #include <roscfg.h>
 
+#include <internal/debug.h>
 #define NDEBUG
-#include <internal/debug.h>
+#include <debug.h>
 
 typedef struct _LOADER_PARAMETER_BLOCK *PLOADER_PARAMETER_BLOCK;
 typedef struct _KD_PORT_INFORMATION *PKD_PORT_INFORMATION;

Modified: trunk/reactos/hal/halx86/generic/adapter.c
--- trunk/reactos/hal/halx86/generic/adapter.c	2005-06-19 22:50:59 UTC (rev 16126)
+++ trunk/reactos/hal/halx86/generic/adapter.c	2005-06-19 22:53:49 UTC (rev 16127)
@@ -13,8 +13,9 @@
 
 /* INCLUDES *****************************************************************/
 
+#include <hal.h>
 #define NDEBUG
-#include <hal.h>
+#include <debug.h>
 
 /* Hmm, needed for KDBG := 1. Why? */
 extern POBJECT_TYPE IMPORTED IoAdapterObjectType;

Modified: trunk/reactos/hal/halx86/generic/beep.c
--- trunk/reactos/hal/halx86/generic/beep.c	2005-06-19 22:50:59 UTC (rev 16126)
+++ trunk/reactos/hal/halx86/generic/beep.c	2005-06-19 22:53:49 UTC (rev 16127)
@@ -10,8 +10,9 @@
 
 /* INCLUDES *****************************************************************/
 
+#include <hal.h>
 #define NDEBUG
-#include <hal.h>
+#include <debug.h>
 
 
 /* CONSTANTS *****************************************************************/

Modified: trunk/reactos/hal/halx86/generic/bus.c
--- trunk/reactos/hal/halx86/generic/bus.c	2005-06-19 22:50:59 UTC (rev 16126)
+++ trunk/reactos/hal/halx86/generic/bus.c	2005-06-19 22:53:49 UTC (rev 16127)
@@ -15,8 +15,9 @@
 
 /* INCLUDES *****************************************************************/
 
+#include <hal.h>
 #define NDEBUG
-#include <hal.h>
+#include <debug.h>
 
 /* GLOBALS *******************************************************************/
 

Modified: trunk/reactos/hal/halx86/generic/display.c
--- trunk/reactos/hal/halx86/generic/display.c	2005-06-19 22:50:59 UTC (rev 16126)
+++ trunk/reactos/hal/halx86/generic/display.c	2005-06-19 22:53:49 UTC (rev 16127)
@@ -121,8 +121,9 @@
  * since there is already support for them via the VideoPortInt10 routine.
  */
 
+#include <hal.h>
 #define NDEBUG
-#include <hal.h>
+#include <debug.h>
 
 
 #define SCREEN_SYNCHRONIZATION

Modified: trunk/reactos/hal/halx86/generic/dma.c
--- trunk/reactos/hal/halx86/generic/dma.c	2005-06-19 22:50:59 UTC (rev 16126)
+++ trunk/reactos/hal/halx86/generic/dma.c	2005-06-19 22:53:49 UTC (rev 16127)
@@ -11,8 +11,9 @@
 
 /* INCLUDES *****************************************************************/
 
+#include <hal.h>
 #define NDEBUG
-#include <hal.h>
+#include <debug.h>
 
 /* Adapters for each channel */
 PADAPTER_OBJECT HalpEisaAdapter[8];

Modified: trunk/reactos/hal/halx86/generic/drive.c
--- trunk/reactos/hal/halx86/generic/drive.c	2005-06-19 22:50:59 UTC (rev 16126)
+++ trunk/reactos/hal/halx86/generic/drive.c	2005-06-19 22:53:49 UTC (rev 16127)
@@ -11,8 +11,9 @@
 
 /* INCLUDES *****************************************************************/
 
+#include <hal.h>
 #define NDEBUG
-#include <hal.h>
+#include <debug.h>
 
 /* FUNCTIONS *****************************************************************/
 

Modified: trunk/reactos/hal/halx86/generic/enum.c
--- trunk/reactos/hal/halx86/generic/enum.c	2005-06-19 22:50:59 UTC (rev 16126)
+++ trunk/reactos/hal/halx86/generic/enum.c	2005-06-19 22:53:49 UTC (rev 16127)
@@ -11,8 +11,9 @@
 
 /* INCLUDES *****************************************************************/
 
+#include <hal.h>
 #define NDEBUG
-#include <hal.h>
+#include <debug.h>
 
 VOID
 HalpStartEnumerator (VOID)

Modified: trunk/reactos/hal/halx86/generic/fmutex.c
--- trunk/reactos/hal/halx86/generic/fmutex.c	2005-06-19 22:50:59 UTC (rev 16126)
+++ trunk/reactos/hal/halx86/generic/fmutex.c	2005-06-19 22:53:49 UTC (rev 16127)
@@ -12,8 +12,9 @@
 
 /* INCLUDES *****************************************************************/
 
+#include <hal.h>
 #define NDEBUG
-#include <hal.h>
+#include <debug.h>
 
 /* FUNCTIONS *****************************************************************/
 

Modified: trunk/reactos/hal/halx86/generic/halinit.c
--- trunk/reactos/hal/halx86/generic/halinit.c	2005-06-19 22:50:59 UTC (rev 16126)
+++ trunk/reactos/hal/halx86/generic/halinit.c	2005-06-19 22:53:49 UTC (rev 16127)
@@ -11,8 +11,9 @@
 
 /* INCLUDES *****************************************************************/
 
+#include <hal.h>
 #define NDEBUG
-#include <hal.h>
+#include <debug.h>
 
 /* GLOBALS *****************************************************************/
 

Modified: trunk/reactos/hal/halx86/generic/ipi.c
--- trunk/reactos/hal/halx86/generic/ipi.c	2005-06-19 22:50:59 UTC (rev 16126)
+++ trunk/reactos/hal/halx86/generic/ipi.c	2005-06-19 22:53:49 UTC (rev 16127)
@@ -9,8 +9,9 @@
 
 /* INCLUDES *****************************************************************/
 
+#include <hal.h>
 #define NDEBUG
-#include <hal.h>
+#include <debug.h>
 
 /* FUNCTIONS ****************************************************************/
 

Modified: trunk/reactos/hal/halx86/generic/irql.c
--- trunk/reactos/hal/halx86/generic/irql.c	2005-06-19 22:50:59 UTC (rev 16126)
+++ trunk/reactos/hal/halx86/generic/irql.c	2005-06-19 22:53:49 UTC (rev 16127)
@@ -9,8 +9,9 @@
 
 /* INCLUDES *****************************************************************/
 
+#include <hal.h>
 #define NDEBUG
-#include <hal.h>
+#include <debug.h>
 
 /* GLOBALS ******************************************************************/
 

Modified: trunk/reactos/hal/halx86/generic/isa.c
--- trunk/reactos/hal/halx86/generic/isa.c	2005-06-19 22:50:59 UTC (rev 16126)
+++ trunk/reactos/hal/halx86/generic/isa.c	2005-06-19 22:53:49 UTC (rev 16127)
@@ -11,8 +11,9 @@
 
 /* INCLUDES ***************************************************************/
 
+#include <hal.h>
 #define NDEBUG
-#include <hal.h>
+#include <debug.h>
 
 /* FUNCTIONS *****************************************************************/
 

Modified: trunk/reactos/hal/halx86/generic/kdbg.c
--- trunk/reactos/hal/halx86/generic/kdbg.c	2005-06-19 22:50:59 UTC (rev 16126)
+++ trunk/reactos/hal/halx86/generic/kdbg.c	2005-06-19 22:53:49 UTC (rev 16127)
@@ -12,8 +12,9 @@
 
 /* INCLUDES *****************************************************************/
 
+#include <hal.h>
 #define NDEBUG
-#include <hal.h>
+#include <debug.h>
 
 
 #define DEFAULT_BAUD_RATE    19200

Modified: trunk/reactos/hal/halx86/generic/mca.c
--- trunk/reactos/hal/halx86/generic/mca.c	2005-06-19 22:50:59 UTC (rev 16126)
+++ trunk/reactos/hal/halx86/generic/mca.c	2005-06-19 22:53:49 UTC (rev 16127)
@@ -32,8 +32,9 @@
 
 /* INCLUDES *****************************************************************/
 
+#include <hal.h>
 #define NDEBUG
-#include <hal.h>
+#include <debug.h>
 
 /* FUNCTIONS ****************************************************************/
 

Modified: trunk/reactos/hal/halx86/generic/misc.c
--- trunk/reactos/hal/halx86/generic/misc.c	2005-06-19 22:50:59 UTC (rev 16126)
+++ trunk/reactos/hal/halx86/generic/misc.c	2005-06-19 22:53:49 UTC (rev 16127)
@@ -9,8 +9,9 @@
 
 /* INCLUDES *****************************************************************/
 
+#include <hal.h>
 #define NDEBUG
-#include <hal.h>
+#include <debug.h>
 
 
 /* FUNCTIONS ****************************************************************/

Modified: trunk/reactos/hal/halx86/generic/pci.c
--- trunk/reactos/hal/halx86/generic/pci.c	2005-06-19 22:50:59 UTC (rev 16126)
+++ trunk/reactos/hal/halx86/generic/pci.c	2005-06-19 22:53:49 UTC (rev 16127)
@@ -18,8 +18,9 @@
 
 /* INCLUDES *****************************************************************/
 
+#include <hal.h>
 #define NDEBUG
-#include <hal.h>
+#include <debug.h>
 
 
 /* MACROS ******************************************************************/

Modified: trunk/reactos/hal/halx86/generic/portio.c
--- trunk/reactos/hal/halx86/generic/portio.c	2005-06-19 22:50:59 UTC (rev 16126)
+++ trunk/reactos/hal/halx86/generic/portio.c	2005-06-19 22:53:49 UTC (rev 16127)
@@ -9,8 +9,9 @@
  *                  Created 18/10/99
  */
 
+#include <hal.h>
 #define NDEBUG
-#include <hal.h>
+#include <debug.h>
 
 /* FUNCTIONS ****************************************************************/
 

Modified: trunk/reactos/hal/halx86/generic/processor.c
--- trunk/reactos/hal/halx86/generic/processor.c	2005-06-19 22:50:59 UTC (rev 16126)
+++ trunk/reactos/hal/halx86/generic/processor.c	2005-06-19 22:53:49 UTC (rev 16127)
@@ -14,8 +14,9 @@
 
 /* INCLUDES *****************************************************************/
 
+#include <hal.h>
 #define NDEBUG
-#include <hal.h>
+#include <debug.h>
 
 /* FUNCTIONS *****************************************************************/
 

Modified: trunk/reactos/hal/halx86/generic/reboot.c
--- trunk/reactos/hal/halx86/generic/reboot.c	2005-06-19 22:50:59 UTC (rev 16126)
+++ trunk/reactos/hal/halx86/generic/reboot.c	2005-06-19 22:53:49 UTC (rev 16127)
@@ -9,8 +9,9 @@
  *                  Created 11/10/99
  */
 
+#include <hal.h>
 #define NDEBUG
-#include <hal.h>
+#include <debug.h>
 
 
 static VOID

Modified: trunk/reactos/hal/halx86/generic/resource.c
--- trunk/reactos/hal/halx86/generic/resource.c	2005-06-19 22:50:59 UTC (rev 16126)
+++ trunk/reactos/hal/halx86/generic/resource.c	2005-06-19 22:53:49 UTC (rev 16127)
@@ -9,8 +9,9 @@
 
 /* INCLUDES *****************************************************************/
 
+#include <hal.h>
 #define NDEBUG
-#include <hal.h>
+#include <debug.h>
 
 
 /* FUNCTIONS ****************************************************************/

Modified: trunk/reactos/hal/halx86/generic/spinlock.c
--- trunk/reactos/hal/halx86/generic/spinlock.c	2005-06-19 22:50:59 UTC (rev 16126)
+++ trunk/reactos/hal/halx86/generic/spinlock.c	2005-06-19 22:53:49 UTC (rev 16127)
@@ -17,8 +17,9 @@
 
 /* INCLUDES ****************************************************************/
 
+#include <hal.h>
 #define NDEBUG
-#include <hal.h>
+#include <debug.h>
 
 /* Hmm, needed for KDBG := 1. Why? */
 #undef KeGetCurrentIrql

Modified: trunk/reactos/hal/halx86/generic/sysbus.c
--- trunk/reactos/hal/halx86/generic/sysbus.c	2005-06-19 22:50:59 UTC (rev 16126)
+++ trunk/reactos/hal/halx86/generic/sysbus.c	2005-06-19 22:53:49 UTC (rev 16127)
@@ -11,8 +11,9 @@
 
 /* INCLUDES *****************************************************************/
 
+#include <hal.h>
 #define NDEBUG
-#include <hal.h>
+#include <debug.h>
 
 
 /* FUNCTIONS ****************************************************************/

Modified: trunk/reactos/hal/halx86/generic/sysinfo.c
--- trunk/reactos/hal/halx86/generic/sysinfo.c	2005-06-19 22:50:59 UTC (rev 16126)
+++ trunk/reactos/hal/halx86/generic/sysinfo.c	2005-06-19 22:53:49 UTC (rev 16127)
@@ -10,8 +10,9 @@
 
 /* INCLUDES *****************************************************************/
 
+#include <hal.h>
 #define NDEBUG
-#include <hal.h>
+#include <debug.h>
 
 
 

Modified: trunk/reactos/hal/halx86/generic/time.c
--- trunk/reactos/hal/halx86/generic/time.c	2005-06-19 22:50:59 UTC (rev 16126)
+++ trunk/reactos/hal/halx86/generic/time.c	2005-06-19 22:53:49 UTC (rev 16127)
@@ -8,8 +8,9 @@
 
 /* INCLUDES *****************************************************************/
 
+#include <hal.h>
 #define NDEBUG
-#include <hal.h>
+#include <debug.h>
 
 
 /* MACROS and CONSTANTS ******************************************************/

Modified: trunk/reactos/hal/halx86/generic/timer.c
--- trunk/reactos/hal/halx86/generic/timer.c	2005-06-19 22:50:59 UTC (rev 16126)
+++ trunk/reactos/hal/halx86/generic/timer.c	2005-06-19 22:53:49 UTC (rev 16127)
@@ -32,8 +32,9 @@
 
 /* INCLUDES ***************************************************************/
 
+#include <hal.h>
 #define NDEBUG
-#include <hal.h>
+#include <debug.h>
 
 /* GLOBALS ******************************************************************/
 

Modified: trunk/reactos/hal/halx86/include/hal.h
--- trunk/reactos/hal/halx86/include/hal.h	2005-06-19 22:50:59 UTC (rev 16126)
+++ trunk/reactos/hal/halx86/include/hal.h	2005-06-19 22:53:49 UTC (rev 16127)
@@ -50,9 +50,6 @@
     OUT PVOID               *Object
 );
 
-/* Debug Header */
-#include <debug.h>
-
 /* Internal HAL Headers */
 #include "apic.h"
 #include "bus.h"

Modified: trunk/reactos/hal/halx86/mp/apic.c
--- trunk/reactos/hal/halx86/mp/apic.c	2005-06-19 22:50:59 UTC (rev 16126)
+++ trunk/reactos/hal/halx86/mp/apic.c	2005-06-19 22:53:49 UTC (rev 16127)
@@ -27,8 +27,9 @@
 
 /* INCLUDE ***********************************************************************/
 
+#include <hal.h>
 #define NDEBUG
-#include <hal.h>
+#include <debug.h>
 #include <internal/ntoskrnl.h>
 
 /* GLOBALS ***********************************************************************/

Modified: trunk/reactos/hal/halx86/mp/halinit_mp.c
--- trunk/reactos/hal/halx86/mp/halinit_mp.c	2005-06-19 22:50:59 UTC (rev 16126)
+++ trunk/reactos/hal/halx86/mp/halinit_mp.c	2005-06-19 22:53:49 UTC (rev 16127)
@@ -11,8 +11,9 @@
 
 /* INCLUDES *****************************************************************/
 
+#include <hal.h>
 #define NDEBUG
-#include <hal.h>
+#include <debug.h>
 
 /* FUNCTIONS ***************************************************************/
 

Modified: trunk/reactos/hal/halx86/mp/ioapic.c
--- trunk/reactos/hal/halx86/mp/ioapic.c	2005-06-19 22:50:59 UTC (rev 16126)
+++ trunk/reactos/hal/halx86/mp/ioapic.c	2005-06-19 22:53:49 UTC (rev 16127)
@@ -9,8 +9,9 @@
 
 /* INCLUDES *****************************************************************/
 
-#define NDEBUG
 #include <hal.h>
+#define NDEBUG
+#include <debug.h>
 
 /* GLOBALS *****************************************************************/
 

Modified: trunk/reactos/hal/halx86/mp/ipi_mp.c
--- trunk/reactos/hal/halx86/mp/ipi_mp.c	2005-06-19 22:50:59 UTC (rev 16126)
+++ trunk/reactos/hal/halx86/mp/ipi_mp.c	2005-06-19 22:53:49 UTC (rev 16127)
@@ -9,8 +9,9 @@
 
 /* INCLUDES *****************************************************************/
 
+#include <hal.h>
 #define NDEBUG
-#include <hal.h>
+#include <debug.h>
 
 /* FUNCTIONS ****************************************************************/
 

Modified: trunk/reactos/hal/halx86/mp/mpconfig.c
--- trunk/reactos/hal/halx86/mp/mpconfig.c	2005-06-19 22:50:59 UTC (rev 16126)
+++ trunk/reactos/hal/halx86/mp/mpconfig.c	2005-06-19 22:53:49 UTC (rev 16127)
@@ -9,8 +9,9 @@
 
 /* INCLUDES *****************************************************************/
 
-#define NDEBUG
 #include <hal.h>
+#define NDEBUG
+#include <debug.h>
 
 /* GLOBALS ******************************************************************/
 

Modified: trunk/reactos/hal/halx86/mp/mpsirql.c
--- trunk/reactos/hal/halx86/mp/mpsirql.c	2005-06-19 22:50:59 UTC (rev 16126)
+++ trunk/reactos/hal/halx86/mp/mpsirql.c	2005-06-19 22:53:49 UTC (rev 16127)
@@ -11,8 +11,9 @@
 
 /* INCLUDES *****************************************************************/
 
+#include <hal.h>
 #define NDEBUG
-#include <hal.h>
+#include <debug.h>
 
 /* GLOBALS ******************************************************************/;
 

Modified: trunk/reactos/hal/halx86/mp/processor_mp.c
--- trunk/reactos/hal/halx86/mp/processor_mp.c	2005-06-19 22:50:59 UTC (rev 16126)
+++ trunk/reactos/hal/halx86/mp/processor_mp.c	2005-06-19 22:53:49 UTC (rev 16127)
@@ -14,8 +14,9 @@
 
 /* INCLUDES *****************************************************************/
 
+#include <hal.h>
 #define NDEBUG
-#include <hal.h>
+#include <debug.h>
 
 /* FUNCTIONS *****************************************************************/
 

Modified: trunk/reactos/hal/halx86/mp/resource_mp.c
--- trunk/reactos/hal/halx86/mp/resource_mp.c	2005-06-19 22:50:59 UTC (rev 16126)
+++ trunk/reactos/hal/halx86/mp/resource_mp.c	2005-06-19 22:53:49 UTC (rev 16127)
@@ -9,8 +9,9 @@
 
 /* INCLUDES *****************************************************************/
 
+#include <hal.h>
 #define NDEBUG
-#include <hal.h>
+#include <debug.h>
 
 /* FUNCTIONS ****************************************************************/
 

Modified: trunk/reactos/hal/halx86/up/halinit_up.c
--- trunk/reactos/hal/halx86/up/halinit_up.c	2005-06-19 22:50:59 UTC (rev 16126)
+++ trunk/reactos/hal/halx86/up/halinit_up.c	2005-06-19 22:53:49 UTC (rev 16127)
@@ -11,8 +11,9 @@
 
 /* INCLUDES *****************************************************************/
 
+#include <hal.h>
 #define NDEBUG
-#include <hal.h>
+#include <debug.h>
 
 /* FUNCTIONS ***************************************************************/
 

Modified: trunk/reactos/hal/halx86/xbox/font.c
--- trunk/reactos/hal/halx86/xbox/font.c	2005-06-19 22:50:59 UTC (rev 16126)
+++ trunk/reactos/hal/halx86/xbox/font.c	2005-06-19 22:53:49 UTC (rev 16127)
@@ -14,8 +14,9 @@
 #include <ddk/ntddk.h>
 #include "halxbox.h"
 
+#include <internal/debug.h>
 #define NDEBUG
-#include <internal/debug.h>
+#include <debug.h>
 
 BYTE XboxFont8x16[256 * 16] =
 {

Modified: trunk/reactos/hal/halx86/xbox/halinit_xbox.c
--- trunk/reactos/hal/halx86/xbox/halinit_xbox.c	2005-06-19 22:50:59 UTC (rev 16126)
+++ trunk/reactos/hal/halx86/xbox/halinit_xbox.c	2005-06-19 22:53:49 UTC (rev 16127)
@@ -15,8 +15,9 @@
 #include <hal.h>
 #include "halxbox.h"
 
+#include <internal/debug.h>
 #define NDEBUG
-#include <internal/debug.h>
+#include <debug.h>
 
 /* FUNCTIONS ***************************************************************/
 

Modified: trunk/reactos/hal/halx86/xbox/halxbox.xml
--- trunk/reactos/hal/halx86/xbox/halxbox.xml	2005-06-19 22:50:59 UTC (rev 16126)
+++ trunk/reactos/hal/halx86/xbox/halxbox.xml	2005-06-19 22:53:49 UTC (rev 16127)
@@ -1,4 +1,4 @@
-<module name="halxbox" type="kernelmodedll">
+<module name="halxbox" type="kernelmodedll" warnings="true">
 	<importlibrary definition="../../hal/hal.def" />
 	<include base="hal_generic">../include</include>
 	<include base="ntoskrnl">include</include>

Modified: trunk/reactos/hal/halx86/xbox/part_xbox.c
--- trunk/reactos/hal/halx86/xbox/part_xbox.c	2005-06-19 22:50:59 UTC (rev 16126)
+++ trunk/reactos/hal/halx86/xbox/part_xbox.c	2005-06-19 22:53:49 UTC (rev 16127)
@@ -15,8 +15,9 @@
 #include <ddk/ntdddisk.h>
 #include "halxbox.h"
 
+#include <internal/debug.h>
 #define NDEBUG
-#include <internal/debug.h>
+#include <debug.h>
 
 #define XBOX_SIGNATURE_SECTOR 3
 #define XBOX_SIGNATURE        ('B' | ('R' << 8) | ('F' << 16) | ('R' << 24))

Modified: trunk/reactos/hal/halx86/xbox/pci_xbox.c
--- trunk/reactos/hal/halx86/xbox/pci_xbox.c	2005-06-19 22:50:59 UTC (rev 16126)
+++ trunk/reactos/hal/halx86/xbox/pci_xbox.c	2005-06-19 22:53:49 UTC (rev 16127)
@@ -22,8 +22,9 @@
 #include <bus.h>
 #include "halxbox.h"
 
+#include <internal/debug.h>
 #define NDEBUG
-#include <internal/debug.h>
+#include <debug.h>
 
 /* VARIABLES ***************************************************************/