diff --git a/reactos/drivers/filesystems/ntfs/attrib.c b/reactos/drivers/filesystems/ntfs/attrib.c
index bcd20fc89c7..f17b70ac05f 100644
--- a/reactos/drivers/filesystems/ntfs/attrib.c
+++ b/reactos/drivers/filesystems/ntfs/attrib.c
@@ -31,9 +31,6 @@
 #define NDEBUG
 #include <debug.h>
 
-/* GLOBALS *****************************************************************/
-
-
 /* FUNCTIONS ****************************************************************/
 
 static
diff --git a/reactos/drivers/filesystems/ntfs/blockdev.c b/reactos/drivers/filesystems/ntfs/blockdev.c
index a73f646469e..85586939343 100644
--- a/reactos/drivers/filesystems/ntfs/blockdev.c
+++ b/reactos/drivers/filesystems/ntfs/blockdev.c
@@ -30,9 +30,6 @@
 #define NDEBUG
 #include <debug.h>
 
-/* GLOBALS *****************************************************************/
-
-
 /* FUNCTIONS ****************************************************************/
 
 NTSTATUS
diff --git a/reactos/drivers/filesystems/ntfs/close.c b/reactos/drivers/filesystems/ntfs/close.c
index a07764c10ff..1ce76594fdb 100644
--- a/reactos/drivers/filesystems/ntfs/close.c
+++ b/reactos/drivers/filesystems/ntfs/close.c
@@ -31,9 +31,6 @@
 #define NDEBUG
 #include <debug.h>
 
-/* GLOBALS *****************************************************************/
-
-
 /* FUNCTIONS ****************************************************************/
 
 /*
diff --git a/reactos/drivers/filesystems/ntfs/create.c b/reactos/drivers/filesystems/ntfs/create.c
index 8fe3b13f043..5eef5286c5e 100644
--- a/reactos/drivers/filesystems/ntfs/create.c
+++ b/reactos/drivers/filesystems/ntfs/create.c
@@ -30,9 +30,6 @@
 #define NDEBUG
 #include <debug.h>
 
-/* GLOBALS *****************************************************************/
-
-
 /* FUNCTIONS ****************************************************************/
 
 static
diff --git a/reactos/drivers/filesystems/ntfs/dirctl.c b/reactos/drivers/filesystems/ntfs/dirctl.c
index 4e146235130..7024e0012f7 100644
--- a/reactos/drivers/filesystems/ntfs/dirctl.c
+++ b/reactos/drivers/filesystems/ntfs/dirctl.c
@@ -30,9 +30,6 @@
 #define NDEBUG
 #include <debug.h>
 
-/* GLOBALS *****************************************************************/
-
-
 /* FUNCTIONS ****************************************************************/
 
 #if 0
diff --git a/reactos/drivers/filesystems/ntfs/dispatch.c b/reactos/drivers/filesystems/ntfs/dispatch.c
index 3424f126fa2..4670f45431b 100644
--- a/reactos/drivers/filesystems/ntfs/dispatch.c
+++ b/reactos/drivers/filesystems/ntfs/dispatch.c
@@ -31,9 +31,6 @@
 #define NDEBUG
 #include <debug.h>
 
-/* GLOBALS *****************************************************************/
-
-
 /* FUNCTIONS ****************************************************************/
 
 /*
diff --git a/reactos/drivers/filesystems/ntfs/fastio.c b/reactos/drivers/filesystems/ntfs/fastio.c
index 186867b43b7..fc778336296 100644
--- a/reactos/drivers/filesystems/ntfs/fastio.c
+++ b/reactos/drivers/filesystems/ntfs/fastio.c
@@ -32,7 +32,6 @@
 
 #include "ntfs.h"
 
-
 /* FUNCTIONS ****************************************************************/
 
 BOOLEAN
diff --git a/reactos/drivers/filesystems/ntfs/fcb.c b/reactos/drivers/filesystems/ntfs/fcb.c
index 5cfc97d76d3..ee5553a8196 100644
--- a/reactos/drivers/filesystems/ntfs/fcb.c
+++ b/reactos/drivers/filesystems/ntfs/fcb.c
@@ -30,16 +30,10 @@
 #define NDEBUG
 #include <debug.h>
 
-/* GLOBALS *****************************************************************/
-
-
-
 /* MACROS *******************************************************************/
 
 #define TAG_FCB 'BCFI'
 
-
-
 /* FUNCTIONS ****************************************************************/
 
 static
diff --git a/reactos/drivers/filesystems/ntfs/finfo.c b/reactos/drivers/filesystems/ntfs/finfo.c
index 85c43711e42..96143eeda7c 100644
--- a/reactos/drivers/filesystems/ntfs/finfo.c
+++ b/reactos/drivers/filesystems/ntfs/finfo.c
@@ -30,9 +30,6 @@
 #define NDEBUG
 #include <debug.h>
 
-/* GLOBALS *****************************************************************/
-
-
 /* FUNCTIONS ****************************************************************/
 
 /*
diff --git a/reactos/drivers/filesystems/ntfs/fsctl.c b/reactos/drivers/filesystems/ntfs/fsctl.c
index 6f88b1d2b27..e3e20f0c040 100644
--- a/reactos/drivers/filesystems/ntfs/fsctl.c
+++ b/reactos/drivers/filesystems/ntfs/fsctl.c
@@ -29,11 +29,11 @@
 
 #include "ntfs.h"
 
+#include <ntdddisk.h>
+
 #define NDEBUG
 #include <debug.h>
 
-/* GLOBALS *****************************************************************/
-
 /* FUNCTIONS ****************************************************************/
 
 /*
diff --git a/reactos/drivers/filesystems/ntfs/mft.c b/reactos/drivers/filesystems/ntfs/mft.c
index da90a8f4788..d40d91994e7 100644
--- a/reactos/drivers/filesystems/ntfs/mft.c
+++ b/reactos/drivers/filesystems/ntfs/mft.c
@@ -31,12 +31,8 @@
 #define NDEBUG
 #include <debug.h>
 
-/* GLOBALS *****************************************************************/
-
-
 /* FUNCTIONS ****************************************************************/
 
-
 NTSTATUS
 NtfsOpenMft(PDEVICE_EXTENSION Vcb)
 {
diff --git a/reactos/drivers/filesystems/ntfs/misc.c b/reactos/drivers/filesystems/ntfs/misc.c
index 56589062229..11ce46bc416 100644
--- a/reactos/drivers/filesystems/ntfs/misc.c
+++ b/reactos/drivers/filesystems/ntfs/misc.c
@@ -31,9 +31,6 @@
 #define NDEBUG
 #include <debug.h>
 
-/* GLOBALS *****************************************************************/
-
-
 /* FUNCTIONS ****************************************************************/
 
 /*
diff --git a/reactos/drivers/filesystems/ntfs/ntfs.c b/reactos/drivers/filesystems/ntfs/ntfs.c
index 865b9e9dcf5..dff05051774 100644
--- a/reactos/drivers/filesystems/ntfs/ntfs.c
+++ b/reactos/drivers/filesystems/ntfs/ntfs.c
@@ -35,7 +35,6 @@
 
 PNTFS_GLOBAL_DATA NtfsGlobalData = NULL;
 
-
 /* FUNCTIONS ****************************************************************/
 
 /*
diff --git a/reactos/drivers/filesystems/ntfs/ntfs.h b/reactos/drivers/filesystems/ntfs/ntfs.h
index 9ae2df9b5c3..e6459f4a800 100644
--- a/reactos/drivers/filesystems/ntfs/ntfs.h
+++ b/reactos/drivers/filesystems/ntfs/ntfs.h
@@ -2,8 +2,6 @@
 #define NTFS_H
 
 #include <ntifs.h>
-#include <ntddk.h>
-#include <ntdddisk.h>
 
 #define CACHEPAGESIZE(pDeviceExt) \
 	((pDeviceExt)->NtfsInfo.UCHARsPerCluster > PAGE_SIZE ? \
diff --git a/reactos/drivers/filesystems/ntfs/rw.c b/reactos/drivers/filesystems/ntfs/rw.c
index 05edff23034..ba60de03a2a 100644
--- a/reactos/drivers/filesystems/ntfs/rw.c
+++ b/reactos/drivers/filesystems/ntfs/rw.c
@@ -32,13 +32,11 @@
 #define NDEBUG
 #include <debug.h>
 
-
 /* GLOBALS *******************************************************************/
 
 #define ROUND_UP(N, S) ((((N) + (S) - 1) / (S)) * (S))
 #define ROUND_DOWN(N, S) ((N) - ((N) % (S)))
 
-
 /* FUNCTIONS ****************************************************************/
 
 /*