diff --git a/Tests/Packet++Test/Utils/TestUtils.cpp b/Tests/Packet++Test/Utils/TestUtils.cpp
index 2a00a4adb9..ed30c46c0b 100644
--- a/Tests/Packet++Test/Utils/TestUtils.cpp
+++ b/Tests/Packet++Test/Utils/TestUtils.cpp
@@ -1,11 +1,10 @@
 #include "TestUtils.h"
 #include "SomeIpLayer.h"
-#include <fstream>
-#include <iomanip>
 #include <iostream>
+#include <iomanip>
 #include <string.h>
 #include <string>
-
+#include <fstream>
 namespace pcpp_tests
 {
 
diff --git a/Tests/Packet++Test/main.cpp b/Tests/Packet++Test/main.cpp
index c840ad9736..d235f69f41 100644
--- a/Tests/Packet++Test/main.cpp
+++ b/Tests/Packet++Test/main.cpp
@@ -80,9 +80,10 @@ int main(int argc, char* argv[])
 
 #ifdef NDEBUG
 	skipMemLeakCheck = true;
-	std::cout << "Disabling memory leak check in MSVC Release builds due to caching logic in stream objects that looks like a memory leak:"
-	          << std::endl
-	          << "     https://github.com/cpputest/cpputest/issues/786#issuecomment-148921958" << std::endl;
+	std::cout
+	    << "Disabling memory leak check in MSVC Release builds due to caching logic in stream objects that looks like a memory leak:"
+	    << std::endl
+	    << "     https://github.com/cpputest/cpputest/issues/786#issuecomment-148921958" << std::endl;
 #endif
 
 	// The logger singleton looks like a memory leak. Invoke it before starting the memory check
diff --git a/Tests/Pcap++Test/Tests/DpdkTests.cpp b/Tests/Pcap++Test/Tests/DpdkTests.cpp
index 7ba5db643e..3da94d97f8 100644
--- a/Tests/Pcap++Test/Tests/DpdkTests.cpp
+++ b/Tests/Pcap++Test/Tests/DpdkTests.cpp
@@ -1,21 +1,21 @@
+#include "../TestDefinition.h"
 #include "../Common/GlobalTestArgs.h"
-#include "../Common/PcapFileNamesDef.h"
 #include "../Common/TestUtils.h"
-#include "../TestDefinition.h"
-#include <sstream>
-#include <stdlib.h>
+#include "../Common/PcapFileNamesDef.h"
 #include <unordered_map>
+#include <stdlib.h>
+#include <sstream>
 
 #ifdef USE_DPDK
-#	include "DnsLayer.h"
-#	include "DpdkDeviceList.h"
-#	include "IPv4Layer.h"
+#	include <mutex>
 #	include "Logger.h"
 #	include "PacketUtils.h"
-#	include "PcapFileDevice.h"
+#	include "IPv4Layer.h"
 #	include "TcpLayer.h"
 #	include "UdpLayer.h"
-#	include <mutex>
+#	include "DnsLayer.h"
+#	include "DpdkDeviceList.h"
+#	include "PcapFileDevice.h"
 #endif
 
 extern PcapTestArgs PcapTestGlobalArgs;
diff --git a/Tests/Pcap++Test/Tests/FileTests.cpp b/Tests/Pcap++Test/Tests/FileTests.cpp
index 4ba38cafe2..4b8b567e1f 100644
--- a/Tests/Pcap++Test/Tests/FileTests.cpp
+++ b/Tests/Pcap++Test/Tests/FileTests.cpp
@@ -1,8 +1,8 @@
-#include "../Common/PcapFileNamesDef.h"
 #include "../TestDefinition.h"
 #include "Logger.h"
 #include "Packet.h"
 #include "PcapFileDevice.h"
+#include "../Common/PcapFileNamesDef.h"
 #include <array>
 #include <fstream>
 
diff --git a/Tests/Pcap++Test/Tests/FilterTests.cpp b/Tests/Pcap++Test/Tests/FilterTests.cpp
index 0ae3d36369..13f656fbb0 100644
--- a/Tests/Pcap++Test/Tests/FilterTests.cpp
+++ b/Tests/Pcap++Test/Tests/FilterTests.cpp
@@ -1,17 +1,17 @@
-#include "../Common/GlobalTestArgs.h"
-#include "../Common/PcapFileNamesDef.h"
-#include "../Common/TestUtils.h"
 #include "../TestDefinition.h"
 #include "EndianPortable.h"
+#include "SystemUtils.h"
 #include "EthLayer.h"
+#include "VlanLayer.h"
 #include "IPv4Layer.h"
 #include "IPv6Layer.h"
-#include "PcapFileDevice.h"
-#include "PcapLiveDeviceList.h"
-#include "SystemUtils.h"
 #include "TcpLayer.h"
 #include "UdpLayer.h"
-#include "VlanLayer.h"
+#include "PcapLiveDeviceList.h"
+#include "PcapFileDevice.h"
+#include "../Common/GlobalTestArgs.h"
+#include "../Common/PcapFileNamesDef.h"
+#include "../Common/TestUtils.h"
 
 extern PcapTestArgs PcapTestGlobalArgs;
 
diff --git a/Tests/Pcap++Test/Tests/IPFragmentationTests.cpp b/Tests/Pcap++Test/Tests/IPFragmentationTests.cpp
index 4270e36cca..fcacbb6888 100644
--- a/Tests/Pcap++Test/Tests/IPFragmentationTests.cpp
+++ b/Tests/Pcap++Test/Tests/IPFragmentationTests.cpp
@@ -1,10 +1,10 @@
-#include "../Common/TestUtils.h"
 #include "../TestDefinition.h"
-#include "EndianPortable.h"
-#include "HttpLayer.h"
+#include "../Common/TestUtils.h"
 #include "IPReassembly.h"
 #include "IPv6Layer.h"
+#include "HttpLayer.h"
 #include "PcapFileDevice.h"
+#include "EndianPortable.h"
 
 static void ipReassemblyOnFragmentsClean(const pcpp::IPReassembly::PacketKey* key, void* userCookie)
 {
diff --git a/Tests/Pcap++Test/Tests/IpMacTests.cpp b/Tests/Pcap++Test/Tests/IpMacTests.cpp
index b71b90cfb8..9446fec85e 100644
--- a/Tests/Pcap++Test/Tests/IpMacTests.cpp
+++ b/Tests/Pcap++Test/Tests/IpMacTests.cpp
@@ -1,21 +1,21 @@
-#include "../Common/GlobalTestArgs.h"
-#include "../Common/TestUtils.h"
 #include "../TestDefinition.h"
+#include "../Common/TestUtils.h"
+#include "../Common/GlobalTestArgs.h"
+#include <sstream>
+#include <algorithm>
+#include <cmath>
+#include <tuple>
 #include "EndianPortable.h"
+#include "Logger.h"
 #include "GeneralUtils.h"
+#include "IpUtils.h"
 #include "IpAddress.h"
 #include "IpAddressUtils.h"
-#include "IpUtils.h"
-#include "LRUList.h"
-#include "Logger.h"
 #include "MacAddress.h"
+#include "LRUList.h"
 #include "NetworkUtils.h"
 #include "PcapLiveDeviceList.h"
 #include "SystemUtils.h"
-#include <algorithm>
-#include <cmath>
-#include <sstream>
-#include <tuple>
 
 extern PcapTestArgs PcapTestGlobalArgs;
 
diff --git a/Tests/Pcap++Test/Tests/KniTests.cpp b/Tests/Pcap++Test/Tests/KniTests.cpp
index 9bd884e011..92aee6499d 100644
--- a/Tests/Pcap++Test/Tests/KniTests.cpp
+++ b/Tests/Pcap++Test/Tests/KniTests.cpp
@@ -1,6 +1,6 @@
+#include "../TestDefinition.h"
 #include "../Common/GlobalTestArgs.h"
 #include "../Common/PcapFileNamesDef.h"
-#include "../TestDefinition.h"
 
 #ifdef USE_DPDK_KNI
 #	include "KniDeviceList.h"
diff --git a/Tests/Pcap++Test/Tests/LiveDeviceTests.cpp b/Tests/Pcap++Test/Tests/LiveDeviceTests.cpp
index 2dc1ab53df..6cabae8912 100644
--- a/Tests/Pcap++Test/Tests/LiveDeviceTests.cpp
+++ b/Tests/Pcap++Test/Tests/LiveDeviceTests.cpp
@@ -1,15 +1,15 @@
-#include "../Common/GlobalTestArgs.h"
-#include "../Common/PcapFileNamesDef.h"
-#include "../Common/TestUtils.h"
 #include "../TestDefinition.h"
-#include "EthLayer.h"
-#include "IPv4Layer.h"
 #include "Logger.h"
-#include "PayloadLayer.h"
-#include "PcapFileDevice.h"
-#include "PcapLiveDeviceList.h"
 #include "SystemUtils.h"
+#include "PcapLiveDeviceList.h"
+#include "PcapFileDevice.h"
+#include "EthLayer.h"
+#include "IPv4Layer.h"
 #include "UdpLayer.h"
+#include "PayloadLayer.h"
+#include "../Common/GlobalTestArgs.h"
+#include "../Common/TestUtils.h"
+#include "../Common/PcapFileNamesDef.h"
 #include <array>
 #include <cstdio>
 #if defined(_WIN32)
diff --git a/Tests/Pcap++Test/Tests/LoggerTests.cpp b/Tests/Pcap++Test/Tests/LoggerTests.cpp
index 00f06d332a..f007a7010f 100644
--- a/Tests/Pcap++Test/Tests/LoggerTests.cpp
+++ b/Tests/Pcap++Test/Tests/LoggerTests.cpp
@@ -1,12 +1,11 @@
 #define LOG_MODULE PacketLogModuleArpLayer
 #include "../TestDefinition.h"
+#include "Logger.h"
+#include <string>
 #include <algorithm>
 #include <cctype>
-#include <random>
-#include <string>
 #include <thread>
-
-#include "Logger.h"
+#include <random>
 #include "SystemUtils.h"
 
 namespace pcpp
diff --git a/Tests/Pcap++Test/Tests/PacketParsingTests.cpp b/Tests/Pcap++Test/Tests/PacketParsingTests.cpp
index 118156109e..a930fbdd84 100644
--- a/Tests/Pcap++Test/Tests/PacketParsingTests.cpp
+++ b/Tests/Pcap++Test/Tests/PacketParsingTests.cpp
@@ -1,12 +1,12 @@
-#include "../Common/PcapFileNamesDef.h"
 #include "../TestDefinition.h"
-#include "DnsLayer.h"
-#include "HttpLayer.h"
-#include "Packet.h"
-#include "PcapFileDevice.h"
-#include <fstream>
+#include "../Common/PcapFileNamesDef.h"
 #include <sstream>
+#include <fstream>
 #include <stdlib.h>
+#include "Packet.h"
+#include "HttpLayer.h"
+#include "DnsLayer.h"
+#include "PcapFileDevice.h"
 
 PTF_TEST_CASE(TestHttpRequestParsing)
 {
diff --git a/Tests/Pcap++Test/Tests/PfRingTests.cpp b/Tests/Pcap++Test/Tests/PfRingTests.cpp
index ab6667056c..b97ad500b4 100644
--- a/Tests/Pcap++Test/Tests/PfRingTests.cpp
+++ b/Tests/Pcap++Test/Tests/PfRingTests.cpp
@@ -1,16 +1,16 @@
+#include "../TestDefinition.h"
 #include "../Common/GlobalTestArgs.h"
-#include "../Common/PcapFileNamesDef.h"
 #include "../Common/TestUtils.h"
-#include "../TestDefinition.h"
+#include "../Common/PcapFileNamesDef.h"
 #include <sstream>
 
 #ifdef USE_PF_RING
-#	include "IPv4Layer.h"
 #	include "Logger.h"
 #	include "PacketUtils.h"
+#	include "IPv4Layer.h"
+#	include "PfRingDeviceList.h"
 #	include "PcapFileDevice.h"
 #	include "PcapLiveDeviceList.h"
-#	include "PfRingDeviceList.h"
 #endif
 
 extern PcapTestArgs PcapTestGlobalArgs;
diff --git a/Tests/Pcap++Test/Tests/RawSocketTests.cpp b/Tests/Pcap++Test/Tests/RawSocketTests.cpp
index f6350ec9e3..34b8c24f57 100644
--- a/Tests/Pcap++Test/Tests/RawSocketTests.cpp
+++ b/Tests/Pcap++Test/Tests/RawSocketTests.cpp
@@ -1,10 +1,10 @@
-#include "../Common/GlobalTestArgs.h"
-#include "../Common/PcapFileNamesDef.h"
 #include "../TestDefinition.h"
+#include "../Common/PcapFileNamesDef.h"
+#include "../Common/GlobalTestArgs.h"
 #include "Logger.h"
 #include "Packet.h"
-#include "PcapFileDevice.h"
 #include "RawSocketDevice.h"
+#include "PcapFileDevice.h"
 
 extern PcapTestArgs PcapTestGlobalArgs;
 
diff --git a/Tests/Pcap++Test/Tests/XdpTests.cpp b/Tests/Pcap++Test/Tests/XdpTests.cpp
index f2eb93ceff..13676c3873 100644
--- a/Tests/Pcap++Test/Tests/XdpTests.cpp
+++ b/Tests/Pcap++Test/Tests/XdpTests.cpp
@@ -1,10 +1,10 @@
-#include "../Common/GlobalTestArgs.h"
 #include "../TestDefinition.h"
-#include "Logger.h"
-#include "Packet.h"
-#include "PcapFileDevice.h"
+#include "../Common/GlobalTestArgs.h"
 #include "PcapLiveDeviceList.h"
 #include "XdpDevice.h"
+#include "PcapFileDevice.h"
+#include "Packet.h"
+#include "Logger.h"
 
 extern PcapTestArgs PcapTestGlobalArgs;