diff --git a/coders/bmp.c b/coders/bmp.c
index 13a4c2e..a172411 100644
--- a/coders/bmp.c
+++ b/coders/bmp.c
@@ -71,7 +71,7 @@
#define BI_JPEG 4
#undef BI_PNG
#define BI_PNG 5
-#if !defined(__WINDOWS__) || defined(__MINGW32__)
+#if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__MINGW32__)
#define BI_RGB 0
#define BI_RLE8 1
#define BI_RLE4 2
diff --git a/coders/dib.c b/coders/dib.c
index c6ac332..96f2b98 100644
--- a/coders/dib.c
+++ b/coders/dib.c
@@ -150,7 +150,7 @@
static MagickBooleanType DecodeImage(Image *image,
const MagickBooleanType compression,unsigned char *pixels)
{
-#if !defined(__WINDOWS__) || defined(__MINGW32__)
+#if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__MINGW32__)
#define BI_RGB 0
#define BI_RLE8 1
#define BI_RLE4 2
diff --git a/coders/fpx.c b/coders/fpx.c
index f43e558..47e3d45 100644
--- a/coders/fpx.c
+++ b/coders/fpx.c
@@ -64,7 +64,7 @@
#include "magick/string_.h"
#include "magick/module.h"
#if defined(MAGICKCORE_FPX_DELEGATE)
-#if !defined(vms) && !defined(macintosh) && !defined(__WINDOWS__)
+#if !defined(vms) && !defined(macintosh) && !defined(MAGICKCORE_WINDOWS_SUPPORT)
#include <fpxlib.h>
#else
#include "Fpxlib.h"
diff --git a/coders/icon.c b/coders/icon.c
index db7b5ce..27b05a1 100644
--- a/coders/icon.c
+++ b/coders/icon.c
@@ -64,7 +64,7 @@
/*
Define declarations.
*/
-#if !defined(__WINDOWS__) || defined(__MINGW32__)
+#if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__MINGW32__)
#define BI_RGB 0
#define BI_RLE8 1
#define BI_BITFIELDS 3
diff --git a/coders/meta.c b/coders/meta.c
index d9105ea..8f6ac7e 100644
--- a/coders/meta.c
+++ b/coders/meta.c
@@ -1785,7 +1785,7 @@
break;
}
}
-#if defined(__WINDOWS__)
+#if defined(MAGICKCORE_WINDOWS_SUPPORT)
(void) WriteBlobString(ofile,"\"\r\n");
#else
#if defined(macintosh)
diff --git a/coders/msl.c b/coders/msl.c
index af0596b..ccdb620 100644
--- a/coders/msl.c
+++ b/coders/msl.c
@@ -88,7 +88,7 @@
#include "magick/threshold.h"
#include "magick/utility.h"
#if defined(MAGICKCORE_XML_DELEGATE)
-# if defined(__WINDOWS__)
+# if defined(MAGICKCORE_WINDOWS_SUPPORT)
# if defined(__MINGW32__)
# define _MSC_VER
# else
diff --git a/coders/pdf.c b/coders/pdf.c
index 8514bf4..6fcd1c3 100644
--- a/coders/pdf.c
+++ b/coders/pdf.c
@@ -124,7 +124,7 @@
int
status;
-#if defined(MAGICKCORE_GS_DELEGATE) || defined(__WINDOWS__)
+#if defined(MAGICKCORE_GS_DELEGATE) || defined(MAGICKCORE_WINDOWS_SUPPORT)
char
**argv;
@@ -141,7 +141,7 @@
register long
i;
-#if defined(__WINDOWS__)
+#if defined(MAGICKCORE_WINDOWS_SUPPORT)
ghost_info=NTGhostscriptDLLVectors();
#else
GhostInfo
@@ -182,7 +182,7 @@
0,&code);
(ghost_info->exit)(interpreter);
(ghost_info->delete_instance)(interpreter);
-#if defined(__WINDOWS__)
+#if defined(MAGICKCORE_WINDOWS_SUPPORT)
NTGhostscriptUnLoadDLL();
#endif
for (i=0; i < (long) argc; i++)
diff --git a/coders/ps.c b/coders/ps.c
index c2f02cc..47767da 100644
--- a/coders/ps.c
+++ b/coders/ps.c
@@ -116,7 +116,7 @@
int
status;
-#if defined(MAGICKCORE_GS_DELEGATE) || defined(__WINDOWS__)
+#if defined(MAGICKCORE_GS_DELEGATE) || defined(MAGICKCORE_WINDOWS_SUPPORT)
char
**argv;
@@ -133,7 +133,7 @@
register long
i;
-#if defined(__WINDOWS__)
+#if defined(MAGICKCORE_WINDOWS_SUPPORT)
ghost_info=NTGhostscriptDLLVectors();
#else
GhostInfo
@@ -174,7 +174,7 @@
0,&code);
(ghost_info->exit)(interpreter);
(ghost_info->delete_instance)(interpreter);
-#if defined(__WINDOWS__)
+#if defined(MAGICKCORE_WINDOWS_SUPPORT)
NTGhostscriptUnLoadDLL();
#endif
for (i=0; i < (long) argc; i++)
diff --git a/coders/svg.c b/coders/svg.c
index b9a8338..746833b 100644
--- a/coders/svg.c
+++ b/coders/svg.c
@@ -72,7 +72,7 @@
#include "magick/token.h"
#include "magick/utility.h"
#if defined(MAGICKCORE_XML_DELEGATE)
-# if defined(__WINDOWS__)
+# if defined(MAGICKCORE_WINDOWS_SUPPORT)
# if defined(__MINGW32__)
# define _MSC_VER
# else
diff --git a/coders/url.c b/coders/url.c
index 00c5126..4df19b4 100644
--- a/coders/url.c
+++ b/coders/url.c
@@ -57,7 +57,7 @@
#include "magick/string_.h"
#include "magick/module.h"
#if defined(MAGICKCORE_XML_DELEGATE)
-# if defined(__WINDOWS__)
+# if defined(MAGICKCORE_WINDOWS_SUPPORT)
# if defined(__MINGW32__)
# define _MSC_VER
# else