diff --git a/makefile b/makefile
index e4942493..312263d5 100644
--- a/makefile
+++ b/makefile
@@ -913,6 +913,9 @@ else
       NETWORK_LAN_FEATURES += NAT(SLiRP)
     endif
   endif
+  ifneq (,$(call find_include,ddk/ntdddisk))
+    CFLAGS_I = -DHAVE_NTDDDISK_H
+  endif
 endif # Win32 (via MinGW)
 ifneq (,$(GIT_COMMIT_ID))
   CFLAGS_GIT = -DSIM_GIT_COMMIT_ID=$(GIT_COMMIT_ID)
@@ -1013,7 +1016,7 @@ ifneq ($(DONT_USE_READER_THREAD),)
 endif
 
 CC_OUTSPEC = -o $@
-CC := $(GCC) $(CC_STD) -U__STRICT_ANSI__ $(CFLAGS_G) $(CFLAGS_O) $(CFLAGS_GIT) -DSIM_COMPILER="$(COMPILER_NAME)" -I . $(OS_CCDEFS) $(ROMS_OPT)
+CC := $(GCC) $(CC_STD) -U__STRICT_ANSI__ $(CFLAGS_G) $(CFLAGS_O) $(CFLAGS_GIT) $(CFLAGS_I) -DSIM_COMPILER="$(COMPILER_NAME)" -I . $(OS_CCDEFS) $(ROMS_OPT)
 LDFLAGS := $(OS_LDFLAGS) $(NETWORK_LDFLAGS) $(LDFLAGS_O)
 
 #
diff --git a/sim_disk.c b/sim_disk.c
index 3596b849..4d3c096e 100644
--- a/sim_disk.c
+++ b/sim_disk.c
@@ -2143,7 +2143,7 @@ if ((dwStatus >= ERROR_INVALID_STARTING_CODESEG) && (dwStatus <= ERROR_INFLOOP_I
     }
 errno = EINVAL;
 }
-#if defined(__GNUC__)
+#if defined(__GNUC__) && defined(HAVE_NTDDDISK_H)
 #include <ddk/ntddstor.h>
 #include <ddk/ntdddisk.h>
 #else