- Remove the (now deprecated) ntoskrnl/internal/debug.h header and fix all its includers to use the global debug.h

svn path=/trunk/; revision=35806
2024-06-26 07:51:52 +00:00 · 2008-08-30 16:31:06 +00:00 · 2008-08-30 16:31:06 +00:00 · 12f349df1d
parent 5ae7cefa81
commit 12f349df1d
133 changed files with 132 additions and 157 deletions
--- a/reactos/ntoskrnl/cc/cacheman.c
+++ b/reactos/ntoskrnl/cc/cacheman.c
@ -11,7 +11,7 @@

 #include <ntoskrnl.h>
 #define NDEBUG
-#include <internal/debug.h>
+#include <debug.h>

 PFSN_PREFETCHER_GLOBALS CcPfGlobals;

--- a/reactos/ntoskrnl/cc/copy.c
+++ b/reactos/ntoskrnl/cc/copy.c
@ -11,7 +11,7 @@

 #include <ntoskrnl.h>
 #define NDEBUG
-#include <internal/debug.h>
+#include <debug.h>

 /* GLOBALS *******************************************************************/

--- a/reactos/ntoskrnl/cc/fs.c
+++ b/reactos/ntoskrnl/cc/fs.c
@ -11,7 +11,7 @@

 #include <ntoskrnl.h>
 #define NDEBUG
-#include <internal/debug.h>
+#include <debug.h>

 #ifndef VACB_MAPPING_GRANULARITY
 #define VACB_MAPPING_GRANULARITY (256 * 1024)
--- a/reactos/ntoskrnl/cc/mdl.c
+++ b/reactos/ntoskrnl/cc/mdl.c
@ -11,7 +11,7 @@

 #include <ntoskrnl.h>
 #define NDEBUG
-#include <internal/debug.h>
+#include <debug.h>

 /* FUNCTIONS *****************************************************************/

--- a/reactos/ntoskrnl/cc/pin.c
+++ b/reactos/ntoskrnl/cc/pin.c
@ -11,7 +11,7 @@

 #include <ntoskrnl.h>
 #define NDEBUG
-#include <internal/debug.h>
+#include <debug.h>

 /* GLOBALS *******************************************************************/

--- a/reactos/ntoskrnl/cc/view.c
+++ b/reactos/ntoskrnl/cc/view.c
@ -33,7 +33,7 @@

 #include <ntoskrnl.h>
 #define NDEBUG
-#include <internal/debug.h>
+#include <debug.h>

 #if defined (ALLOC_PRAGMA)
 #pragma alloc_text(INIT, CcInitView)
--- a/reactos/ntoskrnl/dbgk/dbgkobj.c
+++ b/reactos/ntoskrnl/dbgk/dbgkobj.c
@ -10,7 +10,7 @@

 #include <ntoskrnl.h>
 #define NDEBUG
-#include <internal/debug.h>
+#include <debug.h>

 POBJECT_TYPE DbgkDebugObjectType;
 FAST_MUTEX DbgkpProcessDebugPortMutex;
--- a/reactos/ntoskrnl/ex/atom.c
+++ b/reactos/ntoskrnl/ex/atom.c
@ -11,7 +11,7 @@

 #include <ntoskrnl.h>
 #define NDEBUG
-#include <internal/debug.h>
+#include <debug.h>

 #define TAG_ATOM TAG('A', 't', 'o', 'm')

--- a/reactos/ntoskrnl/ex/callback.c
+++ b/reactos/ntoskrnl/ex/callback.c
@ -10,7 +10,7 @@

 #include <ntoskrnl.h>
 #define NDEBUG
-#include <internal/debug.h>
+#include <debug.h>

 /* TYPES *********************************************************************/

--- a/reactos/ntoskrnl/ex/dbgctrl.c
+++ b/reactos/ntoskrnl/ex/dbgctrl.c
@ -10,7 +10,7 @@

 #include <ntoskrnl.h>
 #define NDEBUG
-#include <internal/debug.h>
+#include <debug.h>

 /* FUNCTIONS *****************************************************************/

--- a/reactos/ntoskrnl/ex/efi.c
+++ b/reactos/ntoskrnl/ex/efi.c
@ -10,7 +10,7 @@

 #include <ntoskrnl.h>
 #define NDEBUG
-#include <internal/debug.h>
+#include <debug.h>

 /* FUNCTIONS *****************************************************************/

--- a/reactos/ntoskrnl/ex/event.c
+++ b/reactos/ntoskrnl/ex/event.c
@ -11,7 +11,7 @@

 #include <ntoskrnl.h>
 #define NDEBUG
-#include <internal/debug.h>
+#include <debug.h>

 #if defined (ALLOC_PRAGMA)
 #pragma alloc_text(INIT, ExpInitializeEventImplementation)
--- a/reactos/ntoskrnl/ex/evtpair.c
+++ b/reactos/ntoskrnl/ex/evtpair.c
@ -11,7 +11,7 @@

 #include <ntoskrnl.h>
 #define NDEBUG
-#include <internal/debug.h>
+#include <debug.h>

 #if defined (ALLOC_PRAGMA)
 #pragma alloc_text(INIT, ExpInitializeEventPairImplementation)
--- a/reactos/ntoskrnl/ex/harderr.c
+++ b/reactos/ntoskrnl/ex/harderr.c
@ -10,7 +10,7 @@

 #include <ntoskrnl.h>
 #define NDEBUG
-#include <internal/debug.h>
+#include <debug.h>

 #define TAG_ERR TAG('E', 'r', 'r', ' ')

--- a/reactos/ntoskrnl/ex/locale.c
+++ b/reactos/ntoskrnl/ex/locale.c
@ -12,7 +12,7 @@

 #include <ntoskrnl.h>
 #define NDEBUG
-#include <internal/debug.h>
+#include <debug.h>

 /* GLOBALS *******************************************************************/

--- a/reactos/ntoskrnl/ex/mutant.c
+++ b/reactos/ntoskrnl/ex/mutant.c
@ -11,7 +11,7 @@

 #include <ntoskrnl.h>
 #define NDEBUG
-#include <internal/debug.h>
+#include <debug.h>

 #if defined (ALLOC_PRAGMA)
 #pragma alloc_text(INIT, ExpInitializeMutantImplementation)
--- a/reactos/ntoskrnl/ex/profile.c
+++ b/reactos/ntoskrnl/ex/profile.c
@ -11,7 +11,7 @@

 #include <ntoskrnl.h>
 #define NDEBUG
-#include <internal/debug.h>
+#include <debug.h>

 #if defined (ALLOC_PRAGMA)
 #pragma alloc_text(INIT, ExpInitializeProfileImplementation)
--- a/reactos/ntoskrnl/ex/rundown.c
+++ b/reactos/ntoskrnl/ex/rundown.c
@ -11,7 +11,7 @@

 #include <ntoskrnl.h>
 #define NDEBUG
-#include <internal/debug.h>
+#include <debug.h>

 /* FUNCTIONS *****************************************************************/

--- a/reactos/ntoskrnl/ex/sem.c
+++ b/reactos/ntoskrnl/ex/sem.c
@ -11,7 +11,7 @@

 #include <ntoskrnl.h>
 #define NDEBUG
-#include <internal/debug.h>
+#include <debug.h>

 #if defined (ALLOC_PRAGMA)
 #pragma alloc_text(INIT, ExpInitializeSemaphoreImplementation)
--- a/reactos/ntoskrnl/ex/shutdown.c
+++ b/reactos/ntoskrnl/ex/shutdown.c
@ -10,7 +10,7 @@
 /* INCLUDES *****************************************************************/

 #include <ntoskrnl.h>
-#include <internal/debug.h>
+#include <debug.h>

 /* FUNCTIONS *****************************************************************/

--- a/reactos/ntoskrnl/ex/sysinfo.c
+++ b/reactos/ntoskrnl/ex/sysinfo.c
@ -12,7 +12,7 @@

 #include <ntoskrnl.h>
 #define NDEBUG
-#include <internal/debug.h>
+#include <debug.h>

 VOID MmPrintMemoryStatistic(VOID);

--- a/reactos/ntoskrnl/ex/time.c
+++ b/reactos/ntoskrnl/ex/time.c
@ -11,7 +11,7 @@

 #include <ntoskrnl.h>
 #define NDEBUG
-#include <internal/debug.h>
+#include <debug.h>

 #define TICKSPERMINUTE  600000000

--- a/reactos/ntoskrnl/ex/uuid.c
+++ b/reactos/ntoskrnl/ex/uuid.c
@ -12,7 +12,7 @@

 #include <ntoskrnl.h>
 #define NDEBUG
-#include <internal/debug.h>
+#include <debug.h>

 #define SEED_BUFFER_SIZE 6

--- a/reactos/ntoskrnl/ex/win32k.c
+++ b/reactos/ntoskrnl/ex/win32k.c
@ -8,7 +8,7 @@

 #include <ntoskrnl.h>
 #define NDEBUG
-#include <internal/debug.h>
+#include <debug.h>

 #if defined (ALLOC_PRAGMA)
 #pragma alloc_text(INIT, ExpWin32kInit)
--- a/reactos/ntoskrnl/ex/work.c
+++ b/reactos/ntoskrnl/ex/work.c
@ -10,7 +10,7 @@

 #include <ntoskrnl.h>
 #define NDEBUG
-#include <internal/debug.h>
+#include <debug.h>

 #if defined (ALLOC_PRAGMA)
 #pragma alloc_text(INIT, ExpInitializeWorkerThreads)
--- a/reactos/ntoskrnl/fstub/disksup.c
+++ b/reactos/ntoskrnl/fstub/disksup.c
@ -12,7 +12,7 @@

 #include <ntoskrnl.h>
 #define NDEBUG
-#include <internal/debug.h>
+#include <debug.h>
 #include <internal/hal.h>

 /* DEPRECATED FUNCTIONS ******************************************************/
--- a/reactos/ntoskrnl/fstub/fstubex.c
+++ b/reactos/ntoskrnl/fstub/fstubex.c
@ -10,7 +10,7 @@

 #include <ntoskrnl.h>
 #define NDEBUG
-#include <internal/debug.h>
+#include <debug.h>

 /* FUNCTIONS *****************************************************************/

--- a/reactos/ntoskrnl/fstub/halstub.c
+++ b/reactos/ntoskrnl/fstub/halstub.c
@ -10,7 +10,7 @@

 #include <ntoskrnl.h>
 #define NDEBUG
-#include <internal/debug.h>
+#include <debug.h>

 /* GLOBALS *******************************************************************/

--- a/reactos/ntoskrnl/include/internal/debug.h
+++ b/reactos/ntoskrnl/include/internal/debug.h
@ -1,25 +0,0 @@
-/*
- * COPYRIGHT:       See COPYING in the top level directory
- * PROJECT:         ReactOS kernel
- * FILE:            include/internal/debug.h
- * PURPOSE:         Useful debugging macros
- * PROGRAMMER:      David Welch (welch@mcmail.com)
- * UPDATE HISTORY:
- *                28/05/98: Created
- */
-
-/*
- * NOTES: Define DBG in configuration file for "checked" version
- *        Define NDEBUG before including this header to disable debugging
- *        macros
- *        Define NASSERT before including this header to disable assertions
- */
-
-
-#ifndef __NTOSKRNL_DEBUG
-#define __NTOSKRNL_DEBUG
-
-#include <reactos/debug.h>
-
-
-#endif /* __NTOSKRNL_DEBUG */
--- a/reactos/ntoskrnl/io/iomgr/adapter.c
+++ b/reactos/ntoskrnl/io/iomgr/adapter.c
@ -11,7 +11,7 @@

 #include <ntoskrnl.h>
 #define NDEBUG
-#include <internal/debug.h>
+#include <debug.h>

 /* DATA **********************************************************************/

--- a/reactos/ntoskrnl/io/iomgr/bootlog.c
+++ b/reactos/ntoskrnl/io/iomgr/bootlog.c
@ -11,7 +11,7 @@

 #include <ntoskrnl.h>
 #define NDEBUG
-#include <internal/debug.h>
+#include <debug.h>

 #if defined (ALLOC_PRAGMA)
 #pragma alloc_text(INIT, IopInitBootLog)
--- a/reactos/ntoskrnl/io/iomgr/controller.c
+++ b/reactos/ntoskrnl/io/iomgr/controller.c
@ -9,7 +9,7 @@
 /* INCLUDES *****************************************************************/

 #include <ntoskrnl.h>
-#include <internal/debug.h>
+#include <debug.h>

 /* GLOBALS *******************************************************************/

--- a/reactos/ntoskrnl/io/iomgr/device.c
+++ b/reactos/ntoskrnl/io/iomgr/device.c
@ -12,7 +12,7 @@

 #include <ntoskrnl.h>
 #define NDEBUG
-#include <internal/debug.h>
+#include <debug.h>

 /* GLOBALS ********************************************************************/

--- a/reactos/ntoskrnl/io/iomgr/deviface.c
+++ b/reactos/ntoskrnl/io/iomgr/deviface.c
@ -14,7 +14,7 @@
 #include <ntoskrnl.h>

 #define NDEBUG
-#include <internal/debug.h>
+#include <debug.h>

 /* FUNCTIONS *****************************************************************/

--- a/reactos/ntoskrnl/io/iomgr/driver.c
+++ b/reactos/ntoskrnl/io/iomgr/driver.c
@ -12,7 +12,7 @@

 #include <ntoskrnl.h>
 #define NDEBUG
-#include <internal/debug.h>
+#include <debug.h>

 /* GLOBALS ********************************************************************/

--- a/reactos/ntoskrnl/io/iomgr/drvrlist.c
+++ b/reactos/ntoskrnl/io/iomgr/drvrlist.c
@ -10,7 +10,7 @@

 #include <ntoskrnl.h>
 #define NDEBUG
-#include <internal/debug.h>
+#include <debug.h>

 typedef struct _SERVICE_GROUP
 {
--- a/reactos/ntoskrnl/io/iomgr/error.c
+++ b/reactos/ntoskrnl/io/iomgr/error.c
@ -10,7 +10,7 @@

 #include <ntoskrnl.h>
 #define NDEBUG
-#include <internal/debug.h>
+#include <debug.h>

 /* TYPES *********************************************************************/

--- a/reactos/ntoskrnl/io/iomgr/iocomp.c
+++ b/reactos/ntoskrnl/io/iomgr/iocomp.c
@ -11,7 +11,7 @@

 #include <ntoskrnl.h>
 #define NDEBUG
-#include <internal/debug.h>
+#include <debug.h>

 POBJECT_TYPE IoCompletionType;

--- a/reactos/ntoskrnl/io/iomgr/ioevent.c
+++ b/reactos/ntoskrnl/io/iomgr/ioevent.c
@ -10,7 +10,7 @@
 /* INCLUDES *****************************************************************/

 #include <ntoskrnl.h>
-#include <internal/debug.h>
+#include <debug.h>

 /* PRIVATE FUNCTIONS *********************************************************/

--- a/reactos/ntoskrnl/io/iomgr/iomdl.c
+++ b/reactos/ntoskrnl/io/iomgr/iomdl.c
@ -10,7 +10,7 @@

 #include <ntoskrnl.h>
 #define NDEBUG
-#include <internal/debug.h>
+#include <debug.h>

 /* FUNCTIONS *****************************************************************/

--- a/reactos/ntoskrnl/io/iomgr/iomgr.c
+++ b/reactos/ntoskrnl/io/iomgr/iomgr.c
@ -11,7 +11,7 @@

 #include <ntoskrnl.h>
 #define NDEBUG
-#include <internal/debug.h>
+#include <debug.h>

 ULONG IopTraceLevel = 0;
 BOOLEAN PnpSystemInit = FALSE;
--- a/reactos/ntoskrnl/io/iomgr/iorsrce.c
+++ b/reactos/ntoskrnl/io/iomgr/iorsrce.c
@ -11,7 +11,7 @@
 /* INCLUDES *****************************************************************/

 #include <ntoskrnl.h>
-#include <internal/debug.h>
+#include <debug.h>

 /* GLOBALS *******************************************************************/

--- a/reactos/ntoskrnl/io/iomgr/iotimer.c
+++ b/reactos/ntoskrnl/io/iomgr/iotimer.c
@ -10,7 +10,7 @@

 #include <ntoskrnl.h>
 #define NDEBUG
-#include <internal/debug.h>
+#include <debug.h>

 /* GLOBALS *******************************************************************/

--- a/reactos/ntoskrnl/io/iomgr/iowork.c
+++ b/reactos/ntoskrnl/io/iomgr/iowork.c
@ -11,7 +11,7 @@

 #include <ntoskrnl.h>
 #define NDEBUG
-#include <internal/debug.h>
+#include <debug.h>

 /* PRIVATE FUNCTIONS *********************************************************/

--- a/reactos/ntoskrnl/io/iomgr/irp.c
+++ b/reactos/ntoskrnl/io/iomgr/irp.c
@ -12,7 +12,7 @@

 #include <ntoskrnl.h>
 #define NDEBUG
-#include <internal/debug.h>
+#include <debug.h>

 /* Undefine some macros we implement here */
 #undef IoCallDriver
--- a/reactos/ntoskrnl/io/iomgr/irq.c
+++ b/reactos/ntoskrnl/io/iomgr/irq.c
@ -10,7 +10,7 @@

 #include <ntoskrnl.h>
 #define NDEBUG
-#include <internal/debug.h>
+#include <debug.h>

 /* FUNCTIONS *****************************************************************/

--- a/reactos/ntoskrnl/io/iomgr/remlock.c
+++ b/reactos/ntoskrnl/io/iomgr/remlock.c
@ -11,7 +11,7 @@

 #include <ntoskrnl.h>
 #define NDEBUG
-#include <internal/debug.h>
+#include <debug.h>

 /* FUNCTIONS *****************************************************************/

--- a/reactos/ntoskrnl/io/iomgr/symlink.c
+++ b/reactos/ntoskrnl/io/iomgr/symlink.c
@ -11,7 +11,7 @@

 #include <ntoskrnl.h>
 #define NDEBUG
-#include <internal/debug.h>
+#include <debug.h>

 /* FUNCTIONS ****************************************************************/

--- a/reactos/ntoskrnl/io/iomgr/util.c
+++ b/reactos/ntoskrnl/io/iomgr/util.c
@ -12,7 +12,7 @@

 #include <ntoskrnl.h>
 #define NDEBUG
-#include <internal/debug.h>
+#include <debug.h>

 VOID
 NTAPI
--- a/reactos/ntoskrnl/io/iomgr/volume.c
+++ b/reactos/ntoskrnl/io/iomgr/volume.c
@ -12,7 +12,7 @@

 #include <ntoskrnl.h>
 #define NDEBUG
-#include <internal/debug.h>
+#include <debug.h>

 #if defined (ALLOC_PRAGMA)
 #pragma alloc_text(INIT, IoInitFileSystemImplementation)
--- a/reactos/ntoskrnl/io/pnpmgr/plugplay.c
+++ b/reactos/ntoskrnl/io/pnpmgr/plugplay.c
@ -10,7 +10,7 @@

 #include <ntoskrnl.h>
 #define NDEBUG
-#include <internal/debug.h>
+#include <debug.h>

 #if defined (ALLOC_PRAGMA)
 #pragma alloc_text(INIT, IopInitPlugPlayEvents)
--- a/reactos/ntoskrnl/io/pnpmgr/pnpdma.c
+++ b/reactos/ntoskrnl/io/pnpmgr/pnpdma.c
@ -10,7 +10,7 @@

 #include <ntoskrnl.h>
 #define NDEBUG
-#include <internal/debug.h>
+#include <debug.h>
 #include <wdmguid.h>

 /* PUBLIC FUNCTIONS **********************************************************/
--- a/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c
+++ b/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c
@ -11,7 +11,7 @@

 #include <ntoskrnl.h>
 #define NDEBUG
-#include <internal/debug.h>
+#include <debug.h>

 //#define ENABLE_ACPI

--- a/reactos/ntoskrnl/io/pnpmgr/pnproot.c
+++ b/reactos/ntoskrnl/io/pnpmgr/pnproot.c
@ -11,7 +11,7 @@

 #include <ntoskrnl.h>
 #define NDEBUG
-#include <internal/debug.h>
+#include <debug.h>

 /* GLOBALS *******************************************************************/

--- a/reactos/ntoskrnl/kd/i386/kdmemsup.c
+++ b/reactos/ntoskrnl/kd/i386/kdmemsup.c
@ -9,7 +9,7 @@

 #include <ntoskrnl.h>
 #define NDEBUG
-#include <internal/debug.h>
+#include <debug.h>

 #define HIGH_PHYS_MASK 0x80000000
 #define PAGE_TABLE_MASK 0x3ff
--- a/reactos/ntoskrnl/kd/kdinit.c
+++ b/reactos/ntoskrnl/kd/kdinit.c
@ -9,7 +9,7 @@

 #include <ntoskrnl.h>
 #define NDEBUG
-#include <internal/debug.h>
+#include <debug.h>

 #if defined (ALLOC_PRAGMA)
 #pragma alloc_text(INIT, KdInitSystem)
--- a/reactos/ntoskrnl/kd/kdio.c
+++ b/reactos/ntoskrnl/kd/kdio.c
@ -10,7 +10,7 @@
 /* INCLUDES ******************************************************************/

 #include <ntoskrnl.h>
-#include <internal/debug.h>
+#include <debug.h>

 /* GLOBALS *******************************************************************/

--- a/reactos/ntoskrnl/kd/kdmain.c
+++ b/reactos/ntoskrnl/kd/kdmain.c
@ -9,7 +9,7 @@

 #include <ntoskrnl.h>
 #define NDEBUG
-#include <internal/debug.h>
+#include <debug.h>

 /* VARIABLES ***************************************************************/

--- a/reactos/ntoskrnl/kd/wrappers/bochs.c
+++ b/reactos/ntoskrnl/kd/wrappers/bochs.c
@ -9,7 +9,7 @@

 #include <ntoskrnl.h>
 #define NDEBUG
-#include <internal/debug.h>
+#include <debug.h>

 /* bochs debug output */
 #define BOCHS_LOGGER_PORT ((PVOID)0xe9)
--- a/reactos/ntoskrnl/kd/wrappers/gdbstub.c
+++ b/reactos/ntoskrnl/kd/wrappers/gdbstub.c
@ -85,7 +85,7 @@

 #include <ntoskrnl.h>
 #define NDEBUG
-#include <internal/debug.h>
+#include <debug.h>

 /************************************************************************/
 /* BUFMAX defines the maximum number of characters in inbound/outbound buffers*/
--- a/reactos/ntoskrnl/kd/wrappers/gdbstub_powerpc.c
+++ b/reactos/ntoskrnl/kd/wrappers/gdbstub_powerpc.c
@ -85,7 +85,7 @@

 #include <ntoskrnl.h>
 #define NDEBUG
-#include <internal/debug.h>
+#include <debug.h>

 /************************************************************************/
 /* BUFMAX defines the maximum number of characters in inbound/outbound buffers*/
--- a/reactos/ntoskrnl/kd/wrappers/kdbg.c
+++ b/reactos/ntoskrnl/kd/wrappers/kdbg.c
@ -9,7 +9,7 @@

 #include <ntoskrnl.h>
 #define NDEBUG
-#include <internal/debug.h>
+#include <debug.h>

 VOID NTAPI
 KdbInitialize(PKD_DISPATCH_TABLE DispatchTable, ULONG BootPhase);
--- a/reactos/ntoskrnl/kdbg/kdb.c
+++ b/reactos/ntoskrnl/kdbg/kdb.c
@ -11,7 +11,7 @@

 #include <ntoskrnl.h>
 #define NDEBUG
-#include <internal/debug.h>
+#include <debug.h>

 /* TYPES *********************************************************************/

--- a/reactos/ntoskrnl/kdbg/kdb_cli.c
+++ b/reactos/ntoskrnl/kdbg/kdb_cli.c
@ -31,7 +31,7 @@
 #include <ntoskrnl.h>

 #define NDEBUG
-#include <internal/debug.h>
+#include <debug.h>

 /* DEFINES *******************************************************************/

--- a/reactos/ntoskrnl/kdbg/kdb_expr.c
+++ b/reactos/ntoskrnl/kdbg/kdb_expr.c
@ -35,7 +35,7 @@

 #include <ntoskrnl.h>
 #define NDEBUG
-#include <internal/debug.h>
+#include <debug.h>

 /* TYPES *********************************************************************/
 typedef enum _RPN_OP_TYPE
--- a/reactos/ntoskrnl/kdbg/kdb_symbols.c
+++ b/reactos/ntoskrnl/kdbg/kdb_symbols.c
@ -12,7 +12,7 @@
 #include <ntoskrnl.h>

 #define NDEBUG
-#include <internal/debug.h>
+#include <debug.h>

 /* GLOBALS ******************************************************************/

--- a/reactos/ntoskrnl/ke/apc.c
+++ b/reactos/ntoskrnl/ke/apc.c
@ -10,7 +10,7 @@

 #include <ntoskrnl.h>
 #define NDEBUG
-#include <internal/debug.h>
+#include <debug.h>

 /* PRIVATE FUNCTIONS *********************************************************/

--- a/reactos/ntoskrnl/ke/bug.c
+++ b/reactos/ntoskrnl/ke/bug.c
@ -10,7 +10,7 @@

 #include <ntoskrnl.h>
 #define NDEBUG
-#include <internal/debug.h>
+#include <debug.h>

 #if defined (ALLOC_PRAGMA)
 #pragma alloc_text(INIT, KiInitializeBugCheck)
--- a/reactos/ntoskrnl/ke/config.c
+++ b/reactos/ntoskrnl/ke/config.c
@ -10,7 +10,7 @@

 #include <ntoskrnl.h>
 #define NDEBUG
-#include <internal/debug.h>
+#include <debug.h>

 /* FUNCTIONS *****************************************************************/

--- a/reactos/ntoskrnl/ke/devqueue.c
+++ b/reactos/ntoskrnl/ke/devqueue.c
@ -10,7 +10,7 @@

 #include <ntoskrnl.h>
 #define NDEBUG
-#include <internal/debug.h>
+#include <debug.h>

 /* FUNCTIONS *****************************************************************/

--- a/reactos/ntoskrnl/ke/eventobj.c
+++ b/reactos/ntoskrnl/ke/eventobj.c
@ -10,7 +10,7 @@

 #include <ntoskrnl.h>
 #define NDEBUG
-#include <internal/debug.h>
+#include <debug.h>

 /* FUNCTIONS *****************************************************************/

--- a/reactos/ntoskrnl/ke/except.c
+++ b/reactos/ntoskrnl/ke/except.c
@ -10,7 +10,7 @@

 #include <ntoskrnl.h>
 #define NDEBUG
-#include <internal/debug.h>
+#include <debug.h>

 /* FUNCTIONS *****************************************************************/

--- a/reactos/ntoskrnl/ke/gate.c
+++ b/reactos/ntoskrnl/ke/gate.c
@ -10,7 +10,7 @@

 #include <ntoskrnl.h>
 #define NDEBUG
-#include <internal/debug.h>
+#include <debug.h>

 /* FUNCTIONS ****************************************************************/

--- a/reactos/ntoskrnl/ke/gmutex.c
+++ b/reactos/ntoskrnl/ke/gmutex.c
@ -11,7 +11,7 @@

 #include <ntoskrnl.h>
 #define NDEBUG
-#include <internal/debug.h>
+#include <debug.h>

 /* PRIVATE FUNCTIONS *********************************************************/

--- a/reactos/ntoskrnl/ke/i386/ldt.c
+++ b/reactos/ntoskrnl/ke/i386/ldt.c
@ -11,7 +11,7 @@

 #include <ntoskrnl.h>
 #define NDEBUG
-#include <internal/debug.h>
+#include <debug.h>

 /* GLOBALS *******************************************************************/

--- a/reactos/ntoskrnl/ke/i386/usercall.c
+++ b/reactos/ntoskrnl/ke/i386/usercall.c
@ -10,7 +10,7 @@

 #include <ntoskrnl.h>
 #define NDEBUG
-#include <internal/debug.h>
+#include <debug.h>

 extern PGDI_BATCHFLUSH_ROUTINE KeGdiFlushUserBatch;

--- a/reactos/ntoskrnl/ke/ipi.c
+++ b/reactos/ntoskrnl/ke/ipi.c
@ -10,7 +10,7 @@

 #include <ntoskrnl.h>
 #define NDEBUG
-#include <internal/debug.h>
+#include <debug.h>

 /* GLOBALS *******************************************************************/

--- a/reactos/ntoskrnl/ke/mutex.c
+++ b/reactos/ntoskrnl/ke/mutex.c
@ -10,7 +10,7 @@

 #include <ntoskrnl.h>
 #define NDEBUG
-#include <internal/debug.h>
+#include <debug.h>

 /* FUNCTIONS *****************************************************************/

--- a/reactos/ntoskrnl/ke/powerpc/ppc_irq.c
+++ b/reactos/ntoskrnl/ke/powerpc/ppc_irq.c
@ -21,7 +21,7 @@
 #include <ppcmmu/mmu.h>

 #define NDEBUG
-#include <internal/debug.h>
+#include <debug.h>

 KDPC KiExpireTimerDpc;
 extern ULONG KiMaximumDpcQueueDepth;
--- a/reactos/ntoskrnl/ke/procobj.c
+++ b/reactos/ntoskrnl/ke/procobj.c
@ -11,7 +11,7 @@

 #include <ntoskrnl.h>
 #define NDEBUG
-#include <internal/debug.h>
+#include <debug.h>

 /* GLOBALS *******************************************************************/

--- a/reactos/ntoskrnl/ke/profobj.c
+++ b/reactos/ntoskrnl/ke/profobj.c
@ -10,7 +10,7 @@

 #include <ntoskrnl.h>
 #define NDEBUG
-#include <internal/debug.h>
+#include <debug.h>

 /* GLOBALS *******************************************************************/

--- a/reactos/ntoskrnl/ke/queue.c
+++ b/reactos/ntoskrnl/ke/queue.c
@ -12,7 +12,7 @@

 #include <ntoskrnl.h>
 #define NDEBUG
-#include <internal/debug.h>
+#include <debug.h>

 /* PRIVATE FUNCTIONS *********************************************************/

--- a/reactos/ntoskrnl/ke/semphobj.c
+++ b/reactos/ntoskrnl/ke/semphobj.c
@ -10,7 +10,7 @@

 #include <ntoskrnl.h>
 #define NDEBUG
-#include <internal/debug.h>
+#include <debug.h>

 /* FUNCTIONS *****************************************************************/

--- a/reactos/ntoskrnl/ke/spinlock.c
+++ b/reactos/ntoskrnl/ke/spinlock.c
@ -10,7 +10,7 @@

 #include <ntoskrnl.h>
 #define NDEBUG
-#include <internal/debug.h>
+#include <debug.h>

 #define LQ_WAIT     1
 #define LQ_OWN      2
--- a/reactos/ntoskrnl/ke/thrdobj.c
+++ b/reactos/ntoskrnl/ke/thrdobj.c
@ -10,7 +10,7 @@

 #include <ntoskrnl.h>
 #define NDEBUG
-#include <internal/debug.h>
+#include <debug.h>

 extern EX_WORK_QUEUE ExWorkerQueue[MaximumWorkQueue];
 extern LIST_ENTRY PspReaperListHead;
--- a/reactos/ntoskrnl/mm/anonmem.c
+++ b/reactos/ntoskrnl/mm/anonmem.c
@ -41,7 +41,7 @@

 #include <ntoskrnl.h>
 #define NDEBUG
-#include <internal/debug.h>
+#include <debug.h>

 /* FUNCTIONS *****************************************************************/

--- a/reactos/ntoskrnl/mm/balance.c
+++ b/reactos/ntoskrnl/mm/balance.c
@ -11,7 +11,7 @@

 #include <ntoskrnl.h>
 #define NDEBUG
-#include <internal/debug.h>
+#include <debug.h>

 #if defined (ALLOC_PRAGMA)
 #pragma alloc_text(INIT, MmInitializeBalancer)
--- a/reactos/ntoskrnl/mm/cont.c
+++ b/reactos/ntoskrnl/mm/cont.c
@ -11,7 +11,7 @@

 #include <ntoskrnl.h>
 #define NDEBUG
-#include <internal/debug.h>
+#include <debug.h>

 /* FUNCTIONS *****************************************************************/

--- a/reactos/ntoskrnl/mm/drvlck.c
+++ b/reactos/ntoskrnl/mm/drvlck.c
@ -10,7 +10,7 @@
 /* INCLUDES *****************************************************************/

 #include <ntoskrnl.h>
-#include <internal/debug.h>
+#include <debug.h>

 /* FUNCTIONS *****************************************************************/

--- a/reactos/ntoskrnl/mm/elf.inc.h
+++ b/reactos/ntoskrnl/mm/elf.inc.h
@ -1,5 +1,5 @@
 #define NDEBUG
-#include <internal/debug.h>
+#include <debug.h>

 #include <reactos/exeformat.h>

--- a/reactos/ntoskrnl/mm/freelist.c
+++ b/reactos/ntoskrnl/mm/freelist.c
@ -12,7 +12,7 @@

 #include <ntoskrnl.h>
 #define NDEBUG
-#include <internal/debug.h>
+#include <debug.h>

 #if defined (ALLOC_PRAGMA)
 #pragma alloc_text(INIT, MmInitializePageList)
--- a/reactos/ntoskrnl/mm/i386/page.c
+++ b/reactos/ntoskrnl/mm/i386/page.c
@ -11,7 +11,7 @@

 #include <ntoskrnl.h>
 #define NDEBUG
-#include <internal/debug.h>
+#include <debug.h>

 #if defined (ALLOC_PRAGMA)
 #pragma alloc_text(INIT, MmInitGlobalKernelPageDirectory)
--- a/reactos/ntoskrnl/mm/i386/pagepae.c
+++ b/reactos/ntoskrnl/mm/i386/pagepae.c
@ -11,7 +11,7 @@

 #include <ntoskrnl.h>
 #define NDEBUG
-#include <internal/debug.h>
+#include <debug.h>

 #if defined (ALLOC_PRAGMA)
 #pragma alloc_text(INIT, MmInitGlobalKernelPageDirectory)
--- a/reactos/ntoskrnl/mm/iospace.c
+++ b/reactos/ntoskrnl/mm/iospace.c
@ -11,7 +11,7 @@

 #include <ntoskrnl.h>
 #define NDEBUG
-#include <internal/debug.h>
+#include <debug.h>

 /* FUNCTIONS *****************************************************************/

--- a/reactos/ntoskrnl/mm/kmap.c
+++ b/reactos/ntoskrnl/mm/kmap.c
@ -11,7 +11,7 @@

 #include <ntoskrnl.h>
 #define NDEBUG
-#include <internal/debug.h>
+#include <debug.h>

 /* GLOBALS *****************************************************************/

--- a/reactos/ntoskrnl/mm/marea.c
+++ b/reactos/ntoskrnl/mm/marea.c
@ -43,7 +43,7 @@

 #include <ntoskrnl.h>
 #define NDEBUG
-#include <internal/debug.h>
+#include <debug.h>

 #if defined (ALLOC_PRAGMA)
 #pragma alloc_text(INIT, MmInitMemoryAreas)
--- a/reactos/ntoskrnl/mm/mdlsup.c
+++ b/reactos/ntoskrnl/mm/mdlsup.c
@ -11,7 +11,7 @@

 #include <ntoskrnl.h>
 #define NDEBUG
-#include <internal/debug.h>
+#include <debug.h>

 #if defined (ALLOC_PRAGMA)
 #pragma alloc_text(INIT, MmInitializeMdlImplementation)
--- a/reactos/ntoskrnl/mm/mm.c
+++ b/reactos/ntoskrnl/mm/mm.c
@ -10,7 +10,7 @@

 #include <ntoskrnl.h>
 #define NDEBUG
-#include <internal/debug.h>
+#include <debug.h>

 /* GLOBALS *****************************************************************/

--- a/reactos/ntoskrnl/mm/mminit.c
+++ b/reactos/ntoskrnl/mm/mminit.c
@ -10,7 +10,7 @@

 #include <ntoskrnl.h>
 #define NDEBUG
-#include <internal/debug.h>
+#include <debug.h>

 /* GLOBALS *******************************************************************/

--- a/reactos/ntoskrnl/mm/mpw.c
+++ b/reactos/ntoskrnl/mm/mpw.c
@ -12,7 +12,7 @@

 #include <ntoskrnl.h>
 #define NDEBUG
-#include <internal/debug.h>
+#include <debug.h>

 /* GLOBALS *******************************************************************/

--- a/Show more
+++ b/Show more