diff --git a/reactos/drivers/filesystems/msfs/create.c b/reactos/drivers/filesystems/msfs/create.c
index 1e3808af278..154bea78719 100644
--- a/reactos/drivers/filesystems/msfs/create.c
+++ b/reactos/drivers/filesystems/msfs/create.c
@@ -10,10 +10,11 @@
 
 #include "msfs.h"
 
+#include <ndk/iotypes.h>
+
 #define NDEBUG
 #include <debug.h>
 
-
 /* FUNCTIONS *****************************************************************/
 
 /* Creates the client side */
diff --git a/reactos/drivers/filesystems/msfs/finfo.c b/reactos/drivers/filesystems/msfs/finfo.c
index bacf2622f7e..5772865500c 100644
--- a/reactos/drivers/filesystems/msfs/finfo.c
+++ b/reactos/drivers/filesystems/msfs/finfo.c
@@ -18,7 +18,6 @@
 #define MAILSLOT_NO_MESSAGE   MAXULONG
 #define MAILSLOT_WAIT_FOREVER MAXULONG
 
-
 /* FUNCTIONS *****************************************************************/
 
 static NTSTATUS
diff --git a/reactos/drivers/filesystems/msfs/fsctrl.c b/reactos/drivers/filesystems/msfs/fsctrl.c
index be54c442b3e..280e2a856c3 100644
--- a/reactos/drivers/filesystems/msfs/fsctrl.c
+++ b/reactos/drivers/filesystems/msfs/fsctrl.c
@@ -13,7 +13,6 @@
 #define NDEBUG
 #include <debug.h>
 
-
 /* FUNCTIONS *****************************************************************/
 
 NTSTATUS DEFAULTAPI
diff --git a/reactos/drivers/filesystems/msfs/msfs.c b/reactos/drivers/filesystems/msfs/msfs.c
index 06f3fed2797..5f72823a85f 100644
--- a/reactos/drivers/filesystems/msfs/msfs.c
+++ b/reactos/drivers/filesystems/msfs/msfs.c
@@ -13,7 +13,6 @@
 #define NDEBUG
 #include <debug.h>
 
-
 /* FUNCTIONS *****************************************************************/
 
 NTSTATUS NTAPI
diff --git a/reactos/drivers/filesystems/msfs/msfs.h b/reactos/drivers/filesystems/msfs/msfs.h
index c73daee02be..772b80a204d 100644
--- a/reactos/drivers/filesystems/msfs/msfs.h
+++ b/reactos/drivers/filesystems/msfs/msfs.h
@@ -10,7 +10,6 @@
 #define __DRIVERS_FS_MS_MSFS_H
 
 #include <ntifs.h>
-#include <iotypes.h>
 
 #define DEFAULTAPI NTAPI
 
diff --git a/reactos/drivers/filesystems/msfs/rw.c b/reactos/drivers/filesystems/msfs/rw.c
index f0c66ed56c9..aac5dd53b3b 100644
--- a/reactos/drivers/filesystems/msfs/rw.c
+++ b/reactos/drivers/filesystems/msfs/rw.c
@@ -13,7 +13,6 @@
 #define NDEBUG
 #include <debug.h>
 
-
 /* FUNCTIONS *****************************************************************/
 
 NTSTATUS DEFAULTAPI