diff --git a/drivers/storage/class/CMakeLists.txt b/drivers/storage/class/CMakeLists.txt
index d3fd268b523..a7e0bf22bed 100644
--- a/drivers/storage/class/CMakeLists.txt
+++ b/drivers/storage/class/CMakeLists.txt
@@ -2,4 +2,5 @@
 add_subdirectory(cdrom)
 add_subdirectory(class2)
 add_subdirectory(disk)
+add_subdirectory(disk_new)
 add_subdirectory(ramdisk)
diff --git a/drivers/storage/class/disk_new/CMakeLists.txt b/drivers/storage/class/disk_new/CMakeLists.txt
index fc14e6fdc05..f97376b5545 100644
--- a/drivers/storage/class/disk_new/CMakeLists.txt
+++ b/drivers/storage/class/disk_new/CMakeLists.txt
@@ -1,16 +1,12 @@
 include_directories(..)
 
-add_library(disk SHARED data.c disk.c diskwmi.c enum.c geometry.c part.c pnp.c disk.rc)
+add_library(disk_new SHARED data.c disk.c diskwmi.c enum.c geometry.c part.c pnp.c disk.rc)
 
-if(ARCH MATCHES i386)
-    add_target_compile_flags(disk "-mrtd -fno-builtin -Wno-unused-variable -Wno-pointer-sign")
+target_link_libraries(disk_new libcntpr wdmguid)
+if(NOT MSVC AND ARCH MATCHES i386)
+    add_target_compile_flags(disk_new "-mrtd -fno-builtin -Wno-unused-variable -Wno-pointer-sign")
 endif()
 
-set_module_type(disk kernelmodedriver)
-add_importlibs(disk
-    classpnp
-    scsiport
-    ntoskrnl
-    hal)
-
-add_cd_file(TARGET disk DESTINATION reactos/system32/drivers NO_CAB FOR all)
+set_module_type(disk_new kernelmodedriver)
+add_importlibs(disk_new classpnp ntoskrnl hal)
+add_cd_file(TARGET disk_new DESTINATION reactos/system32/drivers NO_CAB FOR all)
diff --git a/drivers/storage/class/disk_new/pnp.c b/drivers/storage/class/disk_new/pnp.c
index 810265676ce..fe1ef90a9cb 100644
--- a/drivers/storage/class/disk_new/pnp.c
+++ b/drivers/storage/class/disk_new/pnp.c
@@ -22,7 +22,7 @@ Revision History:
 
 #include "disk.h"
 
-extern PULONG InitSafeBootMode;
+extern NTSYSAPI ULONG InitSafeBootMode;
 
 #ifdef ALLOC_PRAGMA
 
@@ -500,7 +500,7 @@ Return Value:
     // and enable failure prediction polling.
     //
 
-    if (*InitSafeBootMode == 0)
+    if (InitSafeBootMode == 0)
     {
         DiskDetectFailurePrediction(fdoExtension,
                                   &diskData->FailurePredictionCapability);
diff --git a/drivers/storage/classpnp/CMakeLists.txt b/drivers/storage/classpnp/CMakeLists.txt
index 2479aa7d033..f0f9884e48c 100644
--- a/drivers/storage/classpnp/CMakeLists.txt
+++ b/drivers/storage/classpnp/CMakeLists.txt
@@ -17,7 +17,7 @@ if(ARCH MATCHES i386)
     endif()
 endif()
 
-spec2def(classpnp.sys class.spec)
+spec2def(classpnp.sys classpnp.spec)
 
 list(APPEND SOURCE
     autorun.c
@@ -35,12 +35,12 @@ list(APPEND SOURCE
     utils.c
     xferpkt.c
     class.rc
-    ${CMAKE_CURRENT_BINARY_DIR}/class.def)
+    ${CMAKE_CURRENT_BINARY_DIR}/classpnp.def)
 
 add_library(classpnp SHARED ${SOURCE})
 add_pch(classpnp classp.h)
 target_link_libraries(classpnp ${PSEH_LIB} libcntpr)
 set_module_type(classpnp kernelmodedriver)
 add_importlibs(classpnp hal ntoskrnl)
-add_importlib_target(class.spec)
+add_importlib_target(classpnp.spec)
 add_cd_file(TARGET classpnp DESTINATION reactos/system32/drivers NO_CAB FOR all)
diff --git a/drivers/storage/classpnp/classpnp.rbuild b/drivers/storage/classpnp/classpnp.rbuild
index 2eb4afddd2b..77ae9f2666d 100644
--- a/drivers/storage/classpnp/classpnp.rbuild
+++ b/drivers/storage/classpnp/classpnp.rbuild
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="classpnp" type="kernelmodedriver" installbase="system32/drivers" installname="classpnp.sys">
 	<bootstrap installbase="$(CDOUTPUT)/system32/drivers" />
-	<importlibrary definition="class.spec" />
+	<importlibrary definition="classpnp.spec" />
 	<library>ntoskrnl</library>
 	<library>hal</library>
 	<library>pseh</library>
diff --git a/drivers/storage/classpnp/class.spec b/drivers/storage/classpnp/classpnp.spec
similarity index 100%
rename from drivers/storage/classpnp/class.spec
rename to drivers/storage/classpnp/classpnp.spec