diff --git a/reactos/ReactOS.xml b/reactos/ReactOS.xml
index f575319b03e..d37a34f0efe 100644
--- a/reactos/ReactOS.xml
+++ b/reactos/ReactOS.xml
@@ -32,6 +32,9 @@
include
include/reactos
+ include/libs
+ include/drivers
+ include/subsys
w32api/include
w32api/include/ddk
diff --git a/reactos/drivers/storage/directory.xml b/reactos/drivers/storage/directory.xml
index a38cfe9cb87..536e8845757 100644
--- a/reactos/drivers/storage/directory.xml
+++ b/reactos/drivers/storage/directory.xml
@@ -16,3 +16,6 @@
+
+
+
\ No newline at end of file
diff --git a/reactos/drivers/storage/diskdump/diskdump.c b/reactos/drivers/storage/diskdump/diskdump.c
index a961bef4665..1f4310a9d0e 100644
--- a/reactos/drivers/storage/diskdump/diskdump.c
+++ b/reactos/drivers/storage/diskdump/diskdump.c
@@ -31,8 +31,8 @@
#include
#include
#include
-#include
-#include
+#include
+#include
#include
#include
diff --git a/reactos/drivers/storage/diskdump/diskdump.xml b/reactos/drivers/storage/diskdump/diskdump.xml
index a1156b59233..55b0c020284 100644
--- a/reactos/drivers/storage/diskdump/diskdump.xml
+++ b/reactos/drivers/storage/diskdump/diskdump.xml
@@ -5,6 +5,7 @@
ntoskrnl
hal
class2
+ ..
diskdump.c
diskdump_helper.S
diskdump.rc
diff --git a/reactos/include/ddk/ntddblue.h b/reactos/include/drivers/blue/ntddblue.h
similarity index 100%
rename from reactos/include/ddk/ntddblue.h
rename to reactos/include/drivers/blue/ntddblue.h
diff --git a/reactos/include/drivers/diskdump/diskdump.h b/reactos/include/drivers/diskdump/diskdump.h
new file mode 100644
index 00000000000..bb3f8b52027
--- /dev/null
+++ b/reactos/include/drivers/diskdump/diskdump.h
@@ -0,0 +1,31 @@
+#ifndef __DISKDUMP_H
+#define __DISKDUMP_H
+
+#include
+#include
+
+#define MM_CORE_DUMP_HEADER_MAGIC (0xdeafbead)
+#define MM_CORE_DUMP_HEADER_VERSION (0x1)
+
+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 /* __DISKDUMP_H */
diff --git a/reactos/include/epsapi/epsapi.h b/reactos/include/libs/epsapi/epsapi.h
similarity index 100%
rename from reactos/include/epsapi/epsapi.h
rename to reactos/include/libs/epsapi/epsapi.h
diff --git a/reactos/include/expat/expat.h b/reactos/include/libs/expat/expat.h
similarity index 100%
rename from reactos/include/expat/expat.h
rename to reactos/include/libs/expat/expat.h
diff --git a/reactos/include/expat/expat_external.h b/reactos/include/libs/expat/expat_external.h
similarity index 100%
rename from reactos/include/expat/expat_external.h
rename to reactos/include/libs/expat/expat_external.h
diff --git a/reactos/include/fmifs/fmifs.h b/reactos/include/libs/fmifs/fmifs.h
similarity index 100%
rename from reactos/include/fmifs/fmifs.h
rename to reactos/include/libs/fmifs/fmifs.h
diff --git a/reactos/include/fslib/vfatlib.h b/reactos/include/libs/fslib/vfatlib.h
similarity index 100%
rename from reactos/include/fslib/vfatlib.h
rename to reactos/include/libs/fslib/vfatlib.h
diff --git a/reactos/include/fslib/vfatxlib.h b/reactos/include/libs/fslib/vfatxlib.h
similarity index 100%
rename from reactos/include/fslib/vfatxlib.h
rename to reactos/include/libs/fslib/vfatxlib.h
diff --git a/reactos/include/pseh/excpt.h b/reactos/include/libs/pseh/excpt.h
similarity index 100%
rename from reactos/include/pseh/excpt.h
rename to reactos/include/libs/pseh/excpt.h
diff --git a/reactos/include/pseh/framebased.h b/reactos/include/libs/pseh/framebased.h
similarity index 100%
rename from reactos/include/pseh/framebased.h
rename to reactos/include/libs/pseh/framebased.h
diff --git a/reactos/include/pseh/framebased/internal.h b/reactos/include/libs/pseh/framebased/internal.h
similarity index 100%
rename from reactos/include/pseh/framebased/internal.h
rename to reactos/include/libs/pseh/framebased/internal.h
diff --git a/reactos/include/pseh/native.h b/reactos/include/libs/pseh/native.h
similarity index 100%
rename from reactos/include/pseh/native.h
rename to reactos/include/libs/pseh/native.h
diff --git a/reactos/include/pseh/prettybased.h b/reactos/include/libs/pseh/prettybased.h
similarity index 100%
rename from reactos/include/pseh/prettybased.h
rename to reactos/include/libs/pseh/prettybased.h
diff --git a/reactos/include/pseh/pseh.h b/reactos/include/libs/pseh/pseh.h
similarity index 100%
rename from reactos/include/pseh/pseh.h
rename to reactos/include/libs/pseh/pseh.h
diff --git a/reactos/include/pseh/setjmp.h b/reactos/include/libs/pseh/setjmp.h
similarity index 100%
rename from reactos/include/pseh/setjmp.h
rename to reactos/include/libs/pseh/setjmp.h
diff --git a/reactos/include/samlib/samlib.h b/reactos/include/libs/samlib/samlib.h
similarity index 100%
rename from reactos/include/samlib/samlib.h
rename to reactos/include/libs/samlib/samlib.h
diff --git a/reactos/include/sm/api.h b/reactos/include/libs/sm/api.h
similarity index 100%
rename from reactos/include/sm/api.h
rename to reactos/include/libs/sm/api.h
diff --git a/reactos/include/sm/helper.h b/reactos/include/libs/sm/helper.h
similarity index 100%
rename from reactos/include/sm/helper.h
rename to reactos/include/libs/sm/helper.h
diff --git a/reactos/include/sm/ns.h b/reactos/include/libs/sm/ns.h
similarity index 100%
rename from reactos/include/sm/ns.h
rename to reactos/include/libs/sm/ns.h
diff --git a/reactos/include/syssetup.h b/reactos/include/libs/syssetup/syssetup.h
similarity index 100%
rename from reactos/include/syssetup.h
rename to reactos/include/libs/syssetup/syssetup.h
diff --git a/reactos/include/csrss/csrss.h b/reactos/include/subsys/csrss/csrss.h
similarity index 99%
rename from reactos/include/csrss/csrss.h
rename to reactos/include/subsys/csrss/csrss.h
index 0c67310c68c..3f0eddfbd8e 100644
--- a/reactos/include/csrss/csrss.h
+++ b/reactos/include/subsys/csrss/csrss.h
@@ -2,7 +2,7 @@
#define __INCLUDE_CSRSS_CSRSS_H
#include
-#include
+#include
#define CSR_NATIVE 0x0000
#define CSR_CONSOLE 0x0001
diff --git a/reactos/include/lsass/lsasrv.h b/reactos/include/subsys/lsass/lsasrv.h
similarity index 100%
rename from reactos/include/lsass/lsasrv.h
rename to reactos/include/subsys/lsass/lsasrv.h
diff --git a/reactos/include/lsass/lsass.h b/reactos/include/subsys/lsass/lsass.h
similarity index 100%
rename from reactos/include/lsass/lsass.h
rename to reactos/include/subsys/lsass/lsass.h
diff --git a/reactos/lib/syssetup/install.c b/reactos/lib/syssetup/install.c
index 6f783c35094..6e5bdca0367 100644
--- a/reactos/lib/syssetup/install.c
+++ b/reactos/lib/syssetup/install.c
@@ -37,7 +37,7 @@
#include
#include
-#include
+#include
#include
#include
diff --git a/reactos/lib/syssetup/logfile.c b/reactos/lib/syssetup/logfile.c
index df622a10675..5a232f2ce22 100644
--- a/reactos/lib/syssetup/logfile.c
+++ b/reactos/lib/syssetup/logfile.c
@@ -31,7 +31,7 @@
#define NTOS_MODE_USER
#include
-#include
+#include
/* GLOBALS ******************************************************************/
diff --git a/reactos/ntoskrnl/include/ntoskrnl.h b/reactos/ntoskrnl/include/ntoskrnl.h
index 6f0daa9da1c..7ac2948bc6d 100755
--- a/reactos/ntoskrnl/include/ntoskrnl.h
+++ b/reactos/ntoskrnl/include/ntoskrnl.h
@@ -24,12 +24,18 @@
#undef IO_TYPE_FILE
#define IO_TYPE_FILE 0x0F5L /* Temp Hack */
+/* FIXME: Temporary until CC Ros is gone */
+#include
+
/* ReactOS Headers */
#include
#include
#include
#include
+/* Disk Dump Driver Header */
+#include
+
/* C Headers */
#include
#include
diff --git a/reactos/ntoskrnl/mm/pagefile.c b/reactos/ntoskrnl/mm/pagefile.c
index f25ba0b79b2..6544bf12909 100644
--- a/reactos/ntoskrnl/mm/pagefile.c
+++ b/reactos/ntoskrnl/mm/pagefile.c
@@ -29,7 +29,6 @@
/* INCLUDES *****************************************************************/
#include
-#include
#define NDEBUG
#include
diff --git a/reactos/subsys/csrss/win32csr/w32csr.h b/reactos/subsys/csrss/win32csr/w32csr.h
index a2488a7c4fe..01a79947462 100644
--- a/reactos/subsys/csrss/win32csr/w32csr.h
+++ b/reactos/subsys/csrss/win32csr/w32csr.h
@@ -4,7 +4,7 @@
#include
/* Our own BLUE.SYS Driver for Console Output */
-#include
+#include
/* External Winlogon Header */
#include
diff --git a/reactos/subsys/system/usetup/usetup.h b/reactos/subsys/system/usetup/usetup.h
index 464395401fd..4b6e9912e5e 100644
--- a/reactos/subsys/system/usetup/usetup.h
+++ b/reactos/subsys/system/usetup/usetup.h
@@ -39,8 +39,8 @@
/* DDK Disk Headers */
#include
-/* FIXME: Put outside of DDK */
-#include
+/* Blue Driver Header */
+#include
/* Helper Header */
#include