diff --git a/reactos/drivers/filters/mountmgr/database.c b/reactos/drivers/filters/mountmgr/database.c
index b80a8987f58..f6a730c4965 100644
--- a/reactos/drivers/filters/mountmgr/database.c
+++ b/reactos/drivers/filters/mountmgr/database.c
@@ -23,8 +23,6 @@
  * PROGRAMMER:       Pierre Schweitzer (pierre.schweitzer@reactos.org)
  */
 
-/* INCLUDES *****************************************************************/
-
 #include "mntmgr.h"
 
 #define NDEBUG
diff --git a/reactos/drivers/filters/mountmgr/device.c b/reactos/drivers/filters/mountmgr/device.c
index e76b7aa8be7..c86df7a5426 100644
--- a/reactos/drivers/filters/mountmgr/device.c
+++ b/reactos/drivers/filters/mountmgr/device.c
@@ -23,8 +23,6 @@
  * PROGRAMMER:       Pierre Schweitzer (pierre.schweitzer@reactos.org)
  */
 
-/* INCLUDES *****************************************************************/
-
 #include "mntmgr.h"
 
 #define MAX_DEVICES 0x3E8 /* Matches 1000 devices */
diff --git a/reactos/drivers/filters/mountmgr/mntmgr.h b/reactos/drivers/filters/mountmgr/mntmgr.h
index f1c401a396e..d0cf8a96151 100644
--- a/reactos/drivers/filters/mountmgr/mntmgr.h
+++ b/reactos/drivers/filters/mountmgr/mntmgr.h
@@ -2,14 +2,11 @@
 #define _MNTMGR_H_
 
 #include <ntifs.h>
-#include <ntddk.h>
 #include <mountdev.h>
 #include <ntddvol.h>
 #include <wdmguid.h>
-#include <ioevent.h>
-#include <psfuncs.h>
+#include <ndk/psfuncs.h>
 #include <ntdddisk.h>
-#include <ntddvol.h>
 
 /* Enter FIXME */
 #ifdef IsEqualGUID
diff --git a/reactos/drivers/filters/mountmgr/mountmgr.c b/reactos/drivers/filters/mountmgr/mountmgr.c
index d955453ed1d..cddbcc446f5 100644
--- a/reactos/drivers/filters/mountmgr/mountmgr.c
+++ b/reactos/drivers/filters/mountmgr/mountmgr.c
@@ -24,8 +24,6 @@
  *                   Alex Ionescu (alex.ionescu@reactos.org)
  */
 
-/* INCLUDES *****************************************************************/
-
 #include "mntmgr.h"
 
 #define NDEBUG
diff --git a/reactos/drivers/filters/mountmgr/notify.c b/reactos/drivers/filters/mountmgr/notify.c
index 4e148f296ec..60f9f78e4c3 100644
--- a/reactos/drivers/filters/mountmgr/notify.c
+++ b/reactos/drivers/filters/mountmgr/notify.c
@@ -24,10 +24,10 @@
  *                   Alex Ionescu (alex.ionescu@reactos.org)
  */
 
-/* INCLUDES *****************************************************************/
-
 #include "mntmgr.h"
 
+#include <ioevent.h>
+
 #define NDEBUG
 #include <debug.h>
 
diff --git a/reactos/drivers/filters/mountmgr/point.c b/reactos/drivers/filters/mountmgr/point.c
index 3eab7c360f3..0c2136c1a7f 100644
--- a/reactos/drivers/filters/mountmgr/point.c
+++ b/reactos/drivers/filters/mountmgr/point.c
@@ -23,8 +23,6 @@
  * PROGRAMMER:       Pierre Schweitzer (pierre.schweitzer@reactos.org)
  */
 
-/* INCLUDES *****************************************************************/
-
 #include "mntmgr.h"
 
 #define NDEBUG
diff --git a/reactos/drivers/filters/mountmgr/symlink.c b/reactos/drivers/filters/mountmgr/symlink.c
index f5b76e69bc8..80c5b00873e 100644
--- a/reactos/drivers/filters/mountmgr/symlink.c
+++ b/reactos/drivers/filters/mountmgr/symlink.c
@@ -23,8 +23,6 @@
  * PROGRAMMER:       Pierre Schweitzer (pierre.schweitzer@reactos.org)
  */
 
-/* INCLUDES *****************************************************************/
-
 #include "mntmgr.h"
 
 #define NDEBUG
diff --git a/reactos/drivers/filters/mountmgr/uniqueid.c b/reactos/drivers/filters/mountmgr/uniqueid.c
index 66160ffb534..b0a2f5547bf 100644
--- a/reactos/drivers/filters/mountmgr/uniqueid.c
+++ b/reactos/drivers/filters/mountmgr/uniqueid.c
@@ -23,8 +23,6 @@
  * PROGRAMMER:       Pierre Schweitzer (pierre.schweitzer@reactos.org)
  */
 
-/* INCLUDES *****************************************************************/
-
 #include "mntmgr.h"
 
 #define NDEBUG