diff --git a/src/main.cpp b/src/main.cpp
index 3f027ea..61880e5 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,7 +1,10 @@
-#include "tcp.hpp"
-#include <cstddef>
+// Library includes
 #include <spdlog/spdlog.h>
 
+// Project includes
+#include "tcp.hpp"
+
+
 int main() {
     spdlog::set_level(spdlog::level::debug);
 
diff --git a/src/tcp.cpp b/src/tcp.cpp
index df65e44..2960e1b 100644
--- a/src/tcp.cpp
+++ b/src/tcp.cpp
@@ -1,18 +1,12 @@
 #include "tcp.hpp"
 
+// C stdlib includes
 #include <arpa/inet.h>
-#include <cerrno>
-#include <cstdint>
-#include <expected>
 #include <fcntl.h>
 #include <netdb.h>
-#include <netinet/in.h>
-#include <netinet/tcp.h>
-#include <poll.h>
-#include <span>
+
+// Library includes
 #include <spdlog/spdlog.h>
-#include <sys/socket.h>
-#include <sys/types.h>
 
 
 namespace {
diff --git a/src/tcp.hpp b/src/tcp.hpp
index deb0c0e..647a572 100644
--- a/src/tcp.hpp
+++ b/src/tcp.hpp
@@ -1,24 +1,16 @@
 #pragma once
 
 
+// STL includes
 #include <array>
 #include <cerrno>
 #include <cstdint>
 #include <expected>
-#include <poll.h>
 #include <span>
-#include <spdlog/spdlog.h>
-#include <sys/socket.h>
 
 // C stdlib includes
-#include <arpa/inet.h>
-#include <expected>
-#include <fcntl.h>
-#include <netdb.h>
 #include <netinet/in.h>
-#include <netinet/tcp.h>
-#include <sys/socket.h>
-#include <sys/types.h>
+#include <sys/poll.h>
 
 
 namespace tcp {
diff --git a/tests/tcp.cpp b/tests/tcp.cpp
index e749dc2..f92d37a 100644
--- a/tests/tcp.cpp
+++ b/tests/tcp.cpp
@@ -1,7 +1,11 @@
-#include "tcp.hpp"
-
 #include <gtest/gtest.h>
 
+// STL includes
+#include <cstring>
+
+// Project includes
+#include "tcp.hpp"
+
 
 TEST(TcpServer, Accept) {
     tcp::NonBlockingServer server{{.port = 1234}};