diff --git a/ixwebsocket/IXHttp.cpp b/ixwebsocket/IXHttp.cpp
index 9db7c023..0f858ac2 100644
--- a/ixwebsocket/IXHttp.cpp
+++ b/ixwebsocket/IXHttp.cpp
@@ -92,7 +92,8 @@ namespace ix
         return std::make_tuple(method, requestUri, httpVersion);
     }
 
-    std::tuple<bool, std::string, HttpRequestPtr> Http::parseRequest(std::unique_ptr<Socket>& socket)
+    std::tuple<bool, std::string, HttpRequestPtr> Http::parseRequest(
+        std::unique_ptr<Socket>& socket)
     {
         HttpRequestPtr httpRequest;
 
diff --git a/ixwebsocket/IXSocketConnect.cpp b/ixwebsocket/IXSocketConnect.cpp
index 39a302be..fea01897 100644
--- a/ixwebsocket/IXSocketConnect.cpp
+++ b/ixwebsocket/IXSocketConnect.cpp
@@ -8,8 +8,8 @@
 
 #include "IXDNSLookup.h"
 #include "IXNetSystem.h"
-#include "IXSocket.h"
 #include "IXSelectInterrupt.h"
+#include "IXSocket.h"
 #include <fcntl.h>
 #include <string.h>
 #include <sys/types.h>
diff --git a/ixwebsocket/IXSocketServer.cpp b/ixwebsocket/IXSocketServer.cpp
index ff6faa0e..f1d34e43 100644
--- a/ixwebsocket/IXSocketServer.cpp
+++ b/ixwebsocket/IXSocketServer.cpp
@@ -7,11 +7,11 @@
 #include "IXSocketServer.h"
 
 #include "IXNetSystem.h"
+#include "IXSelectInterrupt.h"
 #include "IXSetThreadName.h"
 #include "IXSocket.h"
 #include "IXSocketConnect.h"
 #include "IXSocketFactory.h"
-#include "IXSelectInterrupt.h"
 #include <assert.h>
 #include <sstream>
 #include <stdio.h>
@@ -259,7 +259,8 @@ namespace ix
             int timeoutMs = 10;
             bool readyToRead = true;
             auto selectInterrupt = std::make_unique<SelectInterrupt>();
-            PollResultType pollResult = Socket::poll(readyToRead, timeoutMs, _serverFd, selectInterrupt);
+            PollResultType pollResult =
+                Socket::poll(readyToRead, timeoutMs, _serverFd, selectInterrupt);
 
             if (pollResult == PollResultType::Error)
             {
@@ -340,7 +341,8 @@ namespace ix
             std::lock_guard<std::mutex> lock(_connectionsThreadsMutex);
             _connectionsThreads.push_back(std::make_pair(
                 connectionState,
-                std::thread(&SocketServer::handleConnection, this, std::move(socket), connectionState)));
+                std::thread(
+                    &SocketServer::handleConnection, this, std::move(socket), connectionState)));
         }
     }
 
diff --git a/ws/IXBench.cpp b/ws/IXBench.cpp
index 2e56f402..a0c63c45 100644
--- a/ws/IXBench.cpp
+++ b/ws/IXBench.cpp
@@ -41,4 +41,4 @@ namespace ix
     {
         return _ms;
     }
-}
+} // namespace ix
diff --git a/ws/IXBench.h b/ws/IXBench.h
index 0f601a20..e21afac5 100644
--- a/ws/IXBench.h
+++ b/ws/IXBench.h
@@ -4,9 +4,9 @@
  *  Copyright (c) 2017-2020 Machine Zone, Inc. All rights reserved.
  */
 
-#include <string>
 #include <chrono>
 #include <stdint.h>
+#include <string>
 
 namespace ix
 {
@@ -25,4 +25,4 @@ namespace ix
         uint64_t _ms;
         bool _reported;
     };
-}
+} // namespace ix
diff --git a/ws/ws_connect.cpp b/ws/ws_connect.cpp
index c80b772a..dff53907 100644
--- a/ws/ws_connect.cpp
+++ b/ws/ws_connect.cpp
@@ -5,11 +5,10 @@
  */
 
 #include "IXBench.h"
+#include "linenoise.hpp"
 #include <ixwebsocket/IXSocket.h>
 #include <ixwebsocket/IXSocketTLSOptions.h>
 #include <ixwebsocket/IXWebSocket.h>
-
-#include "linenoise.hpp"
 #include <spdlog/spdlog.h>
 #include <sstream>
 
diff --git a/ws/ws_send.cpp b/ws/ws_send.cpp
index 097f8243..25bb3ab2 100644
--- a/ws/ws_send.cpp
+++ b/ws/ws_send.cpp
@@ -5,7 +5,9 @@
  */
 
 #include "IXBench.h"
-
+#include <chrono>
+#include <condition_variable>
+#include <fstream>
 #include <ixcrypto/IXBase64.h>
 #include <ixcrypto/IXHash.h>
 #include <ixcrypto/IXUuid.h>
@@ -13,10 +15,6 @@
 #include <ixwebsocket/IXSocketTLSOptions.h>
 #include <ixwebsocket/IXWebSocket.h>
 #include <msgpack11/msgpack11.hpp>
-
-#include <chrono>
-#include <condition_variable>
-#include <fstream>
 #include <mutex>
 #include <spdlog/spdlog.h>
 #include <sstream>