diff --git a/ixwebsocket/IXHttpClient.h b/ixwebsocket/IXHttpClient.h
index efbbac5a..7c6177a7 100644
--- a/ixwebsocket/IXHttpClient.h
+++ b/ixwebsocket/IXHttpClient.h
@@ -8,8 +8,8 @@
 
 #include "IXHttp.h"
 #include "IXSocket.h"
-#include "IXWebSocketHttpHeaders.h"
 #include "IXSocketTLSOptions.h"
+#include "IXWebSocketHttpHeaders.h"
 #include <algorithm>
 #include <atomic>
 #include <condition_variable>
diff --git a/ixwebsocket/IXSocketOpenSSL.cpp b/ixwebsocket/IXSocketOpenSSL.cpp
index db55081c..17a5c642 100644
--- a/ixwebsocket/IXSocketOpenSSL.cpp
+++ b/ixwebsocket/IXSocketOpenSSL.cpp
@@ -245,8 +245,7 @@ namespace ix
         ERR_clear_error();
         if (_tlsOptions.hasCertAndKey())
         {
-            if (SSL_CTX_use_certificate_chain_file(_ssl_context,
-                                                   _tlsOptions.certFile.c_str()) != 1)
+            if (SSL_CTX_use_certificate_chain_file(_ssl_context, _tlsOptions.certFile.c_str()) != 1)
             {
                 auto sslErr = ERR_get_error();
                 errMsg = "OpenSSL failed - SSL_CTX_use_certificate_chain_file(\"" +
@@ -257,8 +256,8 @@ namespace ix
                          _ssl_context, _tlsOptions.keyFile.c_str(), SSL_FILETYPE_PEM) != 1)
             {
                 auto sslErr = ERR_get_error();
-                errMsg = "OpenSSL failed - SSL_CTX_use_PrivateKey_file(\"" +
-                         _tlsOptions.keyFile + "\") failed: ";
+                errMsg = "OpenSSL failed - SSL_CTX_use_PrivateKey_file(\"" + _tlsOptions.keyFile +
+                         "\") failed: ";
                 errMsg += ERR_error_string(sslErr, nullptr);
             }
             else if (!SSL_CTX_check_private_key(_ssl_context))
@@ -287,8 +286,8 @@ namespace ix
                          _ssl_context, _tlsOptions.caFile.c_str(), NULL) != 1)
             {
                 auto sslErr = ERR_get_error();
-                errMsg = "OpenSSL failed - SSL_CTX_load_verify_locations(\"" +
-                         _tlsOptions.caFile + "\") failed: ";
+                errMsg = "OpenSSL failed - SSL_CTX_load_verify_locations(\"" + _tlsOptions.caFile +
+                         "\") failed: ";
                 errMsg += ERR_error_string(sslErr, nullptr);
                 return false;
             }
@@ -308,8 +307,8 @@ namespace ix
             if (SSL_CTX_set_cipher_list(_ssl_context, kDefaultCiphers.c_str()) != 1)
             {
                 auto sslErr = ERR_get_error();
-                errMsg = "OpenSSL failed - SSL_CTX_set_cipher_list(\"" +
-                         kDefaultCiphers + "\") failed: ";
+                errMsg = "OpenSSL failed - SSL_CTX_set_cipher_list(\"" + kDefaultCiphers +
+                         "\") failed: ";
                 errMsg += ERR_error_string(sslErr, nullptr);
                 return false;
             }
@@ -317,8 +316,8 @@ namespace ix
         else if (SSL_CTX_set_cipher_list(_ssl_context, _tlsOptions.ciphers.c_str()) != 1)
         {
             auto sslErr = ERR_get_error();
-            errMsg = "OpenSSL failed - SSL_CTX_set_cipher_list(\"" +
-                     _tlsOptions.ciphers + "\") failed: ";
+            errMsg = "OpenSSL failed - SSL_CTX_set_cipher_list(\"" + _tlsOptions.ciphers +
+                     "\") failed: ";
             errMsg += ERR_error_string(sslErr, nullptr);
             return false;
         }
diff --git a/ws/ws_http_client.cpp b/ws/ws_http_client.cpp
index 3f1403ed..33161d14 100644
--- a/ws/ws_http_client.cpp
+++ b/ws/ws_http_client.cpp
@@ -7,8 +7,8 @@
 #include <fstream>
 #include <iostream>
 #include <ixwebsocket/IXHttpClient.h>
-#include <ixwebsocket/IXWebSocketHttpHeaders.h>
 #include <ixwebsocket/IXSocketTLSOptions.h>
+#include <ixwebsocket/IXWebSocketHttpHeaders.h>
 #include <sstream>
 
 namespace ix
diff --git a/ws/ws_httpd.cpp b/ws/ws_httpd.cpp
index 7be7f3df..f588ea4f 100644
--- a/ws/ws_httpd.cpp
+++ b/ws/ws_httpd.cpp
@@ -13,11 +13,11 @@
 
 namespace ix
 {
-    int ws_httpd_main(int port, 
-	                  const std::string& hostname,
-					  bool redirect,
-                      const std::string& redirectUrl, 
-					  const ix::SocketTLSOptions& tlsOptions)
+    int ws_httpd_main(int port,
+                      const std::string& hostname,
+                      bool redirect,
+                      const std::string& redirectUrl,
+                      const ix::SocketTLSOptions& tlsOptions)
     {
         spdlog::info("Listening on {}:{}", hostname, port);