diff --git a/reactos/drivers/filesystems/npfs/create.c b/reactos/drivers/filesystems/npfs/create.c
index 580b848fa02..8eab8357af9 100644
--- a/reactos/drivers/filesystems/npfs/create.c
+++ b/reactos/drivers/filesystems/npfs/create.c
@@ -8,11 +8,11 @@
 
 /* INCLUDES ******************************************************************/
 
+#include "npfs.h"
+
 #define NDEBUG
 #include <debug.h>
 
-#include "npfs.h"
-
 /* FUNCTIONS *****************************************************************/
 
 static PNPFS_FCB
diff --git a/reactos/drivers/filesystems/npfs/finfo.c b/reactos/drivers/filesystems/npfs/finfo.c
index ef38e242822..7c49652c28e 100644
--- a/reactos/drivers/filesystems/npfs/finfo.c
+++ b/reactos/drivers/filesystems/npfs/finfo.c
@@ -8,11 +8,11 @@
 
 /* INCLUDES ******************************************************************/
 
+#include "npfs.h"
+
 #define NDEBUG
 #include <debug.h>
 
-#include "npfs.h"
-
 /* FUNCTIONS *****************************************************************/
 
 static
diff --git a/reactos/drivers/filesystems/npfs/fsctrl.c b/reactos/drivers/filesystems/npfs/fsctrl.c
index e450dbebadd..ccbe045f400 100644
--- a/reactos/drivers/filesystems/npfs/fsctrl.c
+++ b/reactos/drivers/filesystems/npfs/fsctrl.c
@@ -9,11 +9,11 @@
 
 /* INCLUDES ******************************************************************/
 
+#include "npfs.h"
+
 #define NDEBUG
 #include <debug.h>
 
-#include "npfs.h"
-
 /* FUNCTIONS *****************************************************************/
 
 static VOID STDCALL
diff --git a/reactos/drivers/filesystems/npfs/npfs.c b/reactos/drivers/filesystems/npfs/npfs.c
index 5c9a5e04ed1..5c24cfe5c1b 100644
--- a/reactos/drivers/filesystems/npfs/npfs.c
+++ b/reactos/drivers/filesystems/npfs/npfs.c
@@ -8,11 +8,11 @@
 
 /* INCLUDES ******************************************************************/
 
+#include "npfs.h"
+
 #define NDEBUG
 #include <debug.h>
 
-#include "npfs.h"
-
 /* FUNCTIONS *****************************************************************/
 
 NTSTATUS STDCALL
diff --git a/reactos/drivers/filesystems/npfs/rw.c b/reactos/drivers/filesystems/npfs/rw.c
index ab3553a611b..38287313141 100644
--- a/reactos/drivers/filesystems/npfs/rw.c
+++ b/reactos/drivers/filesystems/npfs/rw.c
@@ -8,11 +8,11 @@
 
 /* INCLUDES ******************************************************************/
 
+#include "npfs.h"
+
 #define NDEBUG
 #include <debug.h>
 
-#include "npfs.h"
-
 /* FUNCTIONS *****************************************************************/
 
 #ifndef NDEBUG
diff --git a/reactos/drivers/filesystems/npfs/volume.c b/reactos/drivers/filesystems/npfs/volume.c
index 8276cb055ee..1952131e95a 100644
--- a/reactos/drivers/filesystems/npfs/volume.c
+++ b/reactos/drivers/filesystems/npfs/volume.c
@@ -8,11 +8,11 @@
 
 /* INCLUDES *****************************************************************/
 
+#include "npfs.h"
+
 #define NDEBUG
 #include <debug.h>
 
-#include "npfs.h"
-
 /* FUNCTIONS ****************************************************************/
 
 static NTSTATUS