diff --git a/src/goto-cc/compile.cpp b/src/goto-cc/compile.cpp
index 87b3fdad98f..e5dec0e6421 100644
--- a/src/goto-cc/compile.cpp
+++ b/src/goto-cc/compile.cpp
@@ -57,11 +57,17 @@ Date: June 2006
 #endif
 
 #ifdef _WIN32
+#include <util/pragma_push.def>
+#ifdef _MSC_VER
+#pragma warning(disable:4668)
+  // using #if/#elif on undefined macro
+#endif
 #include <direct.h>
 #include <windows.h>
 #define chdir _chdir
 #define popen _popen
 #define pclose _pclose
+#include <util/pragma_pop.def>
 #endif
 
 /// reads and source and object files, compiles and links them into goto program
diff --git a/src/util/cout_message.cpp b/src/util/cout_message.cpp
index 44203df75fb..e7a3e0ad15b 100644
--- a/src/util/cout_message.cpp
+++ b/src/util/cout_message.cpp
@@ -11,10 +11,16 @@ Author: Daniel Kroening, kroening@kroening.com
 #include <iostream>
 
 #ifdef _WIN32
+#include <util/pragma_push.def>
+#ifdef _MSC_VER
+#pragma warning(disable:4668)
+  // using #if/#elif on undefined macro
+#endif
 #include <windows.h>
 #include <fcntl.h>
 #include <io.h>
 #include <cstdio>
+#include <util/pragma_pop.def>
 #endif
 
 #include "unicode.h"
diff --git a/src/util/file_util.cpp b/src/util/file_util.cpp
index e4a96bcf0ca..cafbc30f12e 100644
--- a/src/util/file_util.cpp
+++ b/src/util/file_util.cpp
@@ -32,6 +32,11 @@ Date: January 2012
 #endif
 
 #ifdef _WIN32
+#include <util/pragma_push.def>
+#ifdef _MSC_VER
+#pragma warning(disable:4668)
+  // using #if/#elif on undefined macro
+#endif
 #include <io.h>
 #include <windows.h>
 #include <direct.h>
@@ -39,6 +44,7 @@ Date: January 2012
 #define chdir _chdir
 #define popen _popen
 #define pclose _pclose
+#include <util/pragma_pop.def>
 #endif
 
 /// \return current working directory
diff --git a/src/util/memory_info.cpp b/src/util/memory_info.cpp
index 3840ba4fc5b..881d709c5d7 100644
--- a/src/util/memory_info.cpp
+++ b/src/util/memory_info.cpp
@@ -19,8 +19,14 @@ Author: Daniel Kroening, kroening@kroening.com
 #endif
 
 #ifdef _WIN32
+#include <util/pragma_push.def>
+#ifdef _MSC_VER
+#pragma warning(disable:4668)
+  // using #if/#elif on undefined macro
+#endif
 #include <windows.h>
 #include <psapi.h>
+#include <util/pragma_pop.def>
 #endif
 
 #include <ostream>
diff --git a/src/util/tempdir.cpp b/src/util/tempdir.cpp
index 0eae3389581..8335e1fc1bc 100644
--- a/src/util/tempdir.cpp
+++ b/src/util/tempdir.cpp
@@ -9,9 +9,15 @@ Author: CM Wintersteiger
 #include "tempdir.h"
 
 #ifdef _WIN32
+#include <util/pragma_push.def>
+#ifdef _MSC_VER
+#pragma warning(disable:4668)
+  // using #if/#elif on undefined macro
+#endif
 #include <windows.h>
 #include <io.h>
 #include <direct.h>
+#include <util/pragma_pop.def>
 #endif
 
 #include <cstdlib>
diff --git a/src/util/tempfile.cpp b/src/util/tempfile.cpp
index c0a69ff6359..1c0c4aad385 100644
--- a/src/util/tempfile.cpp
+++ b/src/util/tempfile.cpp
@@ -9,6 +9,11 @@ Author: Daniel Kroening
 #include "tempfile.h"
 
 #ifdef _WIN32
+#include <util/pragma_push.def>
+#ifdef _MSC_VER
+#pragma warning(disable:4668)
+  // using #if/#elif on undefined macro
+#endif
 #include <process.h>
 #include <sys/stat.h>
 #include <windows.h>
@@ -17,6 +22,7 @@ Author: Daniel Kroening
 #define getpid _getpid
 #define open _open
 #define close _close
+#include <util/pragma_pop.def>
 #endif
 
 #include <fcntl.h>
diff --git a/src/util/unicode.cpp b/src/util/unicode.cpp
index ca9ef98b3fd..6adcbcd67d4 100644
--- a/src/util/unicode.cpp
+++ b/src/util/unicode.cpp
@@ -15,7 +15,13 @@ Author: Daniel Kroening, kroening@kroening.com
 #include <cstdint>
 
 #ifdef _WIN32
+#include <util/pragma_push.def>
+#ifdef _MSC_VER
+#pragma warning(disable:4668)
+  // using #if/#elif on undefined macro
+#endif
 #include <windows.h>
+#include <util/pragma_pop.def>
 #endif
 
 std::string narrow(const wchar_t *s)