diff --git a/reactos/ntoskrnl/kdbg/kdb.c b/reactos/ntoskrnl/kdbg/kdb.c
index 2155e404e2b..17bfc0ffd2c 100644
--- a/reactos/ntoskrnl/kdbg/kdb.c
+++ b/reactos/ntoskrnl/kdbg/kdb.c
@@ -27,34 +27,34 @@
 
 /* GLOBALS *******************************************************************/
 
-STATIC LONG KdbEntryCount = 0;
-STATIC CHAR KdbStack[KDB_STACK_SIZE];
+static LONG KdbEntryCount = 0;
+static CHAR KdbStack[KDB_STACK_SIZE];
 
-STATIC ULONG KdbBreakPointCount = 0;  /* Number of used breakpoints in the array */
-STATIC KDB_BREAKPOINT KdbBreakPoints[KDB_MAXIMUM_BREAKPOINT_COUNT] = {{0}};  /* Breakpoint array */
-STATIC ULONG KdbSwBreakPointCount = 0;  /* Number of enabled software breakpoints */
-STATIC ULONG KdbHwBreakPointCount = 0;  /* Number of enabled hardware breakpoints */
-STATIC PKDB_BREAKPOINT KdbSwBreakPoints[KDB_MAXIMUM_SW_BREAKPOINT_COUNT]; /* Enabled software breakpoints, orderless */
-STATIC PKDB_BREAKPOINT KdbHwBreakPoints[KDB_MAXIMUM_HW_BREAKPOINT_COUNT]; /* Enabled hardware breakpoints, orderless */
-STATIC PKDB_BREAKPOINT KdbBreakPointToReenable = NULL; /* Set to a breakpoint struct when single stepping after
+static ULONG KdbBreakPointCount = 0;  /* Number of used breakpoints in the array */
+static KDB_BREAKPOINT KdbBreakPoints[KDB_MAXIMUM_BREAKPOINT_COUNT] = {{0}};  /* Breakpoint array */
+static ULONG KdbSwBreakPointCount = 0;  /* Number of enabled software breakpoints */
+static ULONG KdbHwBreakPointCount = 0;  /* Number of enabled hardware breakpoints */
+static PKDB_BREAKPOINT KdbSwBreakPoints[KDB_MAXIMUM_SW_BREAKPOINT_COUNT]; /* Enabled software breakpoints, orderless */
+static PKDB_BREAKPOINT KdbHwBreakPoints[KDB_MAXIMUM_HW_BREAKPOINT_COUNT]; /* Enabled hardware breakpoints, orderless */
+static PKDB_BREAKPOINT KdbBreakPointToReenable = NULL; /* Set to a breakpoint struct when single stepping after
                                                           a software breakpoint was hit, to reenable it */
 LONG KdbLastBreakPointNr = -1;  /* Index of the breakpoint which cause KDB to be entered */
 ULONG KdbNumSingleSteps = 0; /* How many single steps to do */
 BOOLEAN KdbSingleStepOver = FALSE; /* Whether to step over calls/reps. */
 ULONG KdbDebugState = 0; /* KDBG Settings (NOECHO, KDSERIAL) */
-STATIC BOOLEAN KdbEnteredOnSingleStep = FALSE; /* Set to true when KDB was entered because of single step */
+static BOOLEAN KdbEnteredOnSingleStep = FALSE; /* Set to true when KDB was entered because of single step */
 PEPROCESS KdbCurrentProcess = NULL;  /* The current process context in which KDB runs */
 PEPROCESS KdbOriginalProcess = NULL; /* The process in whichs context KDB was intered */
 PETHREAD KdbCurrentThread = NULL;  /* The current thread context in which KDB runs */
 PETHREAD KdbOriginalThread = NULL; /* The thread in whichs context KDB was entered */
 PKDB_KTRAP_FRAME KdbCurrentTrapFrame = NULL; /* Pointer to the current trapframe */
-STATIC KDB_KTRAP_FRAME KdbTrapFrame = { { 0 } };  /* The trapframe which was passed to KdbEnterDebuggerException */
-STATIC KDB_KTRAP_FRAME KdbThreadTrapFrame = { { 0 } }; /* The trapframe of the current thread (KdbCurrentThread) */
-STATIC KAPC_STATE KdbApcState;
+static KDB_KTRAP_FRAME KdbTrapFrame = { { 0 } };  /* The trapframe which was passed to KdbEnterDebuggerException */
+static KDB_KTRAP_FRAME KdbThreadTrapFrame = { { 0 } }; /* The trapframe of the current thread (KdbCurrentThread) */
+static KAPC_STATE KdbApcState;
 extern BOOLEAN KdbpBugCheckRequested;
 
 /* Array of conditions when to enter KDB */
-STATIC KDB_ENTER_CONDITION KdbEnterConditions[][2] =
+static KDB_ENTER_CONDITION KdbEnterConditions[][2] =
 {
    /* First chance       Last chance */
    { KdbDoNotEnter,      KdbEnterFromKmode },   /* Zero devide */
@@ -81,7 +81,7 @@ STATIC KDB_ENTER_CONDITION KdbEnterConditions[][2] =
 };
 
 /* Exception descriptions */
-STATIC CONST CHAR *ExceptionNrToString[] =
+static const CHAR *ExceptionNrToString[] =
 {
    "Divide Error",
    "Debug Trap",
@@ -133,7 +133,7 @@ HalReleaseDisplayOwnership(
 
 /* FUNCTIONS *****************************************************************/
 
-STATIC VOID
+static VOID
 KdbpTrapFrameToKdbTrapFrame(PKTRAP_FRAME TrapFrame, PKDB_KTRAP_FRAME KdbTrapFrame)
 {
    ULONG TrapCr0, TrapCr2, TrapCr3, TrapCr4;
@@ -180,7 +180,7 @@ KdbpTrapFrameToKdbTrapFrame(PKTRAP_FRAME TrapFrame, PKDB_KTRAP_FRAME KdbTrapFram
    /* FIXME: copy v86 registers if TrapFrame is a V86 trapframe */
 }
 
-STATIC VOID
+static VOID
 KdbpKdbTrapFrameToTrapFrame(PKDB_KTRAP_FRAME KdbTrapFrame, PKTRAP_FRAME TrapFrame)
 {
    /* Copy the TrapFrame only up to Eflags and zero the rest*/
@@ -194,7 +194,7 @@ KdbpKdbTrapFrameToTrapFrame(PKDB_KTRAP_FRAME KdbTrapFrame, PKTRAP_FRAME TrapFram
    /* FIXME: copy v86 registers if TrapFrame is a V86 trapframe */
 }
 
-STATIC VOID
+static VOID
 KdbpKdbTrapFrameFromKernelStack(PVOID KernelStack,
                                 PKDB_KTRAP_FRAME KdbTrapFrame)
 {
@@ -227,7 +227,7 @@ KdbpKdbTrapFrameFromKernelStack(PVOID KernelStack,
  *
  * \returns NTSTATUS
  */
-STATIC NTSTATUS
+static NTSTATUS
 KdbpOverwriteInstruction(
    IN  PEPROCESS Process,
    IN  ULONG_PTR Address,
@@ -698,7 +698,7 @@ KdbpDeleteBreakPoint(
  *
  * \returns Breakpoint number, -1 on error.
  */
-STATIC LONG
+static LONG
 KdbpIsBreakPointOurs(
    IN NTSTATUS ExceptionCode,
    IN PKTRAP_FRAME TrapFrame)
@@ -1174,7 +1174,7 @@ KdbpAttachToProcess(
 
 /*!\brief Calls the main loop ...
  */
-STATIC VOID
+static VOID
 KdbpCallMainLoop()
 {
    KdbpCliMainLoop(KdbEnteredOnSingleStep);
@@ -1184,7 +1184,7 @@ KdbpCallMainLoop()
  *
  * Disables interrupts, releases display ownership, ...
  */
-STATIC VOID
+static VOID
 KdbpInternalEnter()
 {
    PETHREAD Thread;
@@ -1218,7 +1218,7 @@ KdbpInternalEnter()
    KbdEnableMouse();
 }
 
-STATIC ULONG
+static ULONG
 KdbpGetExceptionNumberFromStatus(IN NTSTATUS ExceptionCode)
 {
     ULONG Ret;
@@ -1507,7 +1507,7 @@ KdbEnterDebuggerException(
    }
    else
    {
-      CONST CHAR *ExceptionString = (ExpNr < RTL_NUMBER_OF(ExceptionNrToString)) ?
+      const CHAR *ExceptionString = (ExpNr < RTL_NUMBER_OF(ExceptionNrToString)) ?
                                     (ExceptionNrToString[ExpNr]) :
                                     ("Unknown/User defined exception");
 
diff --git a/reactos/ntoskrnl/kdbg/kdb.h b/reactos/ntoskrnl/kdbg/kdb.h
index 00fa755cdb1..73522ba4178 100644
--- a/reactos/ntoskrnl/kdbg/kdb.h
+++ b/reactos/ntoskrnl/kdbg/kdb.h
@@ -7,14 +7,6 @@
 # define RTL_NUMBER_OF(x) (sizeof(x) / sizeof((x)[0]))
 #endif
 
-#ifndef STATIC
-#define STATIC static
-#endif
-
-#ifndef CONST
-#define CONST const
-#endif
-
 /* TYPES *********************************************************************/
 
 /* from kdb.c */
diff --git a/reactos/ntoskrnl/kdbg/kdb_cli.c b/reactos/ntoskrnl/kdbg/kdb_cli.c
index 0a2040b334c..b06fd94ef08 100644
--- a/reactos/ntoskrnl/kdbg/kdb_cli.c
+++ b/reactos/ntoskrnl/kdbg/kdb_cli.c
@@ -58,50 +58,50 @@
 
 /* PROTOTYPES ****************************************************************/
 
-STATIC BOOLEAN KdbpCmdEvalExpression(ULONG Argc, PCHAR Argv[]);
-STATIC BOOLEAN KdbpCmdDisassembleX(ULONG Argc, PCHAR Argv[]);
-STATIC BOOLEAN KdbpCmdRegs(ULONG Argc, PCHAR Argv[]);
-STATIC BOOLEAN KdbpCmdBackTrace(ULONG Argc, PCHAR Argv[]);
+static BOOLEAN KdbpCmdEvalExpression(ULONG Argc, PCHAR Argv[]);
+static BOOLEAN KdbpCmdDisassembleX(ULONG Argc, PCHAR Argv[]);
+static BOOLEAN KdbpCmdRegs(ULONG Argc, PCHAR Argv[]);
+static BOOLEAN KdbpCmdBackTrace(ULONG Argc, PCHAR Argv[]);
 
-STATIC BOOLEAN KdbpCmdContinue(ULONG Argc, PCHAR Argv[]);
-STATIC BOOLEAN KdbpCmdStep(ULONG Argc, PCHAR Argv[]);
-STATIC BOOLEAN KdbpCmdBreakPointList(ULONG Argc, PCHAR Argv[]);
-STATIC BOOLEAN KdbpCmdEnableDisableClearBreakPoint(ULONG Argc, PCHAR Argv[]);
-STATIC BOOLEAN KdbpCmdBreakPoint(ULONG Argc, PCHAR Argv[]);
+static BOOLEAN KdbpCmdContinue(ULONG Argc, PCHAR Argv[]);
+static BOOLEAN KdbpCmdStep(ULONG Argc, PCHAR Argv[]);
+static BOOLEAN KdbpCmdBreakPointList(ULONG Argc, PCHAR Argv[]);
+static BOOLEAN KdbpCmdEnableDisableClearBreakPoint(ULONG Argc, PCHAR Argv[]);
+static BOOLEAN KdbpCmdBreakPoint(ULONG Argc, PCHAR Argv[]);
 
-STATIC BOOLEAN KdbpCmdThread(ULONG Argc, PCHAR Argv[]);
-STATIC BOOLEAN KdbpCmdProc(ULONG Argc, PCHAR Argv[]);
+static BOOLEAN KdbpCmdThread(ULONG Argc, PCHAR Argv[]);
+static BOOLEAN KdbpCmdProc(ULONG Argc, PCHAR Argv[]);
 
-STATIC BOOLEAN KdbpCmdMod(ULONG Argc, PCHAR Argv[]);
-STATIC BOOLEAN KdbpCmdGdtLdtIdt(ULONG Argc, PCHAR Argv[]);
-STATIC BOOLEAN KdbpCmdPcr(ULONG Argc, PCHAR Argv[]);
-STATIC BOOLEAN KdbpCmdTss(ULONG Argc, PCHAR Argv[]);
+static BOOLEAN KdbpCmdMod(ULONG Argc, PCHAR Argv[]);
+static BOOLEAN KdbpCmdGdtLdtIdt(ULONG Argc, PCHAR Argv[]);
+static BOOLEAN KdbpCmdPcr(ULONG Argc, PCHAR Argv[]);
+static BOOLEAN KdbpCmdTss(ULONG Argc, PCHAR Argv[]);
 
-STATIC BOOLEAN KdbpCmdBugCheck(ULONG Argc, PCHAR Argv[]);
-STATIC BOOLEAN KdbpCmdFilter(ULONG Argc, PCHAR Argv[]);
-STATIC BOOLEAN KdbpCmdSet(ULONG Argc, PCHAR Argv[]);
-STATIC BOOLEAN KdbpCmdHelp(ULONG Argc, PCHAR Argv[]);
+static BOOLEAN KdbpCmdBugCheck(ULONG Argc, PCHAR Argv[]);
+static BOOLEAN KdbpCmdFilter(ULONG Argc, PCHAR Argv[]);
+static BOOLEAN KdbpCmdSet(ULONG Argc, PCHAR Argv[]);
+static BOOLEAN KdbpCmdHelp(ULONG Argc, PCHAR Argv[]);
 
 /* GLOBALS *******************************************************************/
 
-STATIC BOOLEAN KdbUseIntelSyntax = FALSE; /* Set to TRUE for intel syntax */
-STATIC BOOLEAN KdbBreakOnModuleLoad = FALSE; /* Set to TRUE to break into KDB when a module is loaded */
+static BOOLEAN KdbUseIntelSyntax = FALSE; /* Set to TRUE for intel syntax */
+static BOOLEAN KdbBreakOnModuleLoad = FALSE; /* Set to TRUE to break into KDB when a module is loaded */
 
-STATIC CHAR KdbCommandHistoryBuffer[2048]; /* Command history string ringbuffer */
-STATIC PCHAR KdbCommandHistory[sizeof(KdbCommandHistoryBuffer) / 8] = { NULL }; /* Command history ringbuffer */
-STATIC LONG KdbCommandHistoryBufferIndex = 0;
-STATIC LONG KdbCommandHistoryIndex = 0;
+static CHAR KdbCommandHistoryBuffer[2048]; /* Command history string ringbuffer */
+static PCHAR KdbCommandHistory[sizeof(KdbCommandHistoryBuffer) / 8] = { NULL }; /* Command history ringbuffer */
+static LONG KdbCommandHistoryBufferIndex = 0;
+static LONG KdbCommandHistoryIndex = 0;
 
-STATIC ULONG KdbNumberOfRowsPrinted = 0;
-STATIC ULONG KdbNumberOfColsPrinted = 0;
-STATIC BOOLEAN KdbOutputAborted = FALSE;
-STATIC LONG KdbNumberOfRowsTerminal = -1;
-STATIC LONG KdbNumberOfColsTerminal = -1;
+static ULONG KdbNumberOfRowsPrinted = 0;
+static ULONG KdbNumberOfColsPrinted = 0;
+static BOOLEAN KdbOutputAborted = FALSE;
+static LONG KdbNumberOfRowsTerminal = -1;
+static LONG KdbNumberOfColsTerminal = -1;
 
 PCHAR KdbInitFileBuffer = NULL; /* Buffer where KDBinit file is loaded into during initialization */
 BOOLEAN KdbpBugCheckRequested = FALSE;
 
-STATIC CONST struct
+static const struct
 {
    PCHAR Name;
    PCHAR Syntax;
@@ -163,7 +163,7 @@ STATIC CONST struct
  * \retval TRUE   Success.
  * \retval FALSE  Failure.
  */
-STATIC BOOLEAN
+static BOOLEAN
 KdbpGetComponentId(
    IN  PCCH ComponentName,
    OUT PULONG ComponentId)
@@ -293,13 +293,13 @@ KdbpGetComponentId(
  * \retval TRUE   Success.
  * \retval FALSE  Failure.
  */
-STATIC BOOLEAN
+static BOOLEAN
 KdbpEvaluateExpression(
    IN  PCHAR Expression,
    IN  LONG ErrOffset,
    OUT PULONGLONG Result)
 {
-   STATIC CHAR ErrMsgBuffer[130] = "^ ";
+   static CHAR ErrMsgBuffer[130] = "^ ";
    LONG ExpressionErrOffset = -1;
    PCHAR ErrMsg = ErrMsgBuffer;
    BOOLEAN Ok;
@@ -320,7 +320,7 @@ KdbpEvaluateExpression(
 
 /*!\brief Evaluates an expression and displays the result.
  */
-STATIC BOOLEAN
+static BOOLEAN
 KdbpCmdEvalExpression(ULONG Argc, PCHAR Argv[])
 {
    ULONG i, len;
@@ -375,7 +375,7 @@ KdbpCmdEvalExpression(ULONG Argc, PCHAR Argv[])
 
 /*!\brief Display list of active debug channels
  */
-STATIC BOOLEAN
+static BOOLEAN
 KdbpCmdFilter(ULONG Argc, PCHAR Argv[])
 {
     ULONG i, j, ComponentId, Level;
@@ -455,7 +455,7 @@ KdbpCmdFilter(ULONG Argc, PCHAR Argv[])
 /*!\brief Disassembles 10 instructions at eip or given address or
  *        displays 16 dwords from memory at given address.
  */
-STATIC BOOLEAN
+static BOOLEAN
 KdbpCmdDisassembleX(ULONG Argc, PCHAR Argv[])
 {
    ULONG Count;
@@ -565,12 +565,12 @@ KdbpCmdDisassembleX(ULONG Argc, PCHAR Argv[])
 
 /*!\brief Displays CPU registers.
  */
-STATIC BOOLEAN
+static BOOLEAN
 KdbpCmdRegs(ULONG Argc, PCHAR Argv[])
 {
    PKTRAP_FRAME Tf = &KdbCurrentTrapFrame->Tf;
    INT i;
-   STATIC CONST PCHAR EflagsBits[32] = { " CF", NULL, " PF", " BIT3", " AF", " BIT5",
+   static const PCHAR EflagsBits[32] = { " CF", NULL, " PF", " BIT3", " AF", " BIT5",
                                          " ZF", " SF", " TF", " IF", " DF", " OF",
                                          NULL, NULL, " NT", " BIT15", " RF", " VF",
                                          " AC", " VIF", " VIP", " ID", " BIT22",
@@ -617,11 +617,11 @@ KdbpCmdRegs(ULONG Argc, PCHAR Argv[])
       ULONG Cr0, Cr2, Cr3, Cr4;
       KDESCRIPTOR Gdtr = {0}, Ldtr = {0}, Idtr = {0};
       ULONG Tr = 0;
-      STATIC CONST PCHAR Cr0Bits[32] = { " PE", " MP", " EM", " TS", " ET", " NE", NULL, NULL,
+      static const PCHAR Cr0Bits[32] = { " PE", " MP", " EM", " TS", " ET", " NE", NULL, NULL,
                                          NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
                                          " WP", NULL, " AM", NULL, NULL, NULL, NULL, NULL,
                                          NULL, NULL, NULL, NULL, NULL, " NW", " CD", " PG" };
-      STATIC CONST PCHAR Cr4Bits[32] = { " VME", " PVI", " TSD", " DE", " PSE", " PAE", " MCE", " PGE",
+      static const PCHAR Cr4Bits[32] = { " VME", " PVI", " TSD", " DE", " PSE", " PAE", " MCE", " PGE",
                                          " PCE", " OSFXSR", " OSXMMEXCPT", NULL, NULL, NULL, NULL, NULL,
                                          NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
                                          NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL };
@@ -698,7 +698,7 @@ KdbpCmdRegs(ULONG Argc, PCHAR Argv[])
 
 /*!\brief Displays a backtrace.
  */
-STATIC BOOLEAN
+static BOOLEAN
 KdbpCmdBackTrace(ULONG Argc, PCHAR Argv[])
 {
    ULONG Count;
@@ -797,7 +797,7 @@ KdbpCmdBackTrace(ULONG Argc, PCHAR Argv[])
 
 /*!\brief Continues execution of the system/leaves KDB.
  */
-STATIC BOOLEAN
+static BOOLEAN
 KdbpCmdContinue(ULONG Argc, PCHAR Argv[])
 {
    /* Exit the main loop */
@@ -806,7 +806,7 @@ KdbpCmdContinue(ULONG Argc, PCHAR Argv[])
 
 /*!\brief Continues execution of the system/leaves KDB.
  */
-STATIC BOOLEAN
+static BOOLEAN
 KdbpCmdStep(ULONG Argc, PCHAR Argv[])
 {
    ULONG Count = 1;
@@ -834,7 +834,7 @@ KdbpCmdStep(ULONG Argc, PCHAR Argv[])
 
 /*!\brief Lists breakpoints.
  */
-STATIC BOOLEAN
+static BOOLEAN
 KdbpCmdBreakPointList(ULONG Argc, PCHAR Argv[])
 {
    LONG l;
@@ -927,7 +927,7 @@ KdbpCmdBreakPointList(ULONG Argc, PCHAR Argv[])
 
 /*!\brief Enables, disables or clears a breakpoint.
  */
-STATIC BOOLEAN
+static BOOLEAN
 KdbpCmdEnableDisableClearBreakPoint(ULONG Argc, PCHAR Argv[])
 {
    PCHAR pend;
@@ -966,7 +966,7 @@ KdbpCmdEnableDisableClearBreakPoint(ULONG Argc, PCHAR Argv[])
 
 /*!\brief Sets a software or hardware (memory) breakpoint at the given address.
  */
-STATIC BOOLEAN
+static BOOLEAN
 KdbpCmdBreakPoint(ULONG Argc, PCHAR Argv[])
 {
    ULONGLONG Result = 0;
@@ -1084,7 +1084,7 @@ KdbpCmdBreakPoint(ULONG Argc, PCHAR Argv[])
 
 /*!\brief Lists threads or switches to another thread context.
  */
-STATIC BOOLEAN
+static BOOLEAN
 KdbpCmdThread(ULONG Argc, PCHAR Argv[])
 {
    PLIST_ENTRY Entry;
@@ -1096,7 +1096,7 @@ KdbpCmdThread(ULONG Argc, PCHAR Argv[])
    ULONG Eip;
    ULONG ul = 0;
    PCHAR State, pend, str1, str2;
-   STATIC CONST PCHAR ThreadStateToString[DeferredReady+1] =
+   static const PCHAR ThreadStateToString[DeferredReady+1] =
                                           { "Initialized", "Ready", "Running",
                                             "Standby", "Terminated", "Waiting",
                                             "Transition", "DeferredReady" };
@@ -1268,7 +1268,7 @@ KdbpCmdThread(ULONG Argc, PCHAR Argv[])
 
 /*!\brief Lists processes or switches to another process context.
  */
-STATIC BOOLEAN
+static BOOLEAN
 KdbpCmdProc(ULONG Argc, PCHAR Argv[])
 {
    PLIST_ENTRY Entry;
@@ -1380,7 +1380,7 @@ KdbpCmdProc(ULONG Argc, PCHAR Argv[])
 
 /*!\brief Lists loaded modules or the one containing the specified address.
  */
-STATIC BOOLEAN
+static BOOLEAN
 KdbpCmdMod(ULONG Argc, PCHAR Argv[])
 {
    ULONGLONG Result = 0;
@@ -1441,7 +1441,7 @@ KdbpCmdMod(ULONG Argc, PCHAR Argv[])
 
 /*!\brief Displays GDT, LDT or IDTd.
  */
-STATIC BOOLEAN
+static BOOLEAN
 KdbpCmdGdtLdtIdt(ULONG Argc, PCHAR Argv[])
 {
    KDESCRIPTOR Reg = {0};
@@ -1642,7 +1642,7 @@ KdbpCmdGdtLdtIdt(ULONG Argc, PCHAR Argv[])
 
 /*!\brief Displays the KPCR
  */
-STATIC BOOLEAN
+static BOOLEAN
 KdbpCmdPcr(ULONG Argc, PCHAR Argv[])
 {
    PKIPCR Pcr = (PKIPCR)KeGetPcr();
@@ -1687,7 +1687,7 @@ KdbpCmdPcr(ULONG Argc, PCHAR Argv[])
 
 /*!\brief Displays the TSS
  */
-STATIC BOOLEAN
+static BOOLEAN
 KdbpCmdTss(ULONG Argc, PCHAR Argv[])
 {
    KTSS *Tss = KeGetPcr()->TSS;
@@ -1707,7 +1707,7 @@ KdbpCmdTss(ULONG Argc, PCHAR Argv[])
 
 /*!\brief Bugchecks the system.
  */
-STATIC BOOLEAN
+static BOOLEAN
 KdbpCmdBugCheck(ULONG Argc, PCHAR Argv[])
 {
    /* Set the flag and quit looping */
@@ -1717,7 +1717,7 @@ KdbpCmdBugCheck(ULONG Argc, PCHAR Argv[])
 
 /*!\brief Sets or displays a config variables value.
  */
-STATIC BOOLEAN
+static BOOLEAN
 KdbpCmdSet(ULONG Argc, PCHAR Argv[])
 {
    LONG l;
@@ -1725,7 +1725,7 @@ KdbpCmdSet(ULONG Argc, PCHAR Argv[])
    PCHAR pend = 0;
    KDB_ENTER_CONDITION ConditionFirst = KdbDoNotEnter;
    KDB_ENTER_CONDITION ConditionLast = KdbDoNotEnter;
-   STATIC CONST PCHAR ExceptionNames[21] =
+   static const PCHAR ExceptionNames[21] =
       { "ZERODEVIDE", "DEBUGTRAP", "NMI", "INT3", "OVERFLOW", "BOUND", "INVALIDOP",
         "NOMATHCOP", "DOUBLEFAULT", "RESERVED(9)", "INVALIDTSS", "SEGMENTNOTPRESENT",
         "STACKFAULT", "GPF", "PAGEFAULT", "RESERVED(15)", "MATHFAULT", "ALIGNMENTCHECK",
@@ -1875,7 +1875,7 @@ KdbpCmdSet(ULONG Argc, PCHAR Argv[])
 
 /*!\brief Displays help screen.
  */
-STATIC BOOLEAN
+static BOOLEAN
 KdbpCmdHelp(ULONG Argc, PCHAR Argv[])
 {
    ULONG i;
@@ -1912,10 +1912,10 @@ KdbpPrint(
    IN PCHAR Format,
    IN ...  OPTIONAL)
 {
-   STATIC CHAR Buffer[4096];
-   STATIC BOOLEAN TerminalInitialized = FALSE;
-   STATIC BOOLEAN TerminalConnected = FALSE;
-   STATIC BOOLEAN TerminalReportsSize = TRUE;
+   static CHAR Buffer[4096];
+   static BOOLEAN TerminalInitialized = FALSE;
+   static BOOLEAN TerminalConnected = FALSE;
+   static BOOLEAN TerminalReportsSize = TRUE;
    CHAR c = '\0';
    PCHAR p, p2;
    ULONG Length;
@@ -2122,7 +2122,7 @@ KdbpPrint(
  *
  * \param Command  Pointer to the command to append to the history.
  */
-STATIC VOID
+static VOID
 KdbpCommandHistoryAppend(
    IN PCHAR Command)
 {
@@ -2194,7 +2194,7 @@ KdbpCommandHistoryAppend(
  *
  * \note Accepts only \n newlines, \r is ignored.
  */
-STATIC VOID
+static VOID
 KdbpReadCommand(
    OUT PCHAR Buffer,
    IN  ULONG Size)
@@ -2203,8 +2203,8 @@ KdbpReadCommand(
    PCHAR Orig = Buffer;
    ULONG ScanCode = 0;
    BOOLEAN EchoOn;
-   STATIC CHAR LastCommand[1024] = "";
-   STATIC CHAR NextKey = '\0';
+   static CHAR LastCommand[1024] = "";
+   static CHAR NextKey = '\0';
    INT CmdHistIndex = -1;
    INT i;
 
@@ -2373,15 +2373,15 @@ KdbpReadCommand(
  * \retval TRUE   Don't continue execution.
  * \retval FALSE  Continue execution (leave KDB)
  */
-STATIC BOOLEAN
+static BOOLEAN
 KdbpDoCommand(
    IN PCHAR Command)
 {
    ULONG i;
    PCHAR p;
    ULONG Argc;
-   STATIC PCH Argv[256];
-   STATIC CHAR OrigCommand[1024];
+   static PCH Argv[256];
+   static CHAR OrigCommand[1024];
 
    strncpy(OrigCommand, Command, sizeof(OrigCommand) - 1);
    OrigCommand[sizeof(OrigCommand) - 1] = '\0';
@@ -2429,7 +2429,7 @@ VOID
 KdbpCliMainLoop(
    IN BOOLEAN EnteredOnSingleStep)
 {
-   STATIC CHAR Command[1024];
+   static CHAR Command[1024];
    BOOLEAN Continue;
 
    if (EnteredOnSingleStep)
diff --git a/reactos/ntoskrnl/kdbg/kdb_expr.c b/reactos/ntoskrnl/kdbg/kdb_expr.c
index 8e08d88b614..456ae809af2 100644
--- a/reactos/ntoskrnl/kdbg/kdb_expr.c
+++ b/reactos/ntoskrnl/kdbg/kdb_expr.c
@@ -87,9 +87,9 @@ typedef struct _RPN_STACK
 #define RPN_VALUE_STACK_SIZE  256
 
 /* GLOBALS *******************************************************************/
-STATIC struct { ULONG Size; ULONG Sp; RPN_OP Ops[RPN_OP_STACK_SIZE]; } RpnStack = { RPN_OP_STACK_SIZE, 0 };
+static struct { ULONG Size; ULONG Sp; RPN_OP Ops[RPN_OP_STACK_SIZE]; } RpnStack = { RPN_OP_STACK_SIZE, 0 };
 
-STATIC CONST struct { PCHAR Name; UCHAR Offset; UCHAR Size; } RegisterToTrapFrame[] =
+static const struct { PCHAR Name; UCHAR Offset; UCHAR Size; } RegisterToTrapFrame[] =
 {
    {"eip",     FIELD_OFFSET(KDB_KTRAP_FRAME, Tf.Eip),     RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Tf.Eip)},
    {"eflags",  FIELD_OFFSET(KDB_KTRAP_FRAME, Tf.EFlags),  RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Tf.EFlags)},
@@ -118,7 +118,7 @@ STATIC CONST struct { PCHAR Name; UCHAR Offset; UCHAR Size; } RegisterToTrapFram
    {"cr3",     FIELD_OFFSET(KDB_KTRAP_FRAME, Cr3),        RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Cr3)},
    {"cr4",     FIELD_OFFSET(KDB_KTRAP_FRAME, Cr4),        RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Cr4)}
 };
-STATIC CONST INT RegisterToTrapFrameCount =
+static const INT RegisterToTrapFrameCount =
                      sizeof (RegisterToTrapFrame) / sizeof (RegisterToTrapFrame[0]);
 
 /* FUNCTIONS *****************************************************************/
@@ -268,7 +268,7 @@ RpnpDumpStack(
  *
  * \param Stack  Pointer to a RPN_STACK structure.
  */
-STATIC VOID
+static VOID
 RpnpClearStack(
    OUT PRPN_STACK Stack)
 {
@@ -281,7 +281,7 @@ RpnpClearStack(
  * \param Stack  Pointer to a RPN_STACK structure.
  * \param Op     RPN_OP to be copied onto the stack.
  */
-STATIC BOOLEAN
+static BOOLEAN
 RpnpPushStack(
    IN OUT PRPN_STACK Stack,
    IN     PRPN_OP Op)
@@ -305,7 +305,7 @@ RpnpPushStack(
  * \retval TRUE   Success.
  * \retval FALSE  Failure (stack empty)
  */
-STATIC BOOLEAN
+static BOOLEAN
 RpnpPopStack(
    IN OUT PRPN_STACK Stack,
    OUT    PRPN_OP Op  OPTIONAL)
@@ -329,7 +329,7 @@ RpnpPopStack(
  * \retval TRUE   Success.
  * \retval FALSE  Failure (stack empty)
  */
-STATIC BOOLEAN
+static BOOLEAN
 RpnpTopStack(
    IN  PRPN_STACK Stack,
    OUT PRPN_OP Op)
@@ -362,7 +362,7 @@ RpnpTopStack(
  * \retval TRUE   Success.
  * \retval FALSE  Failure.
  */
-STATIC BOOLEAN
+static BOOLEAN
 RpnpParseExpression(
    IN  PRPN_STACK Stack,
    IN  PCHAR Expression,
@@ -785,7 +785,7 @@ get_operand:
  * \retval TRUE   Success.
  * \retval FALSE  Failure.
  */
-STATIC BOOLEAN
+static BOOLEAN
 RpnpEvaluateStack(
    IN  PRPN_STACK Stack,
    IN  PKDB_KTRAP_FRAME TrapFrame,
diff --git a/reactos/ntoskrnl/kdbg/kdb_symbols.c b/reactos/ntoskrnl/kdbg/kdb_symbols.c
index 323b88d7a2f..c606d522b51 100644
--- a/reactos/ntoskrnl/kdbg/kdb_symbols.c
+++ b/reactos/ntoskrnl/kdbg/kdb_symbols.c
@@ -44,7 +44,7 @@ BOOLEAN KdbpSymbolsInitialized = FALSE;
  *
  * \sa KdbpSymFindModule
  */
-STATIC BOOLEAN
+static BOOLEAN
 KdbpSymFindUserModule(IN PVOID Address  OPTIONAL,
                       IN LPCWSTR Name  OPTIONAL,
                       IN INT Index  OPTIONAL,
@@ -102,7 +102,7 @@ KdbpSymFindUserModule(IN PVOID Address  OPTIONAL,
  *
  * \sa KdbpSymFindUserModule
  */
-STATIC BOOLEAN
+static BOOLEAN
 KdbpSymFindModule(IN PVOID Address  OPTIONAL,
                   IN LPCWSTR Name  OPTIONAL,
                   IN INT Index  OPTIONAL,
@@ -296,7 +296,7 @@ KdbSymGetAddressInformation(IN PROSSYM_INFO RosSymInfo,
  *
  * \sa KdbpSymAddCachedFile
  */
-STATIC PROSSYM_INFO
+static PROSSYM_INFO
 KdbpSymFindCachedFile(IN PUNICODE_STRING FileName)
 {
   PIMAGE_SYMBOL_INFO_CACHE Current;
@@ -337,7 +337,7 @@ KdbpSymFindCachedFile(IN PUNICODE_STRING FileName)
  *
  * \sa KdbpSymRemoveCachedFile
  */
-STATIC VOID
+static VOID
 KdbpSymAddCachedFile(IN PUNICODE_STRING FileName,
 		     IN PROSSYM_INFO RosSymInfo)
 {
@@ -371,7 +371,7 @@ KdbpSymAddCachedFile(IN PUNICODE_STRING FileName,
  *
  * \sa KdbpSymAddCachedFile
  */
-STATIC VOID
+static VOID
 KdbpSymRemoveCachedFile(IN PROSSYM_INFO RosSymInfo)
 {
   PIMAGE_SYMBOL_INFO_CACHE Current;
@@ -413,7 +413,7 @@ KdbpSymRemoveCachedFile(IN PROSSYM_INFO RosSymInfo)
  *
  * \sa KdbpSymUnloadModuleSymbols
  */
-STATIC VOID
+static VOID
 KdbpSymLoadModuleSymbols(IN PUNICODE_STRING FileName,
                          OUT PROSSYM_INFO *RosSymInfo)
 {
@@ -484,7 +484,7 @@ KdbpSymLoadModuleSymbols(IN PUNICODE_STRING FileName,
  *
  * \sa KdbpSymLoadModuleSymbols
  */
-STATIC VOID
+static VOID
 KdbpSymUnloadModuleSymbols(IN PROSSYM_INFO RosSymInfo)
 {
   DPRINT("Unloading symbols\n");