diff --git a/src/framework/platform/win32crashhandler.cpp b/src/framework/platform/win32crashhandler.cpp
index 2fa9fbd1..5721d717 100644
--- a/src/framework/platform/win32crashhandler.cpp
+++ b/src/framework/platform/win32crashhandler.cpp
@@ -29,7 +29,19 @@
 #include <winsock2.h>
 #include <windows.h>
 #include <process.h>
+
+#ifdef _MSC_VER
+
+#pragma warning (push)
+#pragma warning (disable:4091) // warning C4091: 'typedef ': ignored on left of '' when no variable is declared
 #include <imagehlp.h>
+#pragma warning (pop)
+
+#else
+
+#include <imagehlp.h>
+
+#endif
 
 const char *getExceptionName(DWORD exceptionCode)
 {
diff --git a/src/framework/stdext/demangle.cpp b/src/framework/stdext/demangle.cpp
index 3866ed04..59def575 100644
--- a/src/framework/stdext/demangle.cpp
+++ b/src/framework/stdext/demangle.cpp
@@ -23,13 +23,21 @@
 #include "demangle.h"
 
 #ifdef _MSC_VER
+
 #include <winsock2.h>
 #include <windows.h>
+
+#pragma warning (push)
+#pragma warning (disable:4091) // warning C4091: 'typedef ': ignored on left of '' when no variable is declared
 #include <dbghelp.h>
+#pragma warning (pop)
+
 #else
+
 #include <cxxabi.h>
 #include <cstring>
 #include <cstdlib>
+
 #endif
 
 namespace stdext {