diff --git a/reactos/drivers/fs/cdfs/cdfs.c b/reactos/drivers/fs/cdfs/cdfs.c
index c1d465cd87d..8db1860b05f 100644
--- a/reactos/drivers/fs/cdfs/cdfs.c
+++ b/reactos/drivers/fs/cdfs/cdfs.c
@@ -28,15 +28,12 @@
 
 /* INCLUDES *****************************************************************/
 
-#include <ddk/ntddk.h>
+#include "cdfs.h"
 
 #define NDEBUG
 #include <debug.h>
 
-#include "cdfs.h"
-
-
-/* GLOBALS *****************************************************************/
+/* FUNCTIONS ****************************************************************/
 
 PCDFS_GLOBAL_DATA CdfsGlobalData;
 
diff --git a/reactos/drivers/fs/cdfs/cdfs.h b/reactos/drivers/fs/cdfs/cdfs.h
index 37f4993ae70..27dc946dc8b 100644
--- a/reactos/drivers/fs/cdfs/cdfs.h
+++ b/reactos/drivers/fs/cdfs/cdfs.h
@@ -1,7 +1,10 @@
 #ifndef CDFS_H
 #define CDFS_H
 
+#include <ddk/ntddk.h>
 #include <ddk/ntifs.h>
+#include <ntddcdrm.h>
+#include <ccros.h>
 
 #define USE_ROS_CC_AND_FS
 
diff --git a/reactos/drivers/fs/cdfs/cdfs.xml b/reactos/drivers/fs/cdfs/cdfs.xml
index fd1a486d2d9..c990ed13186 100644
--- a/reactos/drivers/fs/cdfs/cdfs.xml
+++ b/reactos/drivers/fs/cdfs/cdfs.xml
@@ -17,4 +17,5 @@
 	<file>rw.c</file>
 	<file>volinfo.c</file>
 	<file>cdfs.rc</file>
+	<pch>cdfs.h</pch>
 </module>
diff --git a/reactos/drivers/fs/cdfs/cleanup.c b/reactos/drivers/fs/cdfs/cleanup.c
index bf2a3542629..17b255690bb 100644
--- a/reactos/drivers/fs/cdfs/cleanup.c
+++ b/reactos/drivers/fs/cdfs/cleanup.c
@@ -28,14 +28,11 @@
 
 /* INCLUDES *****************************************************************/
 
-#include <ddk/ntddk.h>
+#include "cdfs.h"
 
 #define NDEBUG
 #include <debug.h>
 
-#include "cdfs.h"
-
-
 /* FUNCTIONS ****************************************************************/
 
 static NTSTATUS
diff --git a/reactos/drivers/fs/cdfs/close.c b/reactos/drivers/fs/cdfs/close.c
index 9ef0f0e27e5..f7f7c38ec20 100644
--- a/reactos/drivers/fs/cdfs/close.c
+++ b/reactos/drivers/fs/cdfs/close.c
@@ -28,14 +28,11 @@
 
 /* INCLUDES *****************************************************************/
 
-#include <ddk/ntddk.h>
+#include "cdfs.h"
 
 #define NDEBUG
 #include <debug.h>
 
-#include "cdfs.h"
-
-
 /* FUNCTIONS ****************************************************************/
 
 NTSTATUS
diff --git a/reactos/drivers/fs/cdfs/common.c b/reactos/drivers/fs/cdfs/common.c
index 8d7e707dbcc..5bbca5b3112 100644
--- a/reactos/drivers/fs/cdfs/common.c
+++ b/reactos/drivers/fs/cdfs/common.c
@@ -28,14 +28,11 @@
 
 /* INCLUDES *****************************************************************/
 
-#include <ddk/ntddk.h>
+#include "cdfs.h"
 
 #define NDEBUG
 #include <debug.h>
 
-#include "cdfs.h"
-
-
 /* FUNCTIONS ****************************************************************/
 
 NTSTATUS
diff --git a/reactos/drivers/fs/cdfs/create.c b/reactos/drivers/fs/cdfs/create.c
index 6fcae4d69a9..aded346405e 100644
--- a/reactos/drivers/fs/cdfs/create.c
+++ b/reactos/drivers/fs/cdfs/create.c
@@ -28,15 +28,11 @@
 
 /* INCLUDES *****************************************************************/
 
-#include <ddk/ntddk.h>
-#include <ntddcdrm.h>
+#include "cdfs.h"
 
 #define NDEBUG
 #include <debug.h>
 
-#include "cdfs.h"
-
-
 /* FUNCTIONS ****************************************************************/
 
 static NTSTATUS
diff --git a/reactos/drivers/fs/cdfs/dirctl.c b/reactos/drivers/fs/cdfs/dirctl.c
index 32c4cb6eaec..1fcf82ec1cb 100644
--- a/reactos/drivers/fs/cdfs/dirctl.c
+++ b/reactos/drivers/fs/cdfs/dirctl.c
@@ -29,14 +29,12 @@
 
 /* INCLUDES *****************************************************************/
 
-#include <ddk/ntddk.h>
+#include "cdfs.h"
 
 #define NDEBUG
 #include <debug.h>
 
-#include "cdfs.h"
-
-/* DEFINES ******************************************************************/
+/* FUNCTIONS ****************************************************************/
 
 #define ROUND_DOWN(N, S) (((N) / (S)) * (S))
 #define ROUND_UP(N, S) ((((N) + (S) - 1) / (S)) * (S))
diff --git a/reactos/drivers/fs/cdfs/fcb.c b/reactos/drivers/fs/cdfs/fcb.c
index 1092773c2fa..a8f0d8f126e 100644
--- a/reactos/drivers/fs/cdfs/fcb.c
+++ b/reactos/drivers/fs/cdfs/fcb.c
@@ -28,15 +28,12 @@
 
 /* INCLUDES *****************************************************************/
 
-#include <ddk/ntddk.h>
+#include "cdfs.h"
 
 #define NDEBUG
 #include <debug.h>
 
-#include "cdfs.h"
-
-
-/* MACROS *******************************************************************/
+/* FUNCTIONS ****************************************************************/
 
 #define TAG_FCB TAG('I', 'F', 'C', 'B')
 
diff --git a/reactos/drivers/fs/cdfs/finfo.c b/reactos/drivers/fs/cdfs/finfo.c
index c561355ddde..16b71e9120f 100644
--- a/reactos/drivers/fs/cdfs/finfo.c
+++ b/reactos/drivers/fs/cdfs/finfo.c
@@ -29,14 +29,11 @@
 
 /* INCLUDES *****************************************************************/
 
-#include <ddk/ntddk.h>
+#include "cdfs.h"
 
 #define NDEBUG
 #include <debug.h>
 
-#include "cdfs.h"
-
-
 /* FUNCTIONS ****************************************************************/
 
 /*
diff --git a/reactos/drivers/fs/cdfs/fsctl.c b/reactos/drivers/fs/cdfs/fsctl.c
index 10f37cc9422..672aa307405 100644
--- a/reactos/drivers/fs/cdfs/fsctl.c
+++ b/reactos/drivers/fs/cdfs/fsctl.c
@@ -28,15 +28,11 @@
 
 /* INCLUDES *****************************************************************/
 
-#include <ddk/ntddk.h>
-#include <ntddcdrm.h>
+#include "cdfs.h"
 
 #define NDEBUG
 #include <debug.h>
 
-#include "cdfs.h"
-
-
 /* FUNCTIONS ****************************************************************/
 
 static inline
diff --git a/reactos/drivers/fs/cdfs/misc.c b/reactos/drivers/fs/cdfs/misc.c
index a905627ecd2..5bd6223e79f 100644
--- a/reactos/drivers/fs/cdfs/misc.c
+++ b/reactos/drivers/fs/cdfs/misc.c
@@ -28,14 +28,11 @@
 
 /* INCLUDES *****************************************************************/
 
-#include <ddk/ntddk.h>
+#include "cdfs.h"
 
 #define NDEBUG
 #include <debug.h>
 
-#include "cdfs.h"
-
-
 /* FUNCTIONS ****************************************************************/
 
 VOID
diff --git a/reactos/drivers/fs/cdfs/rw.c b/reactos/drivers/fs/cdfs/rw.c
index 475df00b4da..37dad728b3c 100644
--- a/reactos/drivers/fs/cdfs/rw.c
+++ b/reactos/drivers/fs/cdfs/rw.c
@@ -28,15 +28,12 @@
 
 /* INCLUDES *****************************************************************/
 
-#include <ddk/ntddk.h>
+#include "cdfs.h"
 
 #define NDEBUG
 #include <debug.h>
 
-#include "cdfs.h"
-
-
-/* GLOBALS *******************************************************************/
+/* FUNCTIONS ****************************************************************/
 
 #define ROUND_UP(N, S) ((((N) + (S) - 1) / (S)) * (S))
 #define ROUND_DOWN(N, S) ((N) - ((N) % (S)))
diff --git a/reactos/drivers/fs/cdfs/volinfo.c b/reactos/drivers/fs/cdfs/volinfo.c
index e5044d58d58..76cfc7aee52 100644
--- a/reactos/drivers/fs/cdfs/volinfo.c
+++ b/reactos/drivers/fs/cdfs/volinfo.c
@@ -28,14 +28,11 @@
 
 /* INCLUDES *****************************************************************/
 
-#include <ddk/ntddk.h>
+#include "cdfs.h"
 
 #define NDEBUG
 #include <debug.h>
 
-#include "cdfs.h"
-
-
 /* FUNCTIONS ****************************************************************/
 
 static NTSTATUS
diff --git a/reactos/drivers/fs/ntfs/attrib.c b/reactos/drivers/fs/ntfs/attrib.c
index 51ebcbb86e1..168244ad452 100644
--- a/reactos/drivers/fs/ntfs/attrib.c
+++ b/reactos/drivers/fs/ntfs/attrib.c
@@ -28,13 +28,12 @@
 
 /* INCLUDES *****************************************************************/
 
-#include <ddk/ntddk.h>
-
+#include "ntfs.h"
 
 #define NDEBUG
 #include <debug.h>
 
-#include "ntfs.h"
+/* GLOBALS *****************************************************************/
 
 
 /* FUNCTIONS ****************************************************************/
diff --git a/reactos/drivers/fs/ntfs/blockdev.c b/reactos/drivers/fs/ntfs/blockdev.c
index 1e510492e17..5811e5b12d3 100644
--- a/reactos/drivers/fs/ntfs/blockdev.c
+++ b/reactos/drivers/fs/ntfs/blockdev.c
@@ -27,12 +27,12 @@
 
 /* INCLUDES *****************************************************************/
 
-#include <ddk/ntddk.h>
+#include "ntfs.h"
 
 #define NDEBUG
 #include <debug.h>
 
-#include "ntfs.h"
+/* GLOBALS *****************************************************************/
 
 
 /* FUNCTIONS ****************************************************************/
diff --git a/reactos/drivers/fs/ntfs/close.c b/reactos/drivers/fs/ntfs/close.c
index 153002bfb12..124de50d770 100755
--- a/reactos/drivers/fs/ntfs/close.c
+++ b/reactos/drivers/fs/ntfs/close.c
@@ -28,12 +28,12 @@
 
 /* INCLUDES *****************************************************************/
 
-#include <ddk/ntddk.h>
+#include "ntfs.h"
 
 #define NDEBUG
 #include <debug.h>
 
-#include "ntfs.h"
+/* GLOBALS *****************************************************************/
 
 
 /* FUNCTIONS ****************************************************************/
diff --git a/reactos/drivers/fs/ntfs/create.c b/reactos/drivers/fs/ntfs/create.c
index a5278827bad..311e267b4b2 100644
--- a/reactos/drivers/fs/ntfs/create.c
+++ b/reactos/drivers/fs/ntfs/create.c
@@ -27,12 +27,12 @@
 
 /* INCLUDES *****************************************************************/
 
-#include <ddk/ntddk.h>
+#include "ntfs.h"
 
 #define NDEBUG
 #include <debug.h>
 
-#include "ntfs.h"
+/* GLOBALS *****************************************************************/
 
 
 /* FUNCTIONS ****************************************************************/
diff --git a/reactos/drivers/fs/ntfs/dirctl.c b/reactos/drivers/fs/ntfs/dirctl.c
index 22a35121afd..6a01caa6478 100644
--- a/reactos/drivers/fs/ntfs/dirctl.c
+++ b/reactos/drivers/fs/ntfs/dirctl.c
@@ -27,12 +27,12 @@
 
 /* INCLUDES *****************************************************************/
 
-#include <ddk/ntddk.h>
+#include "ntfs.h"
 
 #define NDEBUG
 #include <debug.h>
 
-#include "ntfs.h"
+/* GLOBALS *****************************************************************/
 
 
 /* FUNCTIONS ****************************************************************/
diff --git a/reactos/drivers/fs/ntfs/fcb.c b/reactos/drivers/fs/ntfs/fcb.c
index d3b46313f5f..03e68e6d954 100644
--- a/reactos/drivers/fs/ntfs/fcb.c
+++ b/reactos/drivers/fs/ntfs/fcb.c
@@ -32,6 +32,8 @@
 #define NDEBUG
 #include <debug.h>
 
+/* GLOBALS *****************************************************************/
+
 
 
 /* MACROS *******************************************************************/
diff --git a/reactos/drivers/fs/ntfs/finfo.c b/reactos/drivers/fs/ntfs/finfo.c
index 9a549919843..cf8414c46f7 100644
--- a/reactos/drivers/fs/ntfs/finfo.c
+++ b/reactos/drivers/fs/ntfs/finfo.c
@@ -27,12 +27,12 @@
 
 /* INCLUDES *****************************************************************/
 
-#include <ddk/ntddk.h>
+#include "ntfs.h"
 
 #define NDEBUG
 #include <debug.h>
 
-#include "ntfs.h"
+/* GLOBALS *****************************************************************/
 
 
 /* FUNCTIONS ****************************************************************/
diff --git a/reactos/drivers/fs/ntfs/fsctl.c b/reactos/drivers/fs/ntfs/fsctl.c
index a3c7b4daeb7..264f9ddd802 100644
--- a/reactos/drivers/fs/ntfs/fsctl.c
+++ b/reactos/drivers/fs/ntfs/fsctl.c
@@ -29,11 +29,12 @@
 /* INCLUDES *****************************************************************/
 
 #include "ntfs.h"
-#include <ntdddisk.h>
 
-//#define NDEBUG
+#define NDEBUG
 #include <debug.h>
 
+/* GLOBALS *****************************************************************/
+
 /* FUNCTIONS ****************************************************************/
 
 static NTSTATUS
diff --git a/reactos/drivers/fs/ntfs/mft.c b/reactos/drivers/fs/ntfs/mft.c
index fcf74180555..d9da0025db6 100644
--- a/reactos/drivers/fs/ntfs/mft.c
+++ b/reactos/drivers/fs/ntfs/mft.c
@@ -28,15 +28,12 @@
 
 /* INCLUDES *****************************************************************/
 
-#include <ddk/ntddk.h>
+#include "ntfs.h"
 
 #define NDEBUG
 #include <debug.h>
 
-#include "ntfs.h"
-
-
-//#define __min(a,b)  (((a) < (b)) ? (a) : (b))
+/* GLOBALS *****************************************************************/
 
 
 /* FUNCTIONS ****************************************************************/
diff --git a/reactos/drivers/fs/ntfs/ntfs.c b/reactos/drivers/fs/ntfs/ntfs.c
index 84de41c5fee..149fbc51258 100644
--- a/reactos/drivers/fs/ntfs/ntfs.c
+++ b/reactos/drivers/fs/ntfs/ntfs.c
@@ -27,14 +27,11 @@
 
 /* INCLUDES *****************************************************************/
 
-#include <ddk/ntddk.h>
+#include "ntfs.h"
 
 #define NDEBUG
 #include <debug.h>
 
-#include "ntfs.h"
-
-
 /* GLOBALS *****************************************************************/
 
 PNTFS_GLOBAL_DATA NtfsGlobalData;
diff --git a/reactos/drivers/fs/ntfs/ntfs.h b/reactos/drivers/fs/ntfs/ntfs.h
index c3e87de3679..e35d55a88e0 100644
--- a/reactos/drivers/fs/ntfs/ntfs.h
+++ b/reactos/drivers/fs/ntfs/ntfs.h
@@ -1,7 +1,10 @@
 #ifndef NTFS_H
 #define NTFS_H
 
+#include <ddk/ntddk.h>
 #include <ddk/ntifs.h>
+#include <ddk/ntdddisk.h>
+#include <ccros.h>
 
 #define USE_ROS_CC_AND_FS
 
diff --git a/reactos/drivers/fs/ntfs/ntfs.xml b/reactos/drivers/fs/ntfs/ntfs.xml
index f0936d30508..e18ba82212c 100644
--- a/reactos/drivers/fs/ntfs/ntfs.xml
+++ b/reactos/drivers/fs/ntfs/ntfs.xml
@@ -17,4 +17,5 @@
 	<file>rw.c</file>
 	<file>volinfo.c</file>
 	<file>ntfs.rc</file>
+	<pch>ntfs.h</pch>
 </module>
diff --git a/reactos/drivers/fs/vfat/fat.c b/reactos/drivers/fs/vfat/fat.c
index 27ebe3f1d3a..5503d5aa792 100644
--- a/reactos/drivers/fs/vfat/fat.c
+++ b/reactos/drivers/fs/vfat/fat.c
@@ -17,8 +17,6 @@
 
 /* GLOBALS ******************************************************************/
 
-#define ROUND_DOWN(N, S) ((N) - ((N) % (S)))
-
 #define  CACHEPAGESIZE(pDeviceExt) ((pDeviceExt)->FatInfo.BytesPerCluster > PAGE_SIZE ? \
 		   (pDeviceExt)->FatInfo.BytesPerCluster : PAGE_SIZE)
 
diff --git a/reactos/drivers/fs/vfat/fcb.c b/reactos/drivers/fs/vfat/fcb.c
index 3cd57fff128..10a8c6f6de0 100644
--- a/reactos/drivers/fs/vfat/fcb.c
+++ b/reactos/drivers/fs/vfat/fcb.c
@@ -22,8 +22,6 @@
 
 #define TAG_FCB TAG('V', 'F', 'C', 'B')
 
-#define ROUND_UP(N, S) ((((N) + (S) - 1) / (S)) * (S))
-
 /*  --------------------------------------------------------  PUBLICS  */
 
 ULONG vfatNameHash(ULONG hash, PUNICODE_STRING NameU)
diff --git a/reactos/drivers/fs/vfat/fsctl.c b/reactos/drivers/fs/vfat/fsctl.c
index a2a49752b1c..5bf33e14bb8 100644
--- a/reactos/drivers/fs/vfat/fsctl.c
+++ b/reactos/drivers/fs/vfat/fsctl.c
@@ -34,6 +34,7 @@
 #define  CACHEPAGESIZE(pDeviceExt) ((pDeviceExt)->FatInfo.BytesPerCluster > PAGE_SIZE ? \
 		   (pDeviceExt)->FatInfo.BytesPerCluster : PAGE_SIZE)
 
+#define VOLUME_IS_DIRTY 0x00000001
 
 static NTSTATUS
 VfatHasFileSystem(PDEVICE_OBJECT DeviceToMount,
diff --git a/reactos/drivers/fs/vfat/vfat.h b/reactos/drivers/fs/vfat/vfat.h
index a5631291452..0abe9588628 100644
--- a/reactos/drivers/fs/vfat/vfat.h
+++ b/reactos/drivers/fs/vfat/vfat.h
@@ -2,32 +2,14 @@
 
 #include <ddk/ntifs.h>
 #include <ddk/ntdddisk.h>
+#include <ndk/ntndk.h>
+#include <reactos/helper.h>
+#include <ccros.h>
 #include <limits.h>
 #include <debug.h>
 
 #define USE_ROS_CC_AND_FS
 
-/* FIXME */
-#ifdef __USE_W32API
-NTSTATUS NTAPI RtlOemStringToUnicodeString(PUNICODE_STRING, CONST STRING *, BOOLEAN);
-NTSTATUS NTAPI RtlDowncaseUnicodeString(PUNICODE_STRING, PCUNICODE_STRING, BOOLEAN);
-NTSTATUS NTAPI RtlUnicodeStringToOemString(POEM_STRING, PCUNICODE_STRING, BOOLEAN);
-#undef DeleteFile /* FIXME */
-#define VOLUME_IS_DIRTY 0x00000001 /* FIXME */
-#endif
-
-#ifdef USE_ROS_CC_AND_FS
-#ifndef __INCLUDE_DDK_NTIFS_H
-NTSTATUS STDCALL CcRosInitializeFileCache(PFILE_OBJECT, ULONG);
-NTSTATUS STDCALL CcRosReleaseFileCache(PFILE_OBJECT);
-#define FSCTL_ROS_QUERY_LCN_MAPPING CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 63, METHOD_BUFFERED, FILE_ANY_ACCESS)
-typedef struct _ROS_QUERY_LCN_MAPPING { LARGE_INTEGER LcnDiskOffset; } ROS_QUERY_LCN_MAPPING, *PROS_QUERY_LCN_MAPPING;
-#endif
-#endif
-
-#define ROUND_UP(N, S) ((((N) + (S) - 1) / (S)) * (S))
-#define ROUND_DOWN(N, S) ((N) - ((N) % (S)))
-
 #include <pshpack1.h>
 struct _BootSector
 {
diff --git a/reactos/drivers/fs/vfat/vfatfs.xml b/reactos/drivers/fs/vfat/vfatfs.xml
index 12aef38f53d..8384ba0e7cb 100644
--- a/reactos/drivers/fs/vfat/vfatfs.xml
+++ b/reactos/drivers/fs/vfat/vfatfs.xml
@@ -26,4 +26,5 @@
 	<file>string.c</file>
 	<file>volume.c</file>
 	<file>vfatfs.rc</file>
+	<pch>vfat.h</pch>
 </module>
diff --git a/reactos/drivers/storage/cdrom/cdrom.c b/reactos/drivers/storage/cdrom/cdrom.c
index 1bebc73188e..cf205077659 100644
--- a/reactos/drivers/storage/cdrom/cdrom.c
+++ b/reactos/drivers/storage/cdrom/cdrom.c
@@ -38,7 +38,7 @@
 #include <ddk/ntddscsi.h>
 #include <ddk/ntdddisk.h>
 #include <ddk/ntddcdrm.h>
-#include <ddk/class2.h>
+#include <include/class2.h>
 #include <stdio.h>
 
 #define NDEBUG
diff --git a/reactos/drivers/storage/cdrom/cdrom.xml b/reactos/drivers/storage/cdrom/cdrom.xml
index 1514c70af66..3ff90c4c871 100644
--- a/reactos/drivers/storage/cdrom/cdrom.xml
+++ b/reactos/drivers/storage/cdrom/cdrom.xml
@@ -4,6 +4,7 @@
 	<library>ntoskrnl</library>
 	<library>hal</library>
 	<library>class2</library>
+	<include base="cdrom">..</include>
 	<file>cdrom.c</file>
 	<file>cdrom.rc</file>
 </module>
diff --git a/reactos/drivers/storage/class2/class2.c b/reactos/drivers/storage/class2/class2.c
index 0a9b25804b3..f45c7291d0f 100644
--- a/reactos/drivers/storage/class2/class2.c
+++ b/reactos/drivers/storage/class2/class2.c
@@ -35,7 +35,7 @@
 #include <ddk/ntddk.h>
 #include <ddk/ntdddisk.h>
 #include <ddk/scsi.h>
-#include <ddk/class2.h>
+#include <include/class2.h>
 #include <stdio.h>
 
 #define NDEBUG
diff --git a/reactos/drivers/storage/class2/class2.xml b/reactos/drivers/storage/class2/class2.xml
index ba572c86a89..8cd35037e36 100644
--- a/reactos/drivers/storage/class2/class2.xml
+++ b/reactos/drivers/storage/class2/class2.xml
@@ -4,6 +4,7 @@
 	<importlibrary definition="class2.def" />
 	<library>ntoskrnl</library>
 	<library>hal</library>
+	<include base="class2">..</include>
 	<file>class2.c</file>
 	<file>class2.rc</file>
 </module>
diff --git a/reactos/drivers/storage/directory.xml b/reactos/drivers/storage/directory.xml
index 73c9c30abbb..a38cfe9cb87 100644
--- a/reactos/drivers/storage/directory.xml
+++ b/reactos/drivers/storage/directory.xml
@@ -10,9 +10,6 @@
 <directory name="disk">
 	<xi:include href="disk/disk.xml" />
 </directory>
-<directory name="diskdump">
-	<xi:include href="diskdump/diskdump.xml" />
-</directory>
 <directory name="floppy">
 	<xi:include href="floppy/floppy.xml" />
 </directory>
diff --git a/reactos/drivers/storage/disk/disk.c b/reactos/drivers/storage/disk/disk.c
index a324ff2ec5c..2bbf4f64c9a 100644
--- a/reactos/drivers/storage/disk/disk.c
+++ b/reactos/drivers/storage/disk/disk.c
@@ -30,8 +30,8 @@
 #include <ddk/ntddk.h>
 #include <ddk/ntdddisk.h>
 #include <ddk/scsi.h>
-#include <ddk/class2.h>
 #include <ddk/ntddscsi.h>
+#include <include/class2.h>
 #include <stdio.h>
 
 #define NDEBUG
diff --git a/reactos/drivers/storage/disk/disk.xml b/reactos/drivers/storage/disk/disk.xml
index b37c329ece5..cf7886bcac5 100644
--- a/reactos/drivers/storage/disk/disk.xml
+++ b/reactos/drivers/storage/disk/disk.xml
@@ -5,6 +5,7 @@
 	<library>ntoskrnl</library>
 	<library>hal</library>
 	<library>class2</library>
+	<include base="disk">..</include>
 	<file>disk.c</file>
 	<file>disk.rc</file>
 </module>
diff --git a/reactos/include/ddk/class2.h b/reactos/drivers/storage/include/class2.h
similarity index 100%
rename from reactos/include/ddk/class2.h
rename to reactos/drivers/storage/include/class2.h
diff --git a/reactos/include/ddk/ntifs.h b/reactos/include/ccros.h
similarity index 94%
rename from reactos/include/ddk/ntifs.h
rename to reactos/include/ccros.h
index a344cd85f61..ed79aa49818 100644
--- a/reactos/include/ddk/ntifs.h
+++ b/reactos/include/ccros.h
@@ -1,20 +1,18 @@
-#ifndef __INCLUDE_DDK_NTIFS_H
-#define __INCLUDE_DDK_NTIFS_H
-
-#include_next <ddk/ntifs.h>
-
-NTSTATUS STDCALL
-CcRosInitializeFileCache (PFILE_OBJECT	FileObject,
-		          ULONG		CacheSegmentSize);
-NTSTATUS STDCALL
-CcRosReleaseFileCache (PFILE_OBJECT	FileObject);
-
-#define FSCTL_ROS_QUERY_LCN_MAPPING \
-        CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 63, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-typedef struct _ROS_QUERY_LCN_MAPPING
-{
-  LARGE_INTEGER LcnDiskOffset;
-} ROS_QUERY_LCN_MAPPING, *PROS_QUERY_LCN_MAPPING;
-
-#endif /* __INCLUDE_DDK_NTIFS_H */
+#ifndef __INCLUDE_DDK_NTIFS_H
+#define __INCLUDE_DDK_NTIFS_H
+
+NTSTATUS STDCALL
+CcRosInitializeFileCache (PFILE_OBJECT	FileObject,
+		          ULONG		CacheSegmentSize);
+NTSTATUS STDCALL
+CcRosReleaseFileCache (PFILE_OBJECT	FileObject);
+
+#define FSCTL_ROS_QUERY_LCN_MAPPING \
+        CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 63, METHOD_BUFFERED, FILE_ANY_ACCESS)
+
+typedef struct _ROS_QUERY_LCN_MAPPING
+{
+  LARGE_INTEGER LcnDiskOffset;
+} ROS_QUERY_LCN_MAPPING, *PROS_QUERY_LCN_MAPPING;
+
+#endif /* __INCLUDE_DDK_NTIFS_H */
diff --git a/reactos/include/ddk/core.h b/reactos/include/ddk/core.h
deleted file mode 100644
index 1d847853451..00000000000
--- a/reactos/include/ddk/core.h
+++ /dev/null
@@ -1,30 +0,0 @@
-#ifndef __INCLUDE_NAPI_CORE_H
-#define __INCLUDE_NAPI_CORE_H
-
-#define MM_CORE_DUMP_HEADER_MAGIC         (0xdeafbead)
-#define MM_CORE_DUMP_HEADER_VERSION       (0x1)
-
-#include <ddk/ntddscsi.h>
-#include <ndk/ketypes.h>
-typedef struct _MM_CORE_DUMP_HEADER
-{
-  ULONG Magic;
-  ULONG Version;
-  ULONG Type;
-  KTRAP_FRAME TrapFrame;
-  ULONG BugCheckCode;
-  ULONG BugCheckParameters[4];
-  PVOID FaultingStackBase;
-  ULONG FaultingStackSize;
-  ULONG PhysicalMemorySize;
-} MM_CORE_DUMP_HEADER, *PMM_CORE_DUMP_HEADER;
-
-typedef struct MM_CORE_DUMP_FUNCTIONS
-{
-  NTSTATUS (STDCALL *DumpPrepare)(PDEVICE_OBJECT DeviceObject, PDUMP_POINTERS DumpPointers);
-  NTSTATUS (STDCALL *DumpInit)(VOID);
-  NTSTATUS (STDCALL *DumpWrite)(LARGE_INTEGER Address, PMDL Mdl);
-  NTSTATUS (STDCALL *DumpFinish)(VOID);
-} MM_CORE_DUMP_FUNCTIONS, *PMM_CORE_DUMP_FUNCTIONS;
-
-#endif /* __INCLUDE_NAPI_CORE_H */
diff --git a/reactos/include/ndk/rtlfuncs.h b/reactos/include/ndk/rtlfuncs.h
index 676d481e71e..e87a50b73a2 100644
--- a/reactos/include/ndk/rtlfuncs.h
+++ b/reactos/include/ndk/rtlfuncs.h
@@ -697,14 +697,6 @@ RtlUpcaseUnicodeStringToCountedOemString(
     IN BOOLEAN AllocateDestinationString
 );
 
-NTSTATUS
-STDCALL
-RtlUpcaseUnicodeString(
-    PUNICODE_STRING DestinationString,
-    PCUNICODE_STRING SourceString,
-    BOOLEAN AllocateDestinationString
-);
-
 NTSTATUS
 STDCALL
 RtlUnicodeStringToOemString(
@@ -856,6 +848,14 @@ RtlCreateUnicodeString(
     PCWSTR SourceString
 );
 
+NTSTATUS
+STDCALL
+RtlDowncaseUnicodeString(
+    IN OUT PUNICODE_STRING UniDest,
+    IN PUNICODE_STRING UniSource,
+    IN BOOLEAN AllocateDestinationString
+);
+
 BOOLEAN
 STDCALL
 RtlEqualUnicodeString(
@@ -868,11 +868,20 @@ VOID
 STDCALL
 RtlFreeUnicodeString(IN PUNICODE_STRING UnicodeString);
 
+NTSTATUS
+STDCALL
+RtlHashUnicodeString(
+    IN CONST UNICODE_STRING *String,
+    IN BOOLEAN CaseInSensitive,
+    IN ULONG HashAlgorithm,
+    OUT PULONG HashValue
+);
+
 VOID
 STDCALL
 RtlInitUnicodeString(
-  IN OUT PUNICODE_STRING  DestinationString,
-  IN PCWSTR  SourceString);
+  IN OUT PUNICODE_STRING DestinationString,
+  IN PCWSTR SourceString);
 
 ULONG
 STDCALL
@@ -890,6 +899,14 @@ RtlPrefixUnicodeString(
     BOOLEAN CaseInsensitive
 );
 
+NTSTATUS
+STDCALL
+RtlUpcaseUnicodeString(
+    PUNICODE_STRING DestinationString,
+    PCUNICODE_STRING SourceString,
+    BOOLEAN AllocateDestinationString
+);
+
 NTSTATUS
 STDCALL
 RtlUnicodeStringToInteger(
@@ -898,14 +915,6 @@ RtlUnicodeStringToInteger(
     PULONG Value
 );
 
-NTSTATUS
-STDCALL
-RtlHashUnicodeString(
-    IN CONST UNICODE_STRING *String,
-    IN BOOLEAN CaseInSensitive,
-    IN ULONG HashAlgorithm,
-    OUT PULONG HashValue);
-
 /*
  * Ansi String Functions
  */