diff --git a/Makefile.common b/Makefile.common
index 6c73e332fc..59a27466cb 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -1008,9 +1008,9 @@ ifeq ($(HAVE_COMPRESSION), 1)
    DEFINES += -DHAVE_COMPRESSION
 endif
 
-ifeq ($(HAVE_DIRECTX), 1)
-   DEFINES += -I"$(DXSDK_DIR)/Include"
-endif
+#ifeq ($(HAVE_DIRECTX), 1)
+   #$DEFINES += -I"$(DXSDK_DIR)/Include"
+#endif
 
 ifeq ($(HAVE_COCOA),1)
    DEFINES += -DHAVE_MAIN
diff --git a/gfx/common/win32_common.cpp b/gfx/common/win32_common.cpp
index a8f17b0110..4ddcfc1277 100644
--- a/gfx/common/win32_common.cpp
+++ b/gfx/common/win32_common.cpp
@@ -15,6 +15,7 @@
 
 #include <retro_miscellaneous.h>
 
+#include "../../frontend/frontend_driver.h"
 #include "../../general.h"
 #include "../../verbosity.h"
 #include "win32_common.h"
@@ -393,6 +394,10 @@ bool win32_suppress_screensaver(void *data, bool enable)
    {
       int major, minor;
       char tmp[PATH_MAX_LENGTH];
+      const frontend_ctx_driver_t *frontend = frontend_get_ptr();
+
+      if (!frontend)
+         return false;
 
       frontend->get_os(tmp, sizeof(tmp), &major, &minor);