diff --git a/lib/System/Win32/Signals.cpp b/lib/System/Win32/Signals.cpp
index 1b6202a9db1..692a0476b1f 100644
--- a/lib/System/Win32/Signals.cpp
+++ b/lib/System/Win32/Signals.cpp
@@ -15,8 +15,12 @@
 #include <llvm/System/Signals.h>
 #include <vector>
 
-#include "dbghelp.h"
-#include "psapi.h"
+#ifdef __MINGW_H
+#include <imagehlp.h>
+#else
+#include <dbghelp.h>
+#endif
+#include <psapi.h>
 
 #pragma comment(lib, "psapi.lib")
 #pragma comment(lib, "dbghelp.lib")
diff --git a/lib/System/Win32/Signals.inc b/lib/System/Win32/Signals.inc
index 1b6202a9db1..692a0476b1f 100644
--- a/lib/System/Win32/Signals.inc
+++ b/lib/System/Win32/Signals.inc
@@ -15,8 +15,12 @@
 #include <llvm/System/Signals.h>
 #include <vector>
 
-#include "dbghelp.h"
-#include "psapi.h"
+#ifdef __MINGW_H
+#include <imagehlp.h>
+#else
+#include <dbghelp.h>
+#endif
+#include <psapi.h>
 
 #pragma comment(lib, "psapi.lib")
 #pragma comment(lib, "dbghelp.lib")