diff --git a/fipstest.cpp b/fipstest.cpp
index 8c1f8294..de9ed725 100644
--- a/fipstest.cpp
+++ b/fipstest.cpp
@@ -1,6 +1,7 @@
 // fipstest.cpp - written and placed in the public domain by Wei Dai
 
 #include "pch.h"
+#include "misc.h"
 
 #ifndef CRYPTOPP_IMPORTS
 
@@ -16,10 +17,10 @@
 #define _CRT_DEBUGGER_HOOK _crt_debugger_hook
 #else
 #define _CRT_DEBUGGER_HOOK __crt_debugger_hook
-#endif
+#endif // _M_IX86
 extern "C" {_CRTIMP void __cdecl _CRT_DEBUGGER_HOOK(int);}
-#endif
-#endif
+#endif // _MSC_VER
+#endif // CRYPTOPP_WIN32_AVAILABLE
 
 #include <iostream>
 
diff --git a/nbtheory.cpp b/nbtheory.cpp
index 0334cf58..f4f53ac3 100644
--- a/nbtheory.cpp
+++ b/nbtheory.cpp
@@ -7,13 +7,17 @@
 #include "nbtheory.h"
 #include "modarith.h"
 #include "algparam.h"
+#include "misc.h"
 
 #include <math.h>
 #include <vector>
 
 #ifdef _OPENMP
-// needed in MSVC 2005 to generate correct manifest
-#include <omp.h>
+# include <omp.h>
+#endif
+
+#if GCC_DIAGNOSTIC_AWARE
+# pragma GCC diagnostic ignored "-Wunknown-pragmas"
 #endif
 
 NAMESPACE_BEGIN(CryptoPP)