diff --git a/CMakeLists.txt b/CMakeLists.txt
index a9e9f1f4..711a78e4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,7 @@
 cmake_minimum_required (VERSION 3.1)
 include(CMakePackageConfigHelpers)
 include(CMakeDependentOption)
+include(FindPkgConfig)
 
 project (opendht)
 set (opendht_VERSION_MAJOR 2)
@@ -125,11 +126,7 @@ set (CMAKE_CXX_STANDARD 14)
 set (CMAKE_CXX_STANDARD_REQUIRED on)
 
 if (NOT MSVC)
-    set(CXX_WARNINGS -Wno-return-type -Wall -Wextra
-                     -Wnon-virtual-dtor
-                     -pedantic-errors
-                     -fvisibility=hidden)
-    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CXX_WARNINGS}")
+    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-return-type -Wall -Wextra -Wnon-virtual-dtor -pedantic-errors -fvisibility=hidden")
     if (OPENDHT_SANITIZE)
         set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address -fstack-protector-strong")
     endif ()
diff --git a/src/compat/os_cert.cpp b/src/compat/os_cert.cpp
index 10999749..349f5164 100644
--- a/src/compat/os_cert.cpp
+++ b/src/compat/os_cert.cpp
@@ -24,17 +24,17 @@
 #include <windows.h>
 #include <wincrypt.h>
 #pragma comment(lib, "crypt32.lib")
+#endif
 #include <openssl/ssl.h>
-#undef X509_NAME
-#undef OCSP_REQUEST
-#undef OCSP_RESPONSE
-#endif /*WIN32*/
 
 #ifdef __APPLE__
 #include <Security/Security.h>
 #endif /*__APPLE__*/
 
 #ifdef _WIN32
+#undef X509_NAME
+#undef OCSP_REQUEST
+#undef OCSP_RESPONSE
 #define GENTIME_LENGTH 15
 #define UTCTIME_LENGTH 13
 #define ATOI2(ar)      ((ar) += 2, ((ar)[-2] - '0') * 10 + ((ar)[-1] - '0'))
diff --git a/src/http.cpp b/src/http.cpp
index 0cb50a77..04b811bd 100644
--- a/src/http.cpp
+++ b/src/http.cpp
@@ -30,8 +30,7 @@
 #include <openssl/ocsp.h>
 #include <openssl/ssl.h>
 #include <openssl/asn1.h>
-
-#include <crypto/x509.h>
+#include <openssl/x509.h>
 
 #define MAXAGE_SEC (14*24*60*60)
 #define JITTER_SEC (60)