diff --git a/src/client/configurationmanager.cpp b/src/client/configurationmanager.cpp
index 2a07e6ba34ffd1e2344677d81c7953933ae19a64..9ad425f2511a1cd13ed7ebfc4bbfb69025c9d9f2 100644
--- a/src/client/configurationmanager.cpp
+++ b/src/client/configurationmanager.cpp
@@ -42,8 +42,8 @@
 #include "client/ring_signal.h"
 #include "upnp/upnp_context.h"
 
-#ifdef WIN32_NATIVE
-#include "windirent.h"
+#ifdef WIN32_NATIVE
+#include "windirent.h"
 #else
 #include <dirent.h>
 #endif
diff --git a/src/security/tls_session.cpp b/src/security/tls_session.cpp
index 75976f0bf9dae24d3e3b3714c4261ab527a17638..b754217f463f97163921efe218ee06c745a2e16f 100644
--- a/src/security/tls_session.cpp
+++ b/src/security/tls_session.cpp
@@ -388,7 +388,7 @@ TlsSession::getCurrentCipherSuiteId(std::array<uint8_t, 2>& cs_id) const
         const char* const suite = gnutls_cipher_suite_info(i, cs_id.data(), &kx, &cipher, &mac,
                                                            nullptr);
         if (!suite)
-          break;
+            break;
         if (cipher == s_cipher && kx == s_kx && mac == s_mac)
             return suite;
     }
diff --git a/src/security/tls_session.h b/src/security/tls_session.h
index b895690f3a0cf1c166723c05095aa08ae9f18409..4be2233336a8d53d853e49576a81f1ed6c07277b 100644
--- a/src/security/tls_session.h
+++ b/src/security/tls_session.h
@@ -46,8 +46,8 @@ class IceSocket;
 } // namespace ring
 
 namespace dht { namespace crypto {
-class Certificate;
-class PrivateKey;
+struct Certificate;
+struct PrivateKey;
 }} // namespace dht::crypto
 
 namespace ring { namespace tls {
@@ -65,6 +65,10 @@ public:
     DhParams() = default;
     DhParams(DhParams&&) = default;
 
+    DhParams& operator =(const DhParams&){
+        return *this;
+    }
+
     /** Take ownership of gnutls_dh_params */
     explicit DhParams(gnutls_dh_params_t p) : params_(p, gnutls_dh_params_deinit) {};
 
diff --git a/src/security/tlsvalidator.cpp b/src/security/tlsvalidator.cpp
index 3175c544a8508cf0ec08ffde0edcf35ff58b7e4a..0ba65ad341556e0f4eba810bb2d52823c4ab63d6 100644
--- a/src/security/tlsvalidator.cpp
+++ b/src/security/tlsvalidator.cpp
@@ -60,6 +60,10 @@
 #include <unistd.h>
 #include <fcntl.h>
 
+#ifdef WIN32_NATIVE
+#include "windirent.h"
+#endif
+
 namespace ring { namespace tls {
 
 //Map the internal ring Enum class of the exported names