diff --git a/src/jpeg/jconfig.h b/src/jpeg/jconfig.h
index fb32795935..7b26b7feae 100644
--- a/src/jpeg/jconfig.h
+++ b/src/jpeg/jconfig.h
@@ -1,8 +1,4 @@
-/* This test added by JACS as a quick fix. What should we do
- * to make it work with configure?
- */
-
-#if defined(_MSC_VER) || defined(__BORLANDC__) || defined (__DMC__)
+#if defined(_WIN32)
 #include "jconfig.vc"
 #else
 
diff --git a/src/tiff/libtiff/tiffiop.h b/src/tiff/libtiff/tiffiop.h
index b791c1f357..e2b47f0036 100644
--- a/src/tiff/libtiff/tiffiop.h
+++ b/src/tiff/libtiff/tiffiop.h
@@ -30,7 +30,7 @@
  * ``Library-private'' definitions.
  */
 
-#ifdef _MSC_VER
+#if defined(_WIN32)
 # include "tif_config.h.vc"
 #else
 # include "tif_config.h"