diff --git a/src/frontend/plotting/gnuplot.c b/src/frontend/plotting/gnuplot.c
index 96a77fd5d..ea5b372e8 100644
--- a/src/frontend/plotting/gnuplot.c
+++ b/src/frontend/plotting/gnuplot.c
@@ -161,7 +161,7 @@ void ft_gnuplot(double *xlims, double *ylims,
     }
 
     /* Set up the file header. */
-#if !defined(__MINGW__) && !defined(_MSC_VER) && !defined(__CYGWIN__)
+#if !defined(__MINGW32__) && !defined(_MSC_VER) && !defined(__CYGWIN__)
     fprintf(file, "set terminal X11 noenhanced\n");
 #elif defined(__CYGWIN__)
 #ifndef EXT_ASC
diff --git a/src/include/ngspice/ngspice.h b/src/include/ngspice/ngspice.h
index 8b3293176..0b4f6e710 100644
--- a/src/include/ngspice/ngspice.h
+++ b/src/include/ngspice/ngspice.h
@@ -219,7 +219,7 @@ extern double x_atanh(double);
 #endif
 
 #ifndef EXT_ASC
-#if defined(__MINGW__) || defined(_MSC_VER)
+#if defined(__MINGW32__) || defined(_MSC_VER)
 #define fopen newfopen
 extern FILE *newfopen(const char *fn, const char* md);
 #endif
diff --git a/src/misc/util.c b/src/misc/util.c
index 132560903..d438337ff 100644
--- a/src/misc/util.c
+++ b/src/misc/util.c
@@ -260,7 +260,7 @@ ngdirname(const char *name)
 
 /* Replacement for fopen, when using wide chars (utf-16) */
 #ifndef EXT_ASC
-#if defined(__MINGW__) || defined(_MSC_VER)
+#if defined(__MINGW32__) || defined(_MSC_VER)
 #undef BOOLEAN
 #include <windows.h>
 FILE *