diff --git a/dmd/mars.c b/dmd/mars.c
index ebb64290..6be6fa51 100644
--- a/dmd/mars.c
+++ b/dmd/mars.c
@@ -20,8 +20,6 @@
 
 #if POSIX
 #include <errno.h>
-#elif _WIN32
-#include <windows.h>
 #endif
 
 #include "rmem.h"
diff --git a/dmd/mtype.c b/dmd/mtype.c
index c154419e..1d572261 100644
--- a/dmd/mtype.c
+++ b/dmd/mtype.c
@@ -95,7 +95,7 @@ int REALALIGNSIZE = 2;
 int Tsize_t = Tuns32;
 int Tptrdiff_t = Tint32;
 
-#if _WIN32 && !defined __MINGW32__
+#if _WIN32 && !(defined __MINGW32__ || defined _MSC_VER)
 static double zero = 0;
 double Port::nan = NAN;
 double Port::infinity = 1/zero;
diff --git a/dmd2/mars.c b/dmd2/mars.c
index 2d17dd29..f80250e6 100644
--- a/dmd2/mars.c
+++ b/dmd2/mars.c
@@ -19,8 +19,6 @@
 
 #if POSIX
 #include <errno.h>
-#elif _WIN32
-#include <windows.h>
 #endif
 
 #include "rmem.h"
diff --git a/dmd2/mtype.c b/dmd2/mtype.c
index d305482c..c08c650b 100644
--- a/dmd2/mtype.c
+++ b/dmd2/mtype.c
@@ -96,7 +96,7 @@ int REALALIGNSIZE = 2;
 int Tsize_t = Tuns32;
 int Tptrdiff_t = Tint32;
 
-#if _WIN32 && !defined __MINGW32__
+#if _WIN32 && !(defined __MINGW32__ || defined _MSC_VER)
 static double zero = 0;
 double Port::nan = NAN;
 double Port::infinity = 1/zero;