[NTOS] Include kdbg/kdb.h only in the files that really need it.

ntoskrnl/cc/view.c

@@ -1388,6 +1388,9 @@ CcInitView (
 }
 
 #if DBG && defined(KDBG)
+
+#include <kdbg/kdb.h>
+
 BOOLEAN
 ExpKdbgExtFileCache(ULONG Argc, PCHAR Argv[])
 {
@@ -1478,6 +1481,7 @@ ExpKdbgExtDefWrites(ULONG Argc, PCHAR Argv[])
 
     return TRUE;
 }
-#endif
+
+#endif // DBG && defined(KDBG)
 
 /* EOF */

ntoskrnl/ex/handle.c

@@ -1320,6 +1320,9 @@ ExEnumHandleTable(IN PHANDLE_TABLE HandleTable,
 }
 
 #if DBG && defined(KDBG)
+
+#include <kdbg/kdb.h>
+
 BOOLEAN ExpKdbgExtHandle(ULONG Argc, PCHAR Argv[])
 {
     USHORT i;
@@ -1495,4 +1498,5 @@ BOOLEAN ExpKdbgExtHandle(ULONG Argc, PCHAR Argv[])
 
     return TRUE;
 }
-#endif
+
+#endif // DBG && defined(KDBG)

ntoskrnl/include/internal/ntoskrnl.h

@@ -68,9 +68,6 @@
 #include "fsrtl.h"
 #include "lpc.h"
 #include "rtl.h"
-#ifdef KDBG
-#include <kdbg/kdb.h>
-#endif
 #include "dbgk.h"
 #include "spinlock.h"
 #include "test.h"

ntoskrnl/kd/kdio.c

@@ -13,6 +13,9 @@
 #include <reactos/buildno.h>
 #include "kd.h"
 #include "kdterminal.h"
+#ifdef KDBG
+#include "../kdbg/kdb.h"
+#endif
 
 #define NDEBUG
 #include <debug.h>

ntoskrnl/kd64/kdapi.c

@@ -10,6 +10,11 @@
 /* INCLUDES ******************************************************************/
 
 #include <ntoskrnl.h>
+
+#ifdef KDBG
+#include <kdbg/kdb.h>
+#endif
+
 #define NDEBUG
 #include <debug.h>
 
@@ -2209,13 +2214,13 @@ KdSystemDebugControl(
             KeRosDumpStackFrames((PULONG_PTR)InputBuffer, InputBufferLength);
             break;
         }
-#if defined(KDBG)
+#ifdef KDBG
         /* Register KDBG CLI callback */
         case 'RbdK':
         {
             return KdbRegisterCliCallback(InputBuffer, InputBufferLength);
         }
-#endif /* KDBG */
+#endif // KDBG
 #endif
         default:
             break;

ntoskrnl/kdbg/i386/i386-dis.c

@@ -8,6 +8,8 @@
  */
 
 #include <ntoskrnl.h>
+#include "../kdb.h"
+
 #define NDEBUG
 #include <debug.h>
 

ntoskrnl/kdbg/kdb.c

@@ -10,6 +10,8 @@
 /* INCLUDES ******************************************************************/
 
 #include <ntoskrnl.h>
+#include "kdb.h"
+
 #define NDEBUG
 #include <debug.h>
 

ntoskrnl/kdbg/kdb_cli.c

@@ -29,6 +29,7 @@
 /* INCLUDES ******************************************************************/
 
 #include <ntoskrnl.h>
+#include "kdb.h"
 #include "../kd/kdterminal.h"
 
 #define NDEBUG

ntoskrnl/kdbg/kdb_expr.c

@@ -34,6 +34,8 @@
 /* INCLUDES ******************************************************************/
 
 #include <ntoskrnl.h>
+#include "kdb.h"
+
 #define NDEBUG
 #include <debug.h>
 

ntoskrnl/kdbg/kdb_symbols.c

@@ -11,6 +11,7 @@
 /* INCLUDES *****************************************************************/
 
 #include <ntoskrnl.h>
+#include "kdb.h"
 
 #define NDEBUG
 #include <debug.h>

ntoskrnl/ke/bug.c

@@ -10,6 +10,10 @@
 
 #include <ntoskrnl.h>
 
+#ifdef KDBG
+#include <kdbg/kdb.h>
+#endif
+
 #define NDEBUG
 #include <debug.h>
 

ntoskrnl/mm/ARM3/expool.c

@@ -479,6 +479,10 @@ ExpComputePartialHashForAddress(IN PVOID BaseAddress)
 #define ExpTagAllowPrint(Tag)   \
     ((Tag) >= 0x20 /* Space */ && (Tag) <= 0x7E /* Tilde */)
 
+#ifdef KDBG
+#include <kdbg/kdb.h>
+#endif
+
 #ifdef KDBG
 #define MiDumperPrint(dbg, fmt, ...)        \
     if (dbg) KdbpPrint(fmt, ##__VA_ARGS__); \

ntoskrnl/mm/ARM3/kdbg.c

@@ -44,6 +44,8 @@ VOID MiDumpPoolConsumers(BOOLEAN CalledFromDbg, ULONG Tag, ULONG Mask, ULONG Fla
 
 #if DBG && defined(KDBG)
 
+#include <kdbg/kdb.h>
+
 BOOLEAN
 ExpKdbgExtPool(
     ULONG Argc,
@@ -620,6 +622,6 @@ ExpKdbgExtIrpFind(
     return TRUE;
 }
 
-#endif // DBG && KDBG
+#endif // DBG && defined(KDBG)
 
 /* EOF */