diff --git a/CMakeLists.txt b/CMakeLists.txt
index 74a67fd..8b3e1d4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -51,7 +51,7 @@ if(BUILD_TESTS)
 endif()
 
 # Clang format all files
-file(GLOB_RECURSE ALL_SOURCE_FILES src/*.cpp include/**/*.hpp examples/*.cpp tests/*.cpp)
+file(GLOB_RECURSE ALL_SOURCE_FILES src/*.cpp include/**/*.hpp examples/*.cpp tests/*.cpp src/*.cxx)
 add_custom_target(
         clangformat-fix
         COMMAND clang-format
diff --git a/examples/client_example.cxx b/examples/client_example.cxx
index 38baa65..44a1eda 100644
--- a/examples/client_example.cxx
+++ b/examples/client_example.cxx
@@ -3,8 +3,10 @@
 #include <iostream>
 #include <thread>
 #include <vector>
+// clang-format off
 #include <exception> // Missing include inside asio
 #include <asio.hpp>
+// clang-format on
 
 import modbus;
 
diff --git a/examples/server_example.cxx b/examples/server_example.cxx
index b7bb66e..3e1a76b 100644
--- a/examples/server_example.cxx
+++ b/examples/server_example.cxx
@@ -1,8 +1,10 @@
 // Copyright (c) 2023, Skaginn3x (https://skaginn3x.com)
 
+// clang-format off
 #include <exception>
 #include <asio.hpp>
 #include <iostream>
+// clang-format on
 
 import modbus;
 
diff --git a/src/client.cxx b/src/client.cxx
index 531e3ae..7635ac1 100644
--- a/src/client.cxx
+++ b/src/client.cxx
@@ -1,9 +1,11 @@
 // Copyright (c) 2023, Skaginn3x (https://Skaginn3x.com)
 module;
 
+// clang-format off
 #include <expected>
 #include <exception>
 #include <asio.hpp>
+// clang-format on
 
 export module modbus:client;
 import :packet;
diff --git a/src/deserialize.cxx b/src/deserialize.cxx
index 411a754..f4d96bd 100644
--- a/src/deserialize.cxx
+++ b/src/deserialize.cxx
@@ -1,9 +1,11 @@
 module;
 #include <system_error>
+// clang-format off
 #include <expected>
 #include <exception>
 #include <asio.hpp>
 #include <span>
+// clang-format on
 export module modbus:deserialize;
 import :function;
 import :error;
diff --git a/src/serialize.cxx b/src/serialize.cxx
index a156baa..3768ce2 100644
--- a/src/serialize.cxx
+++ b/src/serialize.cxx
@@ -1,9 +1,11 @@
 // Copyright (c) 2023, Skaginn3x (https://skaginn3x.com)
 module;
+// clang-format off
 #include <utility>
 #include <cstdint>
 #include <exception>
 #include <asio.hpp> // This include is only here for cross platform htons and ntohs
+// clang-format on
 export module modbus:serialize;
 import :function;
 
diff --git a/src/server.cxx b/src/server.cxx
index a91eb45..71f19f9 100644
--- a/src/server.cxx
+++ b/src/server.cxx
@@ -5,8 +5,10 @@ module;
 #include <ranges>
 #include <string>
 
+// clang-format off
 #include <exception>
 #include <asio.hpp>
+// clang-format on
 #include <asio/experimental/awaitable_operators.hpp>
 export module modbus:server;
 import :tcp;
diff --git a/src/tcp.cxx b/src/tcp.cxx
index 25934d1..0112a66 100644
--- a/src/tcp.cxx
+++ b/src/tcp.cxx
@@ -1,9 +1,11 @@
 module;
+// clang-format off
 #include <exception>
 #include <asio.hpp>
 #include <cstdint>
 #include <span>
 #include <utility>
+// clang-format on
 
 export module modbus:tcp;
 
diff --git a/tests/deserialization.cxx b/tests/deserialization.cxx
index ff1fb29..37c78de 100644
--- a/tests/deserialization.cxx
+++ b/tests/deserialization.cxx
@@ -1,9 +1,11 @@
+// clang-format off
 #include <exception>
 #include <array>
 #include <iostream>
 #include <span>
 #include <boost/ut.hpp>
 #include <expected>
+// clang-format on
 
 import modbus;
 
diff --git a/tests/integration.cxx b/tests/integration.cxx
index 8b7d601..ce1bfcb 100644
--- a/tests/integration.cxx
+++ b/tests/integration.cxx
@@ -1,8 +1,9 @@
-
+// clang-format off
 #include <exception>
 #include <asio.hpp>
 #include <array>
 #include <boost/ut.hpp>
+// clang-format on
 
 import modbus;