diff --git a/lib/diagnostics.C b/lib/diagnostics.C
index 4104fedd27..62749f639e 100644
--- a/lib/diagnostics.C
+++ b/lib/diagnostics.C
@@ -380,11 +380,13 @@ LONG CALLBACK boinc_catch_signal(EXCEPTION_POINTERS *pExPtrs) {
         }
     }
 
+#if !defined(__MINGW32__) && !defined(__CYGWIN__)
     // Kickstart the debugger extensions
  	DebuggerInitialize( boinc_dir, symstore );
 
     // Dump any useful information
     DebuggerDisplayDiagnostics();
+#endif
     
     switch ( exceptionCode ) {
         case EXCEPTION_ACCESS_VIOLATION:
diff --git a/lib/diagnostics.h b/lib/diagnostics.h
index d45751c9f5..189118923a 100644
--- a/lib/diagnostics.h
+++ b/lib/diagnostics.h
@@ -33,6 +33,8 @@
 
 #ifndef _WIN32
 #include <signal.h>
+#else 
+#include "boinc_win.h"
 #endif