diff --git a/Common++/src/GeneralUtils.cpp b/Common++/src/GeneralUtils.cpp
index 51c6c50c07..7e9bb6d452 100644
--- a/Common++/src/GeneralUtils.cpp
+++ b/Common++/src/GeneralUtils.cpp
@@ -4,8 +4,7 @@
 #include "Logger.h"
 #include <sstream>
 #include <iomanip>
-#include <string.h>
-#include <stdlib.h>
+#include <cstring>
 
 namespace pcpp
 {
diff --git a/Common++/src/IpAddress.cpp b/Common++/src/IpAddress.cpp
index 2c2f439361..dd1c1a3d5f 100644
--- a/Common++/src/IpAddress.cpp
+++ b/Common++/src/IpAddress.cpp
@@ -1,11 +1,8 @@
 #define LOG_MODULE CommonLogModuleIpUtils
 
 #include <algorithm>
-#include <cmath>
-#include <errno.h>
 #include <sstream>
 #include <stdexcept>
-#include <stdint.h>
 #include <bitset>
 #include "Logger.h"
 #include "IpUtils.h"
diff --git a/Common++/src/IpUtils.cpp b/Common++/src/IpUtils.cpp
index bd8d8d7ad5..3c812d5bfe 100644
--- a/Common++/src/IpUtils.cpp
+++ b/Common++/src/IpUtils.cpp
@@ -2,8 +2,7 @@
 
 #include "IpUtils.h"
 #include "Logger.h"
-#include <string.h>
-#include <stdio.h>
+#include <cstring>
 #include <stdexcept>
 #ifndef NS_INADDRSZ
 #	define NS_INADDRSZ 4
diff --git a/Common++/src/MacAddress.cpp b/Common++/src/MacAddress.cpp
index f9fcc9bcc1..47d990a017 100644
--- a/Common++/src/MacAddress.cpp
+++ b/Common++/src/MacAddress.cpp
@@ -1,5 +1,3 @@
-#include <stdio.h>
-
 #include "MacAddress.h"
 
 namespace pcpp
diff --git a/Common++/src/SystemUtils.cpp b/Common++/src/SystemUtils.cpp
index 702d8b801a..13f2d68caa 100644
--- a/Common++/src/SystemUtils.cpp
+++ b/Common++/src/SystemUtils.cpp
@@ -9,9 +9,8 @@
 #include <array>
 #include <iostream>
 #include <mutex>
-#include <signal.h>
-#include <stdio.h>
-#include <string.h>
+#include <cstring>
+#include <csignal>
 #include <sys/stat.h>
 #if defined(__APPLE__)
 #	include <mach/clock.h>
diff --git a/Common++/src/TablePrinter.cpp b/Common++/src/TablePrinter.cpp
index 8c424cd000..ac7745f18f 100644
--- a/Common++/src/TablePrinter.cpp
+++ b/Common++/src/TablePrinter.cpp
@@ -3,7 +3,6 @@
 #include <iomanip>
 #include <sstream>
 #include <iostream>
-#include <iterator>
 #include <numeric>
 #include <utility>
 #include "TablePrinter.h"
diff --git a/Examples/ArpSpoofing/main.cpp b/Examples/ArpSpoofing/main.cpp
index d25e1a6eb3..6f452a685d 100644
--- a/Examples/ArpSpoofing/main.cpp
+++ b/Examples/ArpSpoofing/main.cpp
@@ -1,8 +1,5 @@
-#include <stdio.h>
-#include <stdlib.h>
 #include <iostream>
 #include <fstream>
-#include <memory>
 #include <MacAddress.h>
 #include <IpAddress.h>
 #include <PcapPlusPlusVersion.h>
@@ -11,7 +8,6 @@
 #include <PcapLiveDevice.h>
 #include <EthLayer.h>
 #include <ArpLayer.h>
-#include <Logger.h>
 #include <getopt.h>
 
 #define EXIT_WITH_ERROR(reason)                                                                                        \
diff --git a/Examples/Arping/main.cpp b/Examples/Arping/main.cpp
index 919e3d42f0..a7871a0efe 100644
--- a/Examples/Arping/main.cpp
+++ b/Examples/Arping/main.cpp
@@ -5,7 +5,6 @@
  * response. Its basic input is the target IP address and the interface name/IP to send the ARP request from
  */
 
-#include <stdlib.h>
 #include <iostream>
 #include <MacAddress.h>
 #include <IpAddress.h>
diff --git a/Examples/DNSResolver/main.cpp b/Examples/DNSResolver/main.cpp
index f29f1e894d..b33792f946 100644
--- a/Examples/DNSResolver/main.cpp
+++ b/Examples/DNSResolver/main.cpp
@@ -1,4 +1,3 @@
-#include <stdlib.h>
 #include <iostream>
 #include "PcapPlusPlusVersion.h"
 #include "PcapLiveDevice.h"
diff --git a/Examples/DpdkBridge/Common.h b/Examples/DpdkBridge/Common.h
index e6e4db9abb..1cfdff2d04 100644
--- a/Examples/DpdkBridge/Common.h
+++ b/Examples/DpdkBridge/Common.h
@@ -11,7 +11,6 @@
 #include <iomanip>
 #include <iostream>
 #include <sstream>
-#include <stdlib.h>
 
 /**
  * Macros for exiting the application with error
diff --git a/Examples/DpdkBridge/main.cpp b/Examples/DpdkBridge/main.cpp
index ffebb0f48f..791db7ba24 100644
--- a/Examples/DpdkBridge/main.cpp
+++ b/Examples/DpdkBridge/main.cpp
@@ -24,18 +24,12 @@
 #include "AppWorkerThread.h"
 
 #include "DpdkDeviceList.h"
-#include "IPv4Layer.h"
-#include "TcpLayer.h"
-#include "UdpLayer.h"
 #include "SystemUtils.h"
 #include "PcapPlusPlusVersion.h"
 #include "TablePrinter.h"
 
 #include <vector>
 #include <iostream>
-#include <iomanip>
-#include <stdlib.h>
-#include <signal.h>
 #include <getopt.h>
 #include <string>
 #include <sstream>
diff --git a/Examples/DpdkExample-FilterTraffic/Common.h b/Examples/DpdkExample-FilterTraffic/Common.h
index 7f032de0c6..0ff1444131 100644
--- a/Examples/DpdkExample-FilterTraffic/Common.h
+++ b/Examples/DpdkExample-FilterTraffic/Common.h
@@ -11,7 +11,6 @@
 #include <iomanip>
 #include <iostream>
 #include <sstream>
-#include <stdlib.h>
 
 /**
  * Macros for exiting the application with error
diff --git a/Examples/DpdkExample-FilterTraffic/main.cpp b/Examples/DpdkExample-FilterTraffic/main.cpp
index fceda082b9..c48e865677 100644
--- a/Examples/DpdkExample-FilterTraffic/main.cpp
+++ b/Examples/DpdkExample-FilterTraffic/main.cpp
@@ -33,7 +33,6 @@
 
 #include <vector>
 #include <iostream>
-#include <stdlib.h>
 #include <getopt.h>
 #include <string>
 #include <sstream>
diff --git a/Examples/HttpAnalyzer/main.cpp b/Examples/HttpAnalyzer/main.cpp
index b1f6803177..1862720114 100644
--- a/Examples/HttpAnalyzer/main.cpp
+++ b/Examples/HttpAnalyzer/main.cpp
@@ -17,8 +17,6 @@
  * For more details about modes of operation and parameters run HttpAnalyzer -h
  */
 
-#include <stdlib.h>
-#include <string.h>
 #include <iomanip>
 #include <algorithm>
 #include "PcapLiveDeviceList.h"
diff --git a/Examples/IPDefragUtil/main.cpp b/Examples/IPDefragUtil/main.cpp
index 394e87ddaf..24930fe7ad 100644
--- a/Examples/IPDefragUtil/main.cpp
+++ b/Examples/IPDefragUtil/main.cpp
@@ -1,8 +1,7 @@
 #include <iostream>
 #include <unordered_map>
 #include <sstream>
-#include <stdlib.h>
-#include <string.h>
+#include <cstring>
 #include "PcapPlusPlusVersion.h"
 #include "IPv4Layer.h"
 #include "IPv6Layer.h"
diff --git a/Examples/IPFragUtil/main.cpp b/Examples/IPFragUtil/main.cpp
index c6151ecd1c..93b09bd0ad 100644
--- a/Examples/IPFragUtil/main.cpp
+++ b/Examples/IPFragUtil/main.cpp
@@ -1,9 +1,8 @@
 #include <iostream>
 #include <unordered_map>
 #include <sstream>
-#include <stdlib.h>
-#include <string.h>
-#include <math.h>
+#include <cstring>
+#include <cmath>
 #include "PcapPlusPlusVersion.h"
 #include "Packet.h"
 #include "IPv4Layer.h"
diff --git a/Examples/IcmpFileTransfer/Common.cpp b/Examples/IcmpFileTransfer/Common.cpp
index 80f080ce1d..b6cc0cd9bf 100644
--- a/Examples/IcmpFileTransfer/Common.cpp
+++ b/Examples/IcmpFileTransfer/Common.cpp
@@ -1,5 +1,4 @@
 #include "Common.h"
-#include <stdlib.h>
 #include <iostream>
 #include <vector>
 #include <getopt.h>
diff --git a/Examples/IcmpFileTransfer/IcmpFileTransfer-catcher.cpp b/Examples/IcmpFileTransfer/IcmpFileTransfer-catcher.cpp
index a1ecd4703d..470b666607 100644
--- a/Examples/IcmpFileTransfer/IcmpFileTransfer-catcher.cpp
+++ b/Examples/IcmpFileTransfer/IcmpFileTransfer-catcher.cpp
@@ -6,7 +6,6 @@
  * For more information please refer to README.md
  */
 
-#include <stdlib.h>
 #include <iostream>
 #include <fstream>
 #include "EthLayer.h"
diff --git a/Examples/IcmpFileTransfer/IcmpFileTransfer-pitcher.cpp b/Examples/IcmpFileTransfer/IcmpFileTransfer-pitcher.cpp
index 800e86d03b..e17382f498 100644
--- a/Examples/IcmpFileTransfer/IcmpFileTransfer-pitcher.cpp
+++ b/Examples/IcmpFileTransfer/IcmpFileTransfer-pitcher.cpp
@@ -6,7 +6,6 @@
  * For more information please refer to README.md
  */
 
-#include <stdlib.h>
 #include <stdexcept>
 #include <iostream>
 #include <fstream>
diff --git a/Examples/PcapPrinter/main.cpp b/Examples/PcapPrinter/main.cpp
index 76add37598..e1d9d7a8f5 100644
--- a/Examples/PcapPrinter/main.cpp
+++ b/Examples/PcapPrinter/main.cpp
@@ -10,7 +10,6 @@
  * For more details about modes of operation and parameters run PcapPrinter -h
  */
 
-#include <stdlib.h>
 #include <iostream>
 #include <fstream>
 #include <sstream>
diff --git a/Examples/PcapSearch/main.cpp b/Examples/PcapSearch/main.cpp
index 397725837a..f1af7e64d5 100644
--- a/Examples/PcapSearch/main.cpp
+++ b/Examples/PcapSearch/main.cpp
@@ -29,7 +29,6 @@
  * For more details about modes of operation and parameters please run PcapSearch -h
  */
 
-#include <stdlib.h>
 #include <iostream>
 #include <fstream>
 #include <sstream>
diff --git a/Examples/PcapSplitter/main.cpp b/Examples/PcapSplitter/main.cpp
index 9607191db9..c2209f603a 100644
--- a/Examples/PcapSplitter/main.cpp
+++ b/Examples/PcapSplitter/main.cpp
@@ -44,12 +44,8 @@
  *
  */
 
-#include <stdlib.h>
 #include <iostream>
-#include <fstream>
-#include <sstream>
 #include <string>
-#include <iomanip>
 #include <unordered_map>
 #include <RawPacket.h>
 #include <Packet.h>
diff --git a/Examples/PfRingExample-FilterTraffic/Common.h b/Examples/PfRingExample-FilterTraffic/Common.h
index 587c4916d7..0d00e14820 100644
--- a/Examples/PfRingExample-FilterTraffic/Common.h
+++ b/Examples/PfRingExample-FilterTraffic/Common.h
@@ -2,15 +2,7 @@
 
 #include <Packet.h>
 #include <PfRingDeviceList.h>
-
-#include <SystemUtils.h>
-
-#include <string>
-#include <vector>
-#include <iomanip>
-#include <iostream>
 #include <sstream>
-#include <stdlib.h>
 
 /**
  * Macros for exiting the application with error
diff --git a/Examples/PfRingExample-FilterTraffic/PacketMatchingEngine.h b/Examples/PfRingExample-FilterTraffic/PacketMatchingEngine.h
index 1a74629640..64d4b4661c 100644
--- a/Examples/PfRingExample-FilterTraffic/PacketMatchingEngine.h
+++ b/Examples/PfRingExample-FilterTraffic/PacketMatchingEngine.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include "SystemUtils.h"
 #include "Packet.h"
 #include "IPv4Layer.h"
 #include "TcpLayer.h"
diff --git a/Examples/PfRingExample-FilterTraffic/main.cpp b/Examples/PfRingExample-FilterTraffic/main.cpp
index 300ddd09c0..e6c6a38942 100644
--- a/Examples/PfRingExample-FilterTraffic/main.cpp
+++ b/Examples/PfRingExample-FilterTraffic/main.cpp
@@ -32,15 +32,11 @@
 
 #include "Common.h"
 #include "PacketMatchingEngine.h"
-#include <PfRingDeviceList.h>
 #include <PcapFileDevice.h>
 #include <PacketUtils.h>
-#include <SystemUtils.h>
 #include <PcapPlusPlusVersion.h>
 #include <TablePrinter.h>
 #include <Logger.h>
-#include <stdlib.h>
-#include <vector>
 #include <getopt.h>
 #include <unordered_map>
 #include <sstream>
diff --git a/Examples/SSLAnalyzer/main.cpp b/Examples/SSLAnalyzer/main.cpp
index bbc6941cbe..0ea01a9bcb 100644
--- a/Examples/SSLAnalyzer/main.cpp
+++ b/Examples/SSLAnalyzer/main.cpp
@@ -17,8 +17,6 @@
  * For more details about modes of operation and parameters run SSLAnalyzer -h
  */
 
-#include <stdlib.h>
-#include <string.h>
 #include <iostream>
 #include <iomanip>
 #include <algorithm>
diff --git a/Examples/TcpReassembly/main.cpp b/Examples/TcpReassembly/main.cpp
index 8a19f86e60..56546258c2 100644
--- a/Examples/TcpReassembly/main.cpp
+++ b/Examples/TcpReassembly/main.cpp
@@ -22,7 +22,6 @@
  * For more details about modes of operation and parameters run TcpReassembly -h
  */
 
-#include <stdlib.h>
 #include <unordered_map>
 #include <iostream>
 #include <fstream>
diff --git a/Examples/Tutorials/Tutorial-LiveTraffic/main.cpp b/Examples/Tutorials/Tutorial-LiveTraffic/main.cpp
index 38d0d433da..3f10863e99 100644
--- a/Examples/Tutorials/Tutorial-LiveTraffic/main.cpp
+++ b/Examples/Tutorials/Tutorial-LiveTraffic/main.cpp
@@ -1,6 +1,5 @@
 #include <iostream>
 #include <algorithm>
-#include "stdlib.h"
 #include "PcapLiveDeviceList.h"
 #include "SystemUtils.h"
 /**
diff --git a/Examples/Tutorials/Tutorial-PacketCraftAndEdit/main.cpp b/Examples/Tutorials/Tutorial-PacketCraftAndEdit/main.cpp
index bf02192c18..b3e9ee247c 100644
--- a/Examples/Tutorials/Tutorial-PacketCraftAndEdit/main.cpp
+++ b/Examples/Tutorials/Tutorial-PacketCraftAndEdit/main.cpp
@@ -1,6 +1,5 @@
 #include <iostream>
 #include <memory>
-#include "stdlib.h"
 #include "SystemUtils.h"
 #include "Packet.h"
 #include "EthLayer.h"
diff --git a/Examples/Tutorials/Tutorial-PacketParsing/main.cpp b/Examples/Tutorials/Tutorial-PacketParsing/main.cpp
index 0e437eb00b..edfbfe1f81 100644
--- a/Examples/Tutorials/Tutorial-PacketParsing/main.cpp
+++ b/Examples/Tutorials/Tutorial-PacketParsing/main.cpp
@@ -1,6 +1,5 @@
 #include <iostream>
 #include <memory>
-#include "stdlib.h"
 #include "SystemUtils.h"
 #include "Packet.h"
 #include "EthLayer.h"
diff --git a/Examples/Tutorials/Tutorial-PcapFiles/main.cpp b/Examples/Tutorials/Tutorial-PcapFiles/main.cpp
index 739265c4d8..54e6087793 100644
--- a/Examples/Tutorials/Tutorial-PcapFiles/main.cpp
+++ b/Examples/Tutorials/Tutorial-PcapFiles/main.cpp
@@ -1,6 +1,5 @@
 #include <memory>
 #include <iostream>
-#include "stdlib.h"
 #include "PcapFileDevice.h"
 
 /**
diff --git a/Packet++/src/ArpLayer.cpp b/Packet++/src/ArpLayer.cpp
index 0852d9bb0f..4971addd37 100644
--- a/Packet++/src/ArpLayer.cpp
+++ b/Packet++/src/ArpLayer.cpp
@@ -2,7 +2,6 @@
 
 #include "ArpLayer.h"
 #include "EthLayer.h"
-#include <string.h>
 #include "EndianPortable.h"
 
 namespace pcpp
diff --git a/Packet++/src/Asn1Codec.cpp b/Packet++/src/Asn1Codec.cpp
index 5990f70fd0..f048bb06b1 100644
--- a/Packet++/src/Asn1Codec.cpp
+++ b/Packet++/src/Asn1Codec.cpp
@@ -3,15 +3,14 @@
 #include "Asn1Codec.h"
 #include "GeneralUtils.h"
 #include "EndianPortable.h"
-#include "GeneralUtils.h"
 #include <unordered_map>
 #include <numeric>
 #include <algorithm>
 #include <iostream>
 #include <sstream>
-#include <cstring>
 #include <cmath>
 #include <limits>
+#include <cstring>
 
 #if defined(_WIN32)
 #	undef max
diff --git a/Packet++/src/BgpLayer.cpp b/Packet++/src/BgpLayer.cpp
index e8e48320d7..4e1269abcf 100644
--- a/Packet++/src/BgpLayer.cpp
+++ b/Packet++/src/BgpLayer.cpp
@@ -1,6 +1,5 @@
 #define LOG_MODULE PacketLogModuleBgpLayer
 
-#include <string.h>
 #include "Logger.h"
 #include "BgpLayer.h"
 #include "EndianPortable.h"
diff --git a/Packet++/src/CotpLayer.cpp b/Packet++/src/CotpLayer.cpp
index f3ea7975db..71a769d9a0 100644
--- a/Packet++/src/CotpLayer.cpp
+++ b/Packet++/src/CotpLayer.cpp
@@ -1,10 +1,6 @@
 #include "../header/CotpLayer.h"
-#include "EndianPortable.h"
 #include "S7CommLayer.h"
 #include <PayloadLayer.h>
-#include <cstring>
-#include <iostream>
-#include <sstream>
 
 namespace pcpp
 {
diff --git a/Packet++/src/DnsLayer.cpp b/Packet++/src/DnsLayer.cpp
index 6d7ae5ec76..bc6beeb5e9 100644
--- a/Packet++/src/DnsLayer.cpp
+++ b/Packet++/src/DnsLayer.cpp
@@ -2,11 +2,7 @@
 
 #include "DnsLayer.h"
 #include "Logger.h"
-#include "IpAddress.h"
 #include <sstream>
-#include <string.h>
-#include <iomanip>
-#include <stdlib.h>
 #include "EndianPortable.h"
 
 namespace pcpp
diff --git a/Packet++/src/DnsResource.cpp b/Packet++/src/DnsResource.cpp
index 488d207e99..aa102fa13e 100644
--- a/Packet++/src/DnsResource.cpp
+++ b/Packet++/src/DnsResource.cpp
@@ -3,7 +3,6 @@
 #include "DnsResource.h"
 #include "Logger.h"
 #include <sstream>
-#include <string.h>
 #include "EndianPortable.h"
 
 namespace pcpp
diff --git a/Packet++/src/DnsResourceData.cpp b/Packet++/src/DnsResourceData.cpp
index 7516a94a65..e735d447de 100644
--- a/Packet++/src/DnsResourceData.cpp
+++ b/Packet++/src/DnsResourceData.cpp
@@ -5,7 +5,6 @@
 #include "GeneralUtils.h"
 #include <sstream>
 #include <utility>
-#include <string.h>
 #include "EndianPortable.h"
 
 namespace pcpp
diff --git a/Packet++/src/EthLayer.cpp b/Packet++/src/EthLayer.cpp
index fe03e28ad0..c607076092 100644
--- a/Packet++/src/EthLayer.cpp
+++ b/Packet++/src/EthLayer.cpp
@@ -10,7 +10,6 @@
 #include "MplsLayer.h"
 #include "WakeOnLanLayer.h"
 #include "EndianPortable.h"
-#include <string.h>
 
 namespace pcpp
 {
diff --git a/Packet++/src/HttpLayer.cpp b/Packet++/src/HttpLayer.cpp
index 46a37531ad..ddb7a1181f 100644
--- a/Packet++/src/HttpLayer.cpp
+++ b/Packet++/src/HttpLayer.cpp
@@ -3,11 +3,9 @@
 #include "Logger.h"
 #include "GeneralUtils.h"
 #include "HttpLayer.h"
-#include <string.h>
+#include <cstring>
 #include <algorithm>
-#include <stdlib.h>
 #include <exception>
-#include <utility>
 #include <unordered_map>
 
 namespace pcpp
diff --git a/Packet++/src/IPReassembly.cpp b/Packet++/src/IPReassembly.cpp
index 470bdbf42b..6151d45ef7 100644
--- a/Packet++/src/IPReassembly.cpp
+++ b/Packet++/src/IPReassembly.cpp
@@ -5,7 +5,6 @@
 #include "IPv6Layer.h"
 #include "PacketUtils.h"
 #include "Logger.h"
-#include <string.h>
 #include "EndianPortable.h"
 
 namespace pcpp
diff --git a/Packet++/src/IPv4Layer.cpp b/Packet++/src/IPv4Layer.cpp
index 7f09c5db5c..db31ac47d2 100644
--- a/Packet++/src/IPv4Layer.cpp
+++ b/Packet++/src/IPv4Layer.cpp
@@ -11,7 +11,6 @@
 #include "IPSecLayer.h"
 #include "VrrpLayer.h"
 #include "PacketUtils.h"
-#include <string.h>
 #include <sstream>
 #include "Logger.h"
 #include "EndianPortable.h"
diff --git a/Packet++/src/IPv6Extensions.cpp b/Packet++/src/IPv6Extensions.cpp
index 3a1bc08bb9..7eb18db985 100644
--- a/Packet++/src/IPv6Extensions.cpp
+++ b/Packet++/src/IPv6Extensions.cpp
@@ -1,15 +1,11 @@
 #define LOG_MODULE PacketLogModuleIPv6ExtensionLayer
 
-#include <sstream>
 #include "EndianPortable.h"
-#include "Logger.h"
 #include "IPv6Extensions.h"
 #include "IPv6Layer.h"
 #include "IPv4Layer.h"
-#include "PayloadLayer.h"
 #include "UdpLayer.h"
 #include "TcpLayer.h"
-#include "GreLayer.h"
 
 namespace pcpp
 {
diff --git a/Packet++/src/IPv6Layer.cpp b/Packet++/src/IPv6Layer.cpp
index f09e68816b..e4daff0a5f 100644
--- a/Packet++/src/IPv6Layer.cpp
+++ b/Packet++/src/IPv6Layer.cpp
@@ -11,7 +11,6 @@
 #include "IcmpV6Layer.h"
 #include "VrrpLayer.h"
 #include "Packet.h"
-#include <string.h>
 #include "EndianPortable.h"
 
 namespace pcpp
diff --git a/Packet++/src/IcmpLayer.cpp b/Packet++/src/IcmpLayer.cpp
index 77370d112a..a69f4a3769 100644
--- a/Packet++/src/IcmpLayer.cpp
+++ b/Packet++/src/IcmpLayer.cpp
@@ -6,7 +6,6 @@
 #include "PacketUtils.h"
 #include "Logger.h"
 #include <sstream>
-#include <string.h>
 #include "EndianPortable.h"
 
 namespace pcpp
diff --git a/Packet++/src/IcmpV6Layer.cpp b/Packet++/src/IcmpV6Layer.cpp
index e118d1295f..247eee2cca 100644
--- a/Packet++/src/IcmpV6Layer.cpp
+++ b/Packet++/src/IcmpV6Layer.cpp
@@ -7,7 +7,6 @@
 #include "NdpLayer.h"
 #include "PacketUtils.h"
 #include "PayloadLayer.h"
-#include <memory>
 #include <sstream>
 
 // IcmpV6Layer
diff --git a/Packet++/src/IgmpLayer.cpp b/Packet++/src/IgmpLayer.cpp
index 6f95416b5b..fd23c97072 100644
--- a/Packet++/src/IgmpLayer.cpp
+++ b/Packet++/src/IgmpLayer.cpp
@@ -3,7 +3,6 @@
 #include "IgmpLayer.h"
 #include "PacketUtils.h"
 #include "Logger.h"
-#include <string.h>
 #include "EndianPortable.h"
 
 namespace pcpp
diff --git a/Packet++/src/LLCLayer.cpp b/Packet++/src/LLCLayer.cpp
index f0a71c0703..fe5c3c2fe5 100644
--- a/Packet++/src/LLCLayer.cpp
+++ b/Packet++/src/LLCLayer.cpp
@@ -3,7 +3,6 @@
 #include "LLCLayer.h"
 #include "PayloadLayer.h"
 #include "StpLayer.h"
-#include <iostream>
 
 namespace pcpp
 {
diff --git a/Packet++/src/Layer.cpp b/Packet++/src/Layer.cpp
index f51a271eb2..ce1b0d6afa 100644
--- a/Packet++/src/Layer.cpp
+++ b/Packet++/src/Layer.cpp
@@ -1,9 +1,9 @@
 #define LOG_MODULE PacketLogModuleLayer
 
 #include "Layer.h"
-#include <string.h>
 #include "Logger.h"
 #include "Packet.h"
+#include <cstring>
 
 namespace pcpp
 {
diff --git a/Packet++/src/MplsLayer.cpp b/Packet++/src/MplsLayer.cpp
index 184222dc91..fe57a68529 100644
--- a/Packet++/src/MplsLayer.cpp
+++ b/Packet++/src/MplsLayer.cpp
@@ -5,7 +5,6 @@
 #include "IPv6Layer.h"
 #include "PayloadLayer.h"
 #include "Logger.h"
-#include <string.h>
 #include <sstream>
 #include "EndianPortable.h"
 
diff --git a/Packet++/src/NflogLayer.cpp b/Packet++/src/NflogLayer.cpp
index 305a56a3d1..2533a8d660 100644
--- a/Packet++/src/NflogLayer.cpp
+++ b/Packet++/src/NflogLayer.cpp
@@ -7,8 +7,6 @@
 #include "GeneralUtils.h"
 #include "EndianPortable.h"
 
-#include <string.h>
-
 namespace pcpp
 {
 /** IPv4 protocol */
diff --git a/Packet++/src/NtpLayer.cpp b/Packet++/src/NtpLayer.cpp
index 6fc1220ee7..b7031be775 100644
--- a/Packet++/src/NtpLayer.cpp
+++ b/Packet++/src/NtpLayer.cpp
@@ -4,9 +4,7 @@
 #include "NtpLayer.h"
 #include "SystemUtils.h"
 #include "GeneralUtils.h"
-
-#include <math.h>
-#include <stdlib.h>
+#include <cmath>
 
 /// 2^16 as a double
 #define NTP_FRIC 65536.
diff --git a/Packet++/src/NullLoopbackLayer.cpp b/Packet++/src/NullLoopbackLayer.cpp
index 7f67472cce..fa9f4951ba 100644
--- a/Packet++/src/NullLoopbackLayer.cpp
+++ b/Packet++/src/NullLoopbackLayer.cpp
@@ -3,7 +3,6 @@
 #include "IPv4Layer.h"
 #include "IPv6Layer.h"
 #include "PayloadLayer.h"
-#include <string.h>
 
 namespace pcpp
 {
diff --git a/Packet++/src/Packet.cpp b/Packet++/src/Packet.cpp
index 7a7cc82c49..d8104aee99 100644
--- a/Packet++/src/Packet.cpp
+++ b/Packet++/src/Packet.cpp
@@ -12,10 +12,7 @@
 #include "PayloadLayer.h"
 #include "PacketTrailerLayer.h"
 #include "Logger.h"
-#include "EndianPortable.h"
-#include <string.h>
 #include <numeric>
-#include <typeinfo>
 #include <sstream>
 #ifdef _MSC_VER
 #	include <time.h>
diff --git a/Packet++/src/PacketTrailerLayer.cpp b/Packet++/src/PacketTrailerLayer.cpp
index f05f381361..f937680de1 100644
--- a/Packet++/src/PacketTrailerLayer.cpp
+++ b/Packet++/src/PacketTrailerLayer.cpp
@@ -1,6 +1,5 @@
 #include "PacketTrailerLayer.h"
 #include "GeneralUtils.h"
-#include <string.h>
 #include <sstream>
 
 namespace pcpp
diff --git a/Packet++/src/PayloadLayer.cpp b/Packet++/src/PayloadLayer.cpp
index b85177ca85..e94a4b4bd9 100644
--- a/Packet++/src/PayloadLayer.cpp
+++ b/Packet++/src/PayloadLayer.cpp
@@ -2,8 +2,8 @@
 
 #include "PayloadLayer.h"
 #include "GeneralUtils.h"
-#include <string.h>
 #include <sstream>
+#include <cstring>
 
 namespace pcpp
 {
diff --git a/Packet++/src/RadiusLayer.cpp b/Packet++/src/RadiusLayer.cpp
index d5ad43ec36..72a8a656f6 100644
--- a/Packet++/src/RadiusLayer.cpp
+++ b/Packet++/src/RadiusLayer.cpp
@@ -2,8 +2,6 @@
 #include "RadiusLayer.h"
 #include "Logger.h"
 #include "GeneralUtils.h"
-
-#include <string.h>
 #include <sstream>
 #include "EndianPortable.h"
 
diff --git a/Packet++/src/RawPacket.cpp b/Packet++/src/RawPacket.cpp
index 4ae29bea8a..a68385bb94 100644
--- a/Packet++/src/RawPacket.cpp
+++ b/Packet++/src/RawPacket.cpp
@@ -1,9 +1,9 @@
 #define LOG_MODULE PacketLogModuleRawPacket
 
 #include "RawPacket.h"
-#include <string.h>
 #include "Logger.h"
 #include "TimespecTimeval.h"
+#include <cstring>
 
 namespace pcpp
 {
diff --git a/Packet++/src/S7CommLayer.cpp b/Packet++/src/S7CommLayer.cpp
index 40af5c0b29..33358d23bb 100644
--- a/Packet++/src/S7CommLayer.cpp
+++ b/Packet++/src/S7CommLayer.cpp
@@ -1,10 +1,7 @@
 #include "EndianPortable.h"
 
 #include "S7CommLayer.h"
-#include "TcpLayer.h"
 #include <iostream>
-
-#include <cstring>
 #include <sstream>
 
 namespace pcpp
diff --git a/Packet++/src/SSHLayer.cpp b/Packet++/src/SSHLayer.cpp
index 2023bc11a5..468f91b6c1 100644
--- a/Packet++/src/SSHLayer.cpp
+++ b/Packet++/src/SSHLayer.cpp
@@ -4,7 +4,7 @@
 #include "GeneralUtils.h"
 #include "Logger.h"
 #include "EndianPortable.h"
-#include <string.h>
+#include <cstring>
 
 namespace pcpp
 {
diff --git a/Packet++/src/SSLHandshake.cpp b/Packet++/src/SSLHandshake.cpp
index 847f27a06b..0517c60b35 100644
--- a/Packet++/src/SSLHandshake.cpp
+++ b/Packet++/src/SSLHandshake.cpp
@@ -2,11 +2,11 @@
 
 #include "EndianPortable.h"
 #include "md5.h"
-#include <string.h>
 #include <sstream>
 #include <unordered_map>
 #include <set>
 #include <utility>
+#include <cstring>
 #include "Logger.h"
 #include "SSLHandshake.h"
 
diff --git a/Packet++/src/SSLLayer.cpp b/Packet++/src/SSLLayer.cpp
index 3025bdd582..e83b789c07 100644
--- a/Packet++/src/SSLLayer.cpp
+++ b/Packet++/src/SSLLayer.cpp
@@ -1,6 +1,5 @@
 #define LOG_MODULE PacketLogModuleSSLLayer
 
-#include "Logger.h"
 #include "SSLLayer.h"
 #include "EndianPortable.h"
 #include <sstream>
diff --git a/Packet++/src/SdpLayer.cpp b/Packet++/src/SdpLayer.cpp
index 375eb7371b..5fa2fd0e94 100644
--- a/Packet++/src/SdpLayer.cpp
+++ b/Packet++/src/SdpLayer.cpp
@@ -2,8 +2,6 @@
 
 #include "SdpLayer.h"
 #include "Logger.h"
-#include <stdlib.h>
-#include <string>
 #include <sstream>
 
 namespace pcpp
diff --git a/Packet++/src/SingleCommandTextProtocol.cpp b/Packet++/src/SingleCommandTextProtocol.cpp
index f24407f56d..04b0841b7b 100644
--- a/Packet++/src/SingleCommandTextProtocol.cpp
+++ b/Packet++/src/SingleCommandTextProtocol.cpp
@@ -1,7 +1,5 @@
 #include "SingleCommandTextProtocol.h"
-#include "Logger.h"
-
-#include <string.h>
+#include <cstring>
 #include <algorithm>
 #include <vector>
 
diff --git a/Packet++/src/SipLayer.cpp b/Packet++/src/SipLayer.cpp
index 6cfa8256c9..5872c7b1bb 100644
--- a/Packet++/src/SipLayer.cpp
+++ b/Packet++/src/SipLayer.cpp
@@ -5,9 +5,7 @@
 #include "PayloadLayer.h"
 #include "Logger.h"
 #include "GeneralUtils.h"
-#include <string.h>
 #include <algorithm>
-#include <stdlib.h>
 #include <exception>
 #include <utility>
 #include <unordered_map>
diff --git a/Packet++/src/Sll2Layer.cpp b/Packet++/src/Sll2Layer.cpp
index 99638b46bb..8bcbd3cedd 100644
--- a/Packet++/src/Sll2Layer.cpp
+++ b/Packet++/src/Sll2Layer.cpp
@@ -9,7 +9,6 @@
 #include "VlanLayer.h"
 #include "PPPoELayer.h"
 #include "MplsLayer.h"
-#include <string.h>
 #include "EndianPortable.h"
 
 namespace pcpp
diff --git a/Packet++/src/SllLayer.cpp b/Packet++/src/SllLayer.cpp
index 405990cc99..1f5b9daa84 100644
--- a/Packet++/src/SllLayer.cpp
+++ b/Packet++/src/SllLayer.cpp
@@ -9,7 +9,6 @@
 #include "VlanLayer.h"
 #include "PPPoELayer.h"
 #include "MplsLayer.h"
-#include <string.h>
 #include "EndianPortable.h"
 
 namespace pcpp
diff --git a/Packet++/src/SomeIpLayer.cpp b/Packet++/src/SomeIpLayer.cpp
index 9c351d0675..8149043e18 100644
--- a/Packet++/src/SomeIpLayer.cpp
+++ b/Packet++/src/SomeIpLayer.cpp
@@ -7,7 +7,6 @@
 #include "EndianPortable.h"
 #include <algorithm>
 #include <sstream>
-#include <string.h>
 
 namespace pcpp
 {
diff --git a/Packet++/src/SomeIpSdLayer.cpp b/Packet++/src/SomeIpSdLayer.cpp
index 2538959944..d7f2c9de76 100644
--- a/Packet++/src/SomeIpSdLayer.cpp
+++ b/Packet++/src/SomeIpSdLayer.cpp
@@ -3,7 +3,6 @@
 #include "SomeIpSdLayer.h"
 #include "EndianPortable.h"
 #include <algorithm>
-#include <cstring>
 #include <sstream>
 #include <stdexcept>
 
diff --git a/Packet++/src/TcpLayer.cpp b/Packet++/src/TcpLayer.cpp
index c6963d2259..d146efd589 100644
--- a/Packet++/src/TcpLayer.cpp
+++ b/Packet++/src/TcpLayer.cpp
@@ -20,7 +20,6 @@
 #include "PacketUtils.h"
 #include "Logger.h"
 #include "DeprecationUtils.h"
-#include <string.h>
 #include <sstream>
 
 namespace pcpp
diff --git a/Packet++/src/TelnetLayer.cpp b/Packet++/src/TelnetLayer.cpp
index b8ee8cbbd4..3f3dec8e22 100644
--- a/Packet++/src/TelnetLayer.cpp
+++ b/Packet++/src/TelnetLayer.cpp
@@ -2,11 +2,8 @@
 
 #include "TelnetLayer.h"
 #include "Logger.h"
-
 #include "GeneralUtils.h"
-#include "SystemUtils.h"
-
-#include <string.h>
+#include <cstring>
 
 namespace pcpp
 {
diff --git a/Packet++/src/TextBasedProtocol.cpp b/Packet++/src/TextBasedProtocol.cpp
index 6c01010813..a5688c160c 100644
--- a/Packet++/src/TextBasedProtocol.cpp
+++ b/Packet++/src/TextBasedProtocol.cpp
@@ -1,10 +1,9 @@
 #include "TextBasedProtocol.h"
 #include "Logger.h"
 #include "PayloadLayer.h"
-#include <string.h>
+#include <cstring>
 #include <algorithm>
 #include <utility>
-#include <stdlib.h>
 
 namespace pcpp
 {
diff --git a/Packet++/src/TpktLayer.cpp b/Packet++/src/TpktLayer.cpp
index 941402c20d..2d003cd5e7 100644
--- a/Packet++/src/TpktLayer.cpp
+++ b/Packet++/src/TpktLayer.cpp
@@ -1,11 +1,8 @@
 #include "TpktLayer.h"
 #include "EndianPortable.h"
-#include "TcpLayer.h"
 #include "CotpLayer.h"
 #include "PayloadLayer.h"
-#include <iostream>
 #include <sstream>
-#include <string.h>
 
 namespace pcpp
 {
diff --git a/Packet++/src/UdpLayer.cpp b/Packet++/src/UdpLayer.cpp
index 274695b856..6261a54426 100644
--- a/Packet++/src/UdpLayer.cpp
+++ b/Packet++/src/UdpLayer.cpp
@@ -18,7 +18,6 @@
 #include "WireGuardLayer.h"
 #include "PacketUtils.h"
 #include "Logger.h"
-#include <string.h>
 #include <sstream>
 
 namespace pcpp
diff --git a/Packet++/src/VlanLayer.cpp b/Packet++/src/VlanLayer.cpp
index fe72a1263e..f12ca798ae 100644
--- a/Packet++/src/VlanLayer.cpp
+++ b/Packet++/src/VlanLayer.cpp
@@ -8,7 +8,6 @@
 #include "PPPoELayer.h"
 #include "MplsLayer.h"
 #include "LLCLayer.h"
-#include <string.h>
 #include <sstream>
 #include "EndianPortable.h"
 
diff --git a/Packet++/src/VxlanLayer.cpp b/Packet++/src/VxlanLayer.cpp
index 1ec5c806eb..ec1acc1657 100644
--- a/Packet++/src/VxlanLayer.cpp
+++ b/Packet++/src/VxlanLayer.cpp
@@ -1,6 +1,5 @@
 #include "VxlanLayer.h"
 #include "EthLayer.h"
-#include <string.h>
 #include "EndianPortable.h"
 
 namespace pcpp
diff --git a/Packet++/src/WireGuardLayer.cpp b/Packet++/src/WireGuardLayer.cpp
index 316c605c51..a00bbf6b99 100644
--- a/Packet++/src/WireGuardLayer.cpp
+++ b/Packet++/src/WireGuardLayer.cpp
@@ -4,7 +4,6 @@
 #include "WireGuardLayer.h"
 #include "EndianPortable.h"
 #include <iomanip>
-#include <cstring>
 
 namespace pcpp
 {
diff --git a/Pcap++/header/PfRingDeviceList.h b/Pcap++/header/PfRingDeviceList.h
index e0011cf897..f38928ad1a 100644
--- a/Pcap++/header/PfRingDeviceList.h
+++ b/Pcap++/header/PfRingDeviceList.h
@@ -2,7 +2,6 @@
 
 // GCOVR_EXCL_START
 
-#include <memory>
 #include "PfRingDevice.h"
 
 /// @file
diff --git a/Pcap++/src/DpdkDevice.cpp b/Pcap++/src/DpdkDevice.cpp
index 28f37caa0b..bb4b025733 100644
--- a/Pcap++/src/DpdkDevice.cpp
+++ b/Pcap++/src/DpdkDevice.cpp
@@ -19,7 +19,6 @@
 #include "rte_malloc.h"
 #include "rte_cycles.h"
 #include <string>
-#include <stdint.h>
 #include <unistd.h>
 
 #define MAX_BURST_SIZE 64
diff --git a/Pcap++/src/NetworkUtils.cpp b/Pcap++/src/NetworkUtils.cpp
index 06e26f5315..6e595adfc8 100644
--- a/Pcap++/src/NetworkUtils.cpp
+++ b/Pcap++/src/NetworkUtils.cpp
@@ -1,9 +1,7 @@
 #define LOG_MODULE NetworkUtils
 
 #include <condition_variable>
-#include <errno.h>
 #include <mutex>
-#include <stdlib.h>
 #include "Logger.h"
 #include "Packet.h"
 #include "EthLayer.h"
diff --git a/Pcap++/src/PcapDevice.cpp b/Pcap++/src/PcapDevice.cpp
index 9cef275c07..f546be634c 100644
--- a/Pcap++/src/PcapDevice.cpp
+++ b/Pcap++/src/PcapDevice.cpp
@@ -1,7 +1,6 @@
 #include "PcapDevice.h"
 #include "PcapFilter.h"
 #include "Logger.h"
-#include "TimespecTimeval.h"
 #include "pcap.h"
 
 namespace pcpp
diff --git a/Pcap++/src/PcapFileDevice.cpp b/Pcap++/src/PcapFileDevice.cpp
index 3aa00fff67..c1560da05b 100644
--- a/Pcap++/src/PcapFileDevice.cpp
+++ b/Pcap++/src/PcapFileDevice.cpp
@@ -1,13 +1,11 @@
 #define LOG_MODULE PcapLogModuleFileDevice
 
-#include <stdio.h>
 #include <cerrno>
 #include "PcapFileDevice.h"
 #include "light_pcapng_ext.h"
 #include "Logger.h"
 #include "TimespecTimeval.h"
 #include "pcap.h"
-#include <string.h>
 #include <fstream>
 #include "EndianPortable.h"
 
diff --git a/Pcap++/src/PcapLiveDeviceList.cpp b/Pcap++/src/PcapLiveDeviceList.cpp
index e65cd23d2f..14cf09e570 100644
--- a/Pcap++/src/PcapLiveDeviceList.cpp
+++ b/Pcap++/src/PcapLiveDeviceList.cpp
@@ -9,7 +9,6 @@
 #include "SystemUtils.h"
 #include "pcap.h"
 #include <array>
-#include <string.h>
 #include <sstream>
 #include <algorithm>
 #if defined(_WIN32)
diff --git a/Pcap++/src/RawSocketDevice.cpp b/Pcap++/src/RawSocketDevice.cpp
index 00174272c8..816d10b76c 100644
--- a/Pcap++/src/RawSocketDevice.cpp
+++ b/Pcap++/src/RawSocketDevice.cpp
@@ -10,7 +10,6 @@
 #	include <ifaddrs.h>
 #	include <net/if.h>
 #endif
-#include <string.h>
 #include "Logger.h"
 #include "IpUtils.h"
 #include "SystemUtils.h"
diff --git a/Tests/Packet++Test/Utils/TestUtils.h b/Tests/Packet++Test/Utils/TestUtils.h
index 6599d7690b..7a452e2616 100644
--- a/Tests/Packet++Test/Utils/TestUtils.h
+++ b/Tests/Packet++Test/Utils/TestUtils.h
@@ -5,8 +5,8 @@
 #include "Packet.h"
 #endif
 // clang-format on
-#include <stdint.h>
-#include <stdlib.h>
+#include <cstdint>
+#include <cstdlib>
 
 namespace pcpp_tests
 {
diff --git a/Tests/Packet++Test/main.cpp b/Tests/Packet++Test/main.cpp
index 0e14158065..e74498bd94 100644
--- a/Tests/Packet++Test/main.cpp
+++ b/Tests/Packet++Test/main.cpp
@@ -1,5 +1,3 @@
-#include <stdio.h>
-#include <stdlib.h>
 #include <getopt.h>
 #include "PcapPlusPlusVersion.h"
 #include "PcppTestFrameworkRun.h"
diff --git a/Tests/Pcap++Test/Common/TestUtils.cpp b/Tests/Pcap++Test/Common/TestUtils.cpp
index c55d736ef8..c31dd43577 100644
--- a/Tests/Pcap++Test/Common/TestUtils.cpp
+++ b/Tests/Pcap++Test/Common/TestUtils.cpp
@@ -1,5 +1,4 @@
 #include "TestUtils.h"
-#include <stdlib.h>
 #include <fstream>
 #include "GlobalTestArgs.h"
 #include "PcapFileDevice.h"
diff --git a/Tests/Pcap++Test/Tests/DpdkTests.cpp b/Tests/Pcap++Test/Tests/DpdkTests.cpp
index 3da94d97f8..b71226c3a2 100644
--- a/Tests/Pcap++Test/Tests/DpdkTests.cpp
+++ b/Tests/Pcap++Test/Tests/DpdkTests.cpp
@@ -2,8 +2,6 @@
 #include "../Common/GlobalTestArgs.h"
 #include "../Common/TestUtils.h"
 #include "../Common/PcapFileNamesDef.h"
-#include <unordered_map>
-#include <stdlib.h>
 #include <sstream>
 
 #ifdef USE_DPDK
diff --git a/Tests/Pcap++Test/Tests/PacketParsingTests.cpp b/Tests/Pcap++Test/Tests/PacketParsingTests.cpp
index a930fbdd84..a22fbb9437 100644
--- a/Tests/Pcap++Test/Tests/PacketParsingTests.cpp
+++ b/Tests/Pcap++Test/Tests/PacketParsingTests.cpp
@@ -2,7 +2,6 @@
 #include "../Common/PcapFileNamesDef.h"
 #include <sstream>
 #include <fstream>
-#include <stdlib.h>
 #include "Packet.h"
 #include "HttpLayer.h"
 #include "DnsLayer.h"
diff --git a/Tests/Pcap++Test/Tests/PfRingTests.cpp b/Tests/Pcap++Test/Tests/PfRingTests.cpp
index b97ad500b4..a8adf6787a 100644
--- a/Tests/Pcap++Test/Tests/PfRingTests.cpp
+++ b/Tests/Pcap++Test/Tests/PfRingTests.cpp
@@ -2,7 +2,6 @@
 #include "../Common/GlobalTestArgs.h"
 #include "../Common/TestUtils.h"
 #include "../Common/PcapFileNamesDef.h"
-#include <sstream>
 
 #ifdef USE_PF_RING
 #	include "Logger.h"
diff --git a/Tests/Pcap++Test/main.cpp b/Tests/Pcap++Test/main.cpp
index 86b5244d09..d721db187c 100644
--- a/Tests/Pcap++Test/main.cpp
+++ b/Tests/Pcap++Test/main.cpp
@@ -1,5 +1,3 @@
-#include <stdio.h>
-#include <stdlib.h>
 #include "PcapPlusPlusVersion.h"
 #include "Logger.h"
 #include "PcppTestFrameworkRun.h"