diff --git a/reactos/drivers/storage/diskdump/diskdump.c b/reactos/drivers/storage/diskdump/diskdump.c
index 6af57284c51..a961bef4665 100644
--- a/reactos/drivers/storage/diskdump/diskdump.c
+++ b/reactos/drivers/storage/diskdump/diskdump.c
@@ -32,9 +32,10 @@
 #include <ddk/ntdddisk.h>
 #include <ddk/ntddscsi.h>
 #include <ddk/class2.h>
+#include <ddk/core.h>
 
-#include <ndk/ntndk.h>
-#include <napi/core.h>
+#include <ndk/extypes.h>
+#include <ndk/rtlfuncs.h>
 #include "../scsiport/scsiport_int.h"
 
 #define NDEBUG
diff --git a/reactos/include/ddk/core.h b/reactos/include/ddk/core.h
index 9deeb2ccdef..1d847853451 100644
--- a/reactos/include/ddk/core.h
+++ b/reactos/include/ddk/core.h
@@ -5,6 +5,7 @@
 #define MM_CORE_DUMP_HEADER_VERSION       (0x1)
 
 #include <ddk/ntddscsi.h>
+#include <ndk/ketypes.h>
 typedef struct _MM_CORE_DUMP_HEADER
 {
   ULONG Magic;