diff --git a/reactos/base/system/autochk/autochk.c b/reactos/base/system/autochk/autochk.c
index 88cbf92d72f..43710a7adb8 100644
--- a/reactos/base/system/autochk/autochk.c
+++ b/reactos/base/system/autochk/autochk.c
@@ -9,9 +9,6 @@
 
 /* INCLUDES *****************************************************************/
 
-//#define NDEBUG
-#include <debug.h>
-
 #include <stdio.h>
 #define WIN32_NO_STATUS
 #include <windows.h>
@@ -19,6 +16,9 @@
 #include <ndk/ntndk.h>
 #include <fmifs/fmifs.h>
 
+//#define NDEBUG
+#include <debug.h>
+
 /* DEFINES ******************************************************************/
 
 #define FS_ATTRIBUTE_BUFFER_SIZE (MAX_PATH * sizeof(WCHAR) + sizeof(FILE_FS_ATTRIBUTE_INFORMATION))
diff --git a/reactos/dll/cpl/desk/classinst.c b/reactos/dll/cpl/desk/classinst.c
index 69503bacac7..0cdb70c0b5a 100644
--- a/reactos/dll/cpl/desk/classinst.c
+++ b/reactos/dll/cpl/desk/classinst.c
@@ -7,11 +7,11 @@
  * PROGRAMMERS:     Hervé Poussineau (hpoussin@reactos.org)
  */
 
+#include "desk.h"
+
 //#define NDEBUG
 #include <debug.h>
 
-#include "desk.h"
-
 DWORD WINAPI
 DisplayClassInstaller(
 	IN DI_FUNCTION InstallFunction,
diff --git a/reactos/drivers/filesystems/vfat/vfat.h b/reactos/drivers/filesystems/vfat/vfat.h
index 40a69f8ceb8..43f222b680c 100644
--- a/reactos/drivers/filesystems/vfat/vfat.h
+++ b/reactos/drivers/filesystems/vfat/vfat.h
@@ -1,7 +1,7 @@
-#include <debug.h>
 #include <ntifs.h>
 #include <ntdddisk.h>
 #include <reactos/helper.h>
+#include <debug.h>
 
 #ifdef __GNUC__
 #include <ccros.h>
diff --git a/reactos/drivers/storage/floppy/csqrtns.c b/reactos/drivers/storage/floppy/csqrtns.c
index c9a703c661b..d4a4a2553b8 100644
--- a/reactos/drivers/storage/floppy/csqrtns.c
+++ b/reactos/drivers/storage/floppy/csqrtns.c
@@ -38,9 +38,9 @@
  *       that my lock choice is a spin lock.
  */
 
+#include <ntddk.h>
 #define NDEBUG
 #include <debug.h>
-#include <ntddk.h>
 
 #include "floppy.h"
 #include "csqrtns.h"
diff --git a/reactos/drivers/storage/floppy/floppy.c b/reactos/drivers/storage/floppy/floppy.c
index 486831880e3..b208e7c0cb0 100644
--- a/reactos/drivers/storage/floppy/floppy.c
+++ b/reactos/drivers/storage/floppy/floppy.c
@@ -40,9 +40,9 @@
  * TODO: Media detection based on sector 1
  */
 
+#include <ntddk.h>
 #define NDEBUG
 #include <debug.h>
-#include <ntddk.h>
 
 #include "floppy.h"
 #include "hardware.h"
diff --git a/reactos/drivers/storage/floppy/hardware.c b/reactos/drivers/storage/floppy/hardware.c
index 7f95aec0087..0241dbb182b 100644
--- a/reactos/drivers/storage/floppy/hardware.c
+++ b/reactos/drivers/storage/floppy/hardware.c
@@ -48,9 +48,9 @@
  * TODO: Figure out the right delays in Send_Byte and Get_Byte
  */
 
+#include <ntddk.h>
 #define NDEBUG
 #include <debug.h>
-#include <ntddk.h>
 
 #include "floppy.h"
 #include "hardware.h"
diff --git a/reactos/drivers/storage/floppy/ioctl.c b/reactos/drivers/storage/floppy/ioctl.c
index 9477751f592..5c5506edd55 100644
--- a/reactos/drivers/storage/floppy/ioctl.c
+++ b/reactos/drivers/storage/floppy/ioctl.c
@@ -31,9 +31,9 @@
  * TODO: Implement format
  */
 
+#include <ntddk.h>
 #define NDEBUG
 #include <debug.h>
-#include <ntddk.h>
 
 #include "floppy.h"
 #include "hardware.h"
diff --git a/reactos/drivers/storage/floppy/readwrite.c b/reactos/drivers/storage/floppy/readwrite.c
index 8f285b99d07..07758640030 100644
--- a/reactos/drivers/storage/floppy/readwrite.c
+++ b/reactos/drivers/storage/floppy/readwrite.c
@@ -52,9 +52,9 @@
  * TODO: Figure out specify timings
  */
 
+#include <ntddk.h>
 #define NDEBUG
 #include <debug.h>
-#include <ntddk.h>
 
 #include "floppy.h"
 #include "csqrtns.h"
diff --git a/reactos/drivers/storage/ide/pciide/pciide.c b/reactos/drivers/storage/ide/pciide/pciide.c
index 5e9f92bfbd6..3bce679f0cf 100644
--- a/reactos/drivers/storage/ide/pciide/pciide.c
+++ b/reactos/drivers/storage/ide/pciide/pciide.c
@@ -6,11 +6,11 @@
  * PROGRAMMERS:     Hervé Poussineau (hpoussin@reactos.org)
  */
 
+#include "pciide.h"
+
 #define NDEBUG
 #include <debug.h>
 
-#include "pciide.h"
-
 IDE_CHANNEL_STATE NTAPI
 PciIdeChannelEnabled(
 	IN PVOID DeviceExtension,
diff --git a/reactos/drivers/storage/ide/pciidex/fdo.c b/reactos/drivers/storage/ide/pciidex/fdo.c
index 0edca588cdb..ff140e1d19e 100644
--- a/reactos/drivers/storage/ide/pciidex/fdo.c
+++ b/reactos/drivers/storage/ide/pciidex/fdo.c
@@ -6,11 +6,11 @@
  * PROGRAMMERS:     Hervé Poussineau (hpoussin@reactos.org)
  */
 
+#include "pciidex.h"
+
 #define NDEBUG
 #include <debug.h>
 
-#include "pciidex.h"
-
 static NTSTATUS
 GetBusInterface(
 	IN PFDO_DEVICE_EXTENSION DeviceExtension)
diff --git a/reactos/drivers/storage/ide/pciidex/miniport.c b/reactos/drivers/storage/ide/pciidex/miniport.c
index f1be0a6886e..a2ffc84302d 100644
--- a/reactos/drivers/storage/ide/pciidex/miniport.c
+++ b/reactos/drivers/storage/ide/pciidex/miniport.c
@@ -6,12 +6,12 @@
  * PROGRAMMERS:     Hervé Poussineau (hpoussin@reactos.org)
  */
 
-#define NDEBUG
-#include <debug.h>
-
 #define INITGUID
 #include "pciidex.h"
 
+#define NDEBUG
+#include <debug.h>
+
 static DRIVER_DISPATCH PciIdeXForwardOrIgnore;
 static NTSTATUS NTAPI
 PciIdeXForwardOrIgnore(
diff --git a/reactos/drivers/storage/ide/pciidex/misc.c b/reactos/drivers/storage/ide/pciidex/misc.c
index 21eaf8eb866..c313dc993a9 100644
--- a/reactos/drivers/storage/ide/pciidex/misc.c
+++ b/reactos/drivers/storage/ide/pciidex/misc.c
@@ -6,11 +6,11 @@
  * PROGRAMMERS:     Hervé Poussineau (hpoussin@reactos.org)
  */
 
+#include "pciidex.h"
+
 #define NDEBUG
 #include <debug.h>
 
-#include "pciidex.h"
-
 NTSTATUS NTAPI
 PciIdeXGenericCompletion(
 	IN PDEVICE_OBJECT DeviceObject,
diff --git a/reactos/drivers/storage/ide/pciidex/pciidex.c b/reactos/drivers/storage/ide/pciidex/pciidex.c
index b561afcb3cc..c080aa43a84 100644
--- a/reactos/drivers/storage/ide/pciidex/pciidex.c
+++ b/reactos/drivers/storage/ide/pciidex/pciidex.c
@@ -6,11 +6,11 @@
  * PROGRAMMERS:     Hervé Poussineau (hpoussin@reactos.org)
  */
 
+#include "pciidex.h"
+
 #define NDEBUG
 #include <debug.h>
 
-#include "pciidex.h"
-
 NTSTATUS NTAPI
 DriverEntry(
 	IN PDRIVER_OBJECT DriverObject,
diff --git a/reactos/drivers/storage/ide/pciidex/pdo.c b/reactos/drivers/storage/ide/pciidex/pdo.c
index a39a8db612f..c580077a78c 100644
--- a/reactos/drivers/storage/ide/pciidex/pdo.c
+++ b/reactos/drivers/storage/ide/pciidex/pdo.c
@@ -6,11 +6,11 @@
  * PROGRAMMERS:     Hervé Poussineau (hpoussin@reactos.org)
  */
 
+#include "pciidex.h"
+
 #define NDEBUG
 #include <debug.h>
 
-#include "pciidex.h"
-
 static NTSTATUS
 PciIdeXPdoQueryId(
 	IN PDEVICE_OBJECT DeviceObject,
diff --git a/reactos/drivers/wdm/audio/drivers/mpu401/adapter.cpp b/reactos/drivers/wdm/audio/drivers/mpu401/adapter.cpp
index 0b4b77e0769..6011a343a0b 100644
--- a/reactos/drivers/wdm/audio/drivers/mpu401/adapter.cpp
+++ b/reactos/drivers/wdm/audio/drivers/mpu401/adapter.cpp
@@ -15,8 +15,8 @@
 #define PUT_GUIDS_HERE
 
 #define INITGUID
-#include <debug.h>
 #include <ntddk.h>
+#include <debug.h>
 
 #include <portcls.h>