diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
index dab2408dd1..f98a77dc5d 100644
--- a/.github/workflows/build_and_test.yml
+++ b/.github/workflows/build_and_test.yml
@@ -681,13 +681,11 @@ jobs:
         run: |
           TOYVPN_PCAPPLUSPLUS="./ToyVpn-PcapPlusPlus/app/libs/pcapplusplus"
           PCAPPLUSPLUS_LIBS_PATH="$TOYVPN_PCAPPLUSPLUS/${{ matrix.target }}/${{ matrix.api-version }}"
-          PCAPPLUSPLUS_INCLUDE_PATH="$TOYVPN_PCAPPLUSPLUS/include"
           cmake -DPCAPPP_BUILD_COVERAGE=OFF -S . -B "$BUILD_DIR"
           cmake --build "$BUILD_DIR" -j
-          cmake --install "$BUILD_DIR" --prefix ${TOYVPN_PCAPPLUSPLUS}
-          mkdir -p ${PCAPPLUSPLUS_LIBS_PATH} ${PCAPPLUSPLUS_INCLUDE_PATH}
-          mv ${TOYVPN_PCAPPLUSPLUS}/lib/*.a ${PCAPPLUSPLUS_LIBS_PATH}/
-          mv ${TOYVPN_PCAPPLUSPLUS}/include/pcapplusplus/*.h ${PCAPPLUSPLUS_INCLUDE_PATH}/
+          cmake --install "$BUILD_DIR" --prefix "${TOYVPN_PCAPPLUSPLUS}"
+          mkdir -p "${PCAPPLUSPLUS_LIBS_PATH}"
+          mv ${TOYVPN_PCAPPLUSPLUS}/lib/*.a "${PCAPPLUSPLUS_LIBS_PATH}/"
 
       - name: Set up JDK
         uses: actions/setup-java@v4
diff --git a/3rdParty/Getopt-for-Visual-Studio/getopt.h b/3rdParty/Getopt-for-Visual-Studio/getopt.h
index e0607894b2..7100be8415 100644
--- a/3rdParty/Getopt-for-Visual-Studio/getopt.h
+++ b/3rdParty/Getopt-for-Visual-Studio/getopt.h
@@ -68,6 +68,8 @@
 #include <string.h>
 #include <stdarg.h>
 #include <stdio.h>
+/* Enforce Windows.h to use winsock2 */
+#include <winsock2.h>
 #include <windows.h>
 
 #ifdef __cplusplus
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e76e9eb999..ceccdfd85b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -124,6 +124,21 @@ option(PCAPPP_BUILD_COVERAGE "Generate Coverage Report" OFF)
 option(PCAPPP_BUILD_FUZZERS "Build Fuzzers binaries" OFF)
 option(PCAPPP_BUILD_REPRODUCIBLE "Build a reproducible version" OFF)
 
+option(
+  PCAPPP_ENABLE_OLD_STYLE_INCLUDE
+  "Enables old style include paths that directly add pcapplusplus folder as an include root."
+  ON
+)
+if(PCAPPP_ENABLE_OLD_STYLE_INCLUDE)
+  message(
+    DEPRECATION
+    "PcapPlusPlus: Old style include directories are enabled, directly adding the <pcapplusplus> folder to the include directories."
+    "This functionality is deprecated and will be removed in the future."
+    "New include format should follow: \"#include <pcapplusplus/xxx.h>\" "
+    "This behaviour can be disabled by setting \"PCAPPP_ENABLE_OLD_STYLE_INCLUDE\" to OFF"
+  )
+endif()
+
 option(BUILD_SHARED_LIBS "Build using shared libraries" OFF)
 
 option(PCAPPP_USE_DPDK "Setup PcapPlusPlus with DPDK. In this case you must also set DPDK_ROOT")
diff --git a/Common++/CMakeLists.txt b/Common++/CMakeLists.txt
index 9b3cc61f65..966a85b341 100644
--- a/Common++/CMakeLists.txt
+++ b/Common++/CMakeLists.txt
@@ -14,31 +14,36 @@ add_library(
 
 set(
   public_headers
-  header/DeprecationUtils.h
-  header/GeneralUtils.h
-  header/IpAddress.h
-  header/IpAddressUtils.h
-  header/IpUtils.h
-  header/Logger.h
-  header/LRUList.h
-  header/MacAddress.h
-  header/ObjectPool.h
-  header/OUILookup.h
-  header/PcapPlusPlusVersion.h
-  header/PointerVector.h
-  header/SystemUtils.h
-  header/TablePrinter.h
-  header/TimespecTimeval.h
+  header/pcapplusplus/DeprecationUtils.h
+  header/pcapplusplus/GeneralUtils.h
+  header/pcapplusplus/IpAddress.h
+  header/pcapplusplus/IpAddressUtils.h
+  header/pcapplusplus/IpUtils.h
+  header/pcapplusplus/Logger.h
+  header/pcapplusplus/LRUList.h
+  header/pcapplusplus/MacAddress.h
+  header/pcapplusplus/ObjectPool.h
+  header/pcapplusplus/OUILookup.h
+  header/pcapplusplus/PcapPlusPlusVersion.h
+  header/pcapplusplus/PointerVector.h
+  header/pcapplusplus/SystemUtils.h
+  header/pcapplusplus/TablePrinter.h
+  header/pcapplusplus/TimespecTimeval.h
 )
 
 # Set the public header that will be installed
 set_property(TARGET Common++ PROPERTY PUBLIC_HEADER ${public_headers})
 
+set_target_properties(Common++ PROPERTIES PCAPPP_ENABLE_OLD_STYLE_INCLUDE "${PCAPPP_ENABLE_OLD_STYLE_INCLUDE}")
+
 target_compile_features(Common++ PUBLIC cxx_std_11)
 
 target_include_directories(
   Common++
-  PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/header> $<INSTALL_INTERFACE:include/pcapplusplus>
+  PUBLIC
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/header>
+    $<INSTALL_INTERFACE:include>
+    $<$<BOOL:$<TARGET_PROPERTY:Common++,PCAPPP_ENABLE_OLD_STYLE_INCLUDE>>:$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/header/pcapplusplus>$<INSTALL_INTERFACE:include/pcapplusplus>>
   # Don't link with EndianPortable and json as it won't be exported
   PRIVATE $<TARGET_PROPERTY:EndianPortable,INTERFACE_INCLUDE_DIRECTORIES>
   PRIVATE $<TARGET_PROPERTY:json,INTERFACE_INCLUDE_DIRECTORIES>
diff --git a/Common++/header/DeprecationUtils.h b/Common++/header/pcapplusplus/DeprecationUtils.h
similarity index 100%
rename from Common++/header/DeprecationUtils.h
rename to Common++/header/pcapplusplus/DeprecationUtils.h
diff --git a/Common++/header/GeneralUtils.h b/Common++/header/pcapplusplus/GeneralUtils.h
similarity index 100%
rename from Common++/header/GeneralUtils.h
rename to Common++/header/pcapplusplus/GeneralUtils.h
diff --git a/Common++/header/IpAddress.h b/Common++/header/pcapplusplus/IpAddress.h
similarity index 100%
rename from Common++/header/IpAddress.h
rename to Common++/header/pcapplusplus/IpAddress.h
diff --git a/Common++/header/IpAddressUtils.h b/Common++/header/pcapplusplus/IpAddressUtils.h
similarity index 100%
rename from Common++/header/IpAddressUtils.h
rename to Common++/header/pcapplusplus/IpAddressUtils.h
diff --git a/Common++/header/IpUtils.h b/Common++/header/pcapplusplus/IpUtils.h
similarity index 100%
rename from Common++/header/IpUtils.h
rename to Common++/header/pcapplusplus/IpUtils.h
diff --git a/Common++/header/LRUList.h b/Common++/header/pcapplusplus/LRUList.h
similarity index 100%
rename from Common++/header/LRUList.h
rename to Common++/header/pcapplusplus/LRUList.h
diff --git a/Common++/header/Logger.h b/Common++/header/pcapplusplus/Logger.h
similarity index 100%
rename from Common++/header/Logger.h
rename to Common++/header/pcapplusplus/Logger.h
diff --git a/Common++/header/MacAddress.h b/Common++/header/pcapplusplus/MacAddress.h
similarity index 100%
rename from Common++/header/MacAddress.h
rename to Common++/header/pcapplusplus/MacAddress.h
diff --git a/Common++/header/OUILookup.h b/Common++/header/pcapplusplus/OUILookup.h
similarity index 100%
rename from Common++/header/OUILookup.h
rename to Common++/header/pcapplusplus/OUILookup.h
diff --git a/Common++/header/ObjectPool.h b/Common++/header/pcapplusplus/ObjectPool.h
similarity index 100%
rename from Common++/header/ObjectPool.h
rename to Common++/header/pcapplusplus/ObjectPool.h
diff --git a/Common++/header/PcapPlusPlusVersion.h b/Common++/header/pcapplusplus/PcapPlusPlusVersion.h
similarity index 100%
rename from Common++/header/PcapPlusPlusVersion.h
rename to Common++/header/pcapplusplus/PcapPlusPlusVersion.h
diff --git a/Common++/header/PointerVector.h b/Common++/header/pcapplusplus/PointerVector.h
similarity index 100%
rename from Common++/header/PointerVector.h
rename to Common++/header/pcapplusplus/PointerVector.h
diff --git a/Common++/header/SystemUtils.h b/Common++/header/pcapplusplus/SystemUtils.h
similarity index 100%
rename from Common++/header/SystemUtils.h
rename to Common++/header/pcapplusplus/SystemUtils.h
diff --git a/Common++/header/TablePrinter.h b/Common++/header/pcapplusplus/TablePrinter.h
similarity index 100%
rename from Common++/header/TablePrinter.h
rename to Common++/header/pcapplusplus/TablePrinter.h
diff --git a/Common++/header/TimespecTimeval.h b/Common++/header/pcapplusplus/TimespecTimeval.h
similarity index 100%
rename from Common++/header/TimespecTimeval.h
rename to Common++/header/pcapplusplus/TimespecTimeval.h
diff --git a/Common++/src/GeneralUtils.cpp b/Common++/src/GeneralUtils.cpp
index 1143e25d96..b78c40b122 100644
--- a/Common++/src/GeneralUtils.cpp
+++ b/Common++/src/GeneralUtils.cpp
@@ -1,7 +1,7 @@
 #define LOG_MODULE CommonLogModuleGenericUtils
 
-#include "GeneralUtils.h"
-#include "Logger.h"
+#include "pcapplusplus/GeneralUtils.h"
+#include "pcapplusplus/Logger.h"
 #include <sstream>
 #include <iomanip>
 #include <cstring>
diff --git a/Common++/src/IpAddress.cpp b/Common++/src/IpAddress.cpp
index f42ddbcf87..e838d5b6bd 100644
--- a/Common++/src/IpAddress.cpp
+++ b/Common++/src/IpAddress.cpp
@@ -4,9 +4,9 @@
 #include <sstream>
 #include <stdexcept>
 #include <bitset>
-#include "Logger.h"
-#include "IpUtils.h"
-#include "IpAddress.h"
+#include "pcapplusplus/Logger.h"
+#include "pcapplusplus/IpUtils.h"
+#include "pcapplusplus/IpAddress.h"
 #include "EndianPortable.h"
 
 // for AF_INET, AF_INET6
diff --git a/Common++/src/IpAddressUtils.cpp b/Common++/src/IpAddressUtils.cpp
index a65941cbf5..f8eeebe58b 100644
--- a/Common++/src/IpAddressUtils.cpp
+++ b/Common++/src/IpAddressUtils.cpp
@@ -1,7 +1,7 @@
-#include "IpAddressUtils.h"
+#include "pcapplusplus/IpAddressUtils.h"
 
-#include "IpAddress.h"
-#include "IpUtils.h"  // Just needing in_addr and in6_addr.
+#include "pcapplusplus/IpAddress.h"
+#include "pcapplusplus/IpUtils.h"  // Just needing in_addr and in6_addr.
 
 namespace pcpp
 {
diff --git a/Common++/src/IpUtils.cpp b/Common++/src/IpUtils.cpp
index e6fa1150b6..31ccf8fdd6 100644
--- a/Common++/src/IpUtils.cpp
+++ b/Common++/src/IpUtils.cpp
@@ -1,7 +1,7 @@
 #define LOG_MODULE CommonLogModuleIpUtils
 
-#include "IpUtils.h"
-#include "Logger.h"
+#include "pcapplusplus/IpUtils.h"
+#include "pcapplusplus/Logger.h"
 #include <cstring>
 #include <stdexcept>
 #ifndef NS_INADDRSZ
diff --git a/Common++/src/Logger.cpp b/Common++/src/Logger.cpp
index 39056120cc..d0e36db7da 100644
--- a/Common++/src/Logger.cpp
+++ b/Common++/src/Logger.cpp
@@ -1,4 +1,4 @@
-#include "Logger.h"
+#include "pcapplusplus/Logger.h"
 
 #include <iostream>
 #include <iomanip>
diff --git a/Common++/src/MacAddress.cpp b/Common++/src/MacAddress.cpp
index 29d2449c7d..cf27796452 100644
--- a/Common++/src/MacAddress.cpp
+++ b/Common++/src/MacAddress.cpp
@@ -1,4 +1,4 @@
-#include "MacAddress.h"
+#include "pcapplusplus/MacAddress.h"
 
 namespace pcpp
 {
diff --git a/Common++/src/OUILookup.cpp b/Common++/src/OUILookup.cpp
index 6d1700a572..cf5c59ba03 100644
--- a/Common++/src/OUILookup.cpp
+++ b/Common++/src/OUILookup.cpp
@@ -1,7 +1,7 @@
-#include "OUILookup.h"
-#include "Logger.h"
+#include "pcapplusplus/OUILookup.h"
+#include "pcapplusplus/Logger.h"
 
-#include "json.hpp"
+#include <json.hpp>
 
 #include <fstream>
 
diff --git a/Common++/src/PcapPlusPlusVersion.cpp b/Common++/src/PcapPlusPlusVersion.cpp
index 16f0ca3b95..11e435dd32 100644
--- a/Common++/src/PcapPlusPlusVersion.cpp
+++ b/Common++/src/PcapPlusPlusVersion.cpp
@@ -1,4 +1,4 @@
-#include "PcapPlusPlusVersion.h"
+#include "pcapplusplus/PcapPlusPlusVersion.h"
 
 namespace pcpp
 {
diff --git a/Common++/src/SystemUtils.cpp b/Common++/src/SystemUtils.cpp
index dfb1bbef57..3d0f992015 100644
--- a/Common++/src/SystemUtils.cpp
+++ b/Common++/src/SystemUtils.cpp
@@ -1,4 +1,4 @@
-#include "SystemUtils.h"
+#include "pcapplusplus/SystemUtils.h"
 #include "EndianPortable.h"
 
 #ifndef _MSC_VER
diff --git a/Common++/src/TablePrinter.cpp b/Common++/src/TablePrinter.cpp
index 9adb8fbd43..a39898f64e 100644
--- a/Common++/src/TablePrinter.cpp
+++ b/Common++/src/TablePrinter.cpp
@@ -5,8 +5,8 @@
 #include <iostream>
 #include <numeric>
 #include <utility>
-#include "TablePrinter.h"
-#include "Logger.h"
+#include "pcapplusplus/TablePrinter.h"
+#include "pcapplusplus/Logger.h"
 
 namespace pcpp
 {
diff --git a/Examples/ArpSpoofing/main.cpp b/Examples/ArpSpoofing/main.cpp
index 27e72a6769..4d70996b65 100644
--- a/Examples/ArpSpoofing/main.cpp
+++ b/Examples/ArpSpoofing/main.cpp
@@ -1,14 +1,15 @@
 #include <iostream>
 #include <fstream>
-#include "MacAddress.h"
-#include "IpAddress.h"
-#include "PcapPlusPlusVersion.h"
-#include "SystemUtils.h"
-#include "PcapLiveDeviceList.h"
-#include "PcapLiveDevice.h"
-#include "Packet.h"
-#include "EthLayer.h"
-#include "ArpLayer.h"
+
+#include "pcapplusplus/MacAddress.h"
+#include "pcapplusplus/IpAddress.h"
+#include "pcapplusplus/PcapPlusPlusVersion.h"
+#include "pcapplusplus/SystemUtils.h"
+#include "pcapplusplus/PcapLiveDeviceList.h"
+#include "pcapplusplus/PcapLiveDevice.h"
+#include "pcapplusplus/Packet.h"
+#include "pcapplusplus/EthLayer.h"
+#include "pcapplusplus/ArpLayer.h"
 #include <getopt.h>
 
 #define EXIT_WITH_ERROR(reason)                                                                                        \
diff --git a/Examples/Arping/main.cpp b/Examples/Arping/main.cpp
index 446744b2de..d8272fc417 100644
--- a/Examples/Arping/main.cpp
+++ b/Examples/Arping/main.cpp
@@ -6,15 +6,15 @@
  */
 
 #include <iostream>
-#include <MacAddress.h>
-#include <IpAddress.h>
-#include <Logger.h>
-#include <PcapPlusPlusVersion.h>
-#include <PcapLiveDeviceList.h>
-#include <PcapLiveDevice.h>
-#include <NetworkUtils.h>
 #include <getopt.h>
-#include <SystemUtils.h>
+#include "pcapplusplus/MacAddress.h"
+#include "pcapplusplus/IpAddress.h"
+#include "pcapplusplus/Logger.h"
+#include "pcapplusplus/PcapPlusPlusVersion.h"
+#include "pcapplusplus/PcapLiveDeviceList.h"
+#include "pcapplusplus/PcapLiveDevice.h"
+#include "pcapplusplus/NetworkUtils.h"
+#include "pcapplusplus/SystemUtils.h"
 
 #define EXIT_WITH_ERROR(reason)                                                                                        \
 	do                                                                                                                 \
diff --git a/Examples/DNSResolver/main.cpp b/Examples/DNSResolver/main.cpp
index b33792f946..db20dba7de 100644
--- a/Examples/DNSResolver/main.cpp
+++ b/Examples/DNSResolver/main.cpp
@@ -1,10 +1,10 @@
 #include <iostream>
-#include "PcapPlusPlusVersion.h"
-#include "PcapLiveDevice.h"
-#include "PcapLiveDeviceList.h"
-#include "NetworkUtils.h"
-#include "SystemUtils.h"
-#include "Logger.h"
+#include "pcapplusplus/PcapPlusPlusVersion.h"
+#include "pcapplusplus/PcapLiveDevice.h"
+#include "pcapplusplus/PcapLiveDeviceList.h"
+#include "pcapplusplus/NetworkUtils.h"
+#include "pcapplusplus/SystemUtils.h"
+#include "pcapplusplus/Logger.h"
 #include <getopt.h>
 
 #define EXIT_WITH_ERROR(reason)                                                                                        \
diff --git a/Examples/DnsSpoofing/main.cpp b/Examples/DnsSpoofing/main.cpp
index 8d7ffb0127..7b0bd2099e 100644
--- a/Examples/DnsSpoofing/main.cpp
+++ b/Examples/DnsSpoofing/main.cpp
@@ -16,21 +16,21 @@
 #if !defined(_WIN32)
 #	include <errno.h>
 #endif
-#include "IpAddress.h"
-#include "RawPacket.h"
-#include "ProtocolType.h"
-#include "Packet.h"
-#include "EthLayer.h"
-#include "IPv4Layer.h"
-#include "IPv6Layer.h"
-#include "UdpLayer.h"
-#include "DnsLayer.h"
-#include "PcapFilter.h"
-#include "PcapLiveDevice.h"
-#include "PcapLiveDeviceList.h"
-#include "TablePrinter.h"
-#include "SystemUtils.h"
-#include "PcapPlusPlusVersion.h"
+#include "pcapplusplus/IpAddress.h"
+#include "pcapplusplus/RawPacket.h"
+#include "pcapplusplus/ProtocolType.h"
+#include "pcapplusplus/Packet.h"
+#include "pcapplusplus/EthLayer.h"
+#include "pcapplusplus/IPv4Layer.h"
+#include "pcapplusplus/IPv6Layer.h"
+#include "pcapplusplus/UdpLayer.h"
+#include "pcapplusplus/DnsLayer.h"
+#include "pcapplusplus/PcapFilter.h"
+#include "pcapplusplus/PcapLiveDevice.h"
+#include "pcapplusplus/PcapLiveDeviceList.h"
+#include "pcapplusplus/TablePrinter.h"
+#include "pcapplusplus/SystemUtils.h"
+#include "pcapplusplus/PcapPlusPlusVersion.h"
 #include <getopt.h>
 
 #define EXIT_WITH_ERROR(reason)                                                                                        \
diff --git a/Examples/DpdkBridge/AppWorkerThread.h b/Examples/DpdkBridge/AppWorkerThread.h
index fd25f25326..eb1edfdc56 100644
--- a/Examples/DpdkBridge/AppWorkerThread.h
+++ b/Examples/DpdkBridge/AppWorkerThread.h
@@ -2,10 +2,10 @@
 
 #include "Common.h"
 
-#include "PacketUtils.h"
-#include "DpdkDevice.h"
-#include "DpdkDeviceList.h"
-#include "PcapFileDevice.h"
+#include "pcapplusplus/PacketUtils.h"
+#include "pcapplusplus/DpdkDevice.h"
+#include "pcapplusplus/DpdkDeviceList.h"
+#include "pcapplusplus/PcapFileDevice.h"
 
 /**
  * The worker thread class which does all the work. It's initialized with pointers to the RX and TX devices, then it
diff --git a/Examples/DpdkBridge/Common.h b/Examples/DpdkBridge/Common.h
index 1cfdff2d04..1c6a805db9 100644
--- a/Examples/DpdkBridge/Common.h
+++ b/Examples/DpdkBridge/Common.h
@@ -1,9 +1,8 @@
 #pragma once
 
-#include "Packet.h"
-#include "DpdkDevice.h"
-
-#include <SystemUtils.h>
+#include "pcapplusplus/Packet.h"
+#include "pcapplusplus/DpdkDevice.h"
+#include "pcapplusplus/SystemUtils.h"
 
 #include <string>
 #include <unordered_map>
diff --git a/Examples/DpdkBridge/main.cpp b/Examples/DpdkBridge/main.cpp
index 791db7ba24..ebbf141285 100644
--- a/Examples/DpdkBridge/main.cpp
+++ b/Examples/DpdkBridge/main.cpp
@@ -23,10 +23,10 @@
 #include "Common.h"
 #include "AppWorkerThread.h"
 
-#include "DpdkDeviceList.h"
-#include "SystemUtils.h"
-#include "PcapPlusPlusVersion.h"
-#include "TablePrinter.h"
+#include "pcapplusplus/DpdkDeviceList.h"
+#include "pcapplusplus/SystemUtils.h"
+#include "pcapplusplus/PcapPlusPlusVersion.h"
+#include "pcapplusplus/TablePrinter.h"
 
 #include <vector>
 #include <iostream>
diff --git a/Examples/DpdkExample-FilterTraffic/AppWorkerThread.h b/Examples/DpdkExample-FilterTraffic/AppWorkerThread.h
index ca2221f332..3952825c16 100644
--- a/Examples/DpdkExample-FilterTraffic/AppWorkerThread.h
+++ b/Examples/DpdkExample-FilterTraffic/AppWorkerThread.h
@@ -3,10 +3,10 @@
 #include "Common.h"
 #include "PacketMatchingEngine.h"
 
-#include "PacketUtils.h"
-#include "DpdkDevice.h"
-#include "DpdkDeviceList.h"
-#include "PcapFileDevice.h"
+#include "pcapplusplus/PacketUtils.h"
+#include "pcapplusplus/DpdkDevice.h"
+#include "pcapplusplus/DpdkDeviceList.h"
+#include "pcapplusplus/PcapFileDevice.h"
 
 /**
  * The worker thread class which does all the work: receive packets from relevant DPDK port(s), matched them with the
diff --git a/Examples/DpdkExample-FilterTraffic/Common.h b/Examples/DpdkExample-FilterTraffic/Common.h
index 0ff1444131..747313f6af 100644
--- a/Examples/DpdkExample-FilterTraffic/Common.h
+++ b/Examples/DpdkExample-FilterTraffic/Common.h
@@ -1,9 +1,8 @@
 #pragma once
 
-#include "Packet.h"
-#include "DpdkDevice.h"
-
-#include <SystemUtils.h>
+#include "pcapplusplus/Packet.h"
+#include "pcapplusplus/DpdkDevice.h"
+#include "pcapplusplus/SystemUtils.h"
 
 #include <string>
 #include <unordered_map>
diff --git a/Examples/DpdkExample-FilterTraffic/PacketMatchingEngine.h b/Examples/DpdkExample-FilterTraffic/PacketMatchingEngine.h
index e5354898ed..540f061236 100644
--- a/Examples/DpdkExample-FilterTraffic/PacketMatchingEngine.h
+++ b/Examples/DpdkExample-FilterTraffic/PacketMatchingEngine.h
@@ -1,10 +1,10 @@
 #pragma once
 
-#include "Packet.h"
-#include "IPv4Layer.h"
-#include "TcpLayer.h"
-#include "UdpLayer.h"
-#include "SystemUtils.h"
+#include "pcapplusplus/Packet.h"
+#include "pcapplusplus/IPv4Layer.h"
+#include "pcapplusplus/TcpLayer.h"
+#include "pcapplusplus/UdpLayer.h"
+#include "pcapplusplus/SystemUtils.h"
 
 /**
  * Responsible for matching packets by match criteria received from the user. Current match criteria are a combination
diff --git a/Examples/DpdkExample-FilterTraffic/main.cpp b/Examples/DpdkExample-FilterTraffic/main.cpp
index be72a1ed81..18fb497b72 100644
--- a/Examples/DpdkExample-FilterTraffic/main.cpp
+++ b/Examples/DpdkExample-FilterTraffic/main.cpp
@@ -24,12 +24,12 @@
 #include "PacketMatchingEngine.h"
 #include "AppWorkerThread.h"
 
-#include "DpdkDeviceList.h"
-#include "TcpLayer.h"
-#include "UdpLayer.h"
-#include "SystemUtils.h"
-#include "PcapPlusPlusVersion.h"
-#include "TablePrinter.h"
+#include "pcapplusplus/DpdkDeviceList.h"
+#include "pcapplusplus/TcpLayer.h"
+#include "pcapplusplus/UdpLayer.h"
+#include "pcapplusplus/SystemUtils.h"
+#include "pcapplusplus/PcapPlusPlusVersion.h"
+#include "pcapplusplus/TablePrinter.h"
 
 #include <vector>
 #include <iostream>
diff --git a/Examples/ExampleApp/main.cpp b/Examples/ExampleApp/main.cpp
index 89f3bdf6d2..74028b7487 100644
--- a/Examples/ExampleApp/main.cpp
+++ b/Examples/ExampleApp/main.cpp
@@ -1,7 +1,7 @@
 #include <iostream>
-#include <IPv4Layer.h>
-#include <Packet.h>
-#include <PcapFileDevice.h>
+#include "pcapplusplus/IPv4Layer.h"
+#include "pcapplusplus/Packet.h"
+#include "pcapplusplus/PcapFileDevice.h"
 
 int main(int argc, char* argv[])
 {
diff --git a/Examples/HttpAnalyzer/HttpStatsCollector.h b/Examples/HttpAnalyzer/HttpStatsCollector.h
index 9554509641..71389cd1ca 100644
--- a/Examples/HttpAnalyzer/HttpStatsCollector.h
+++ b/Examples/HttpAnalyzer/HttpStatsCollector.h
@@ -4,12 +4,12 @@
 
 #include <functional>
 #include <sstream>
-#include "HttpLayer.h"
-#include "TcpLayer.h"
-#include "IPv4Layer.h"
-#include "PayloadLayer.h"
-#include "PacketUtils.h"
-#include "SystemUtils.h"
+#include "pcapplusplus/HttpLayer.h"
+#include "pcapplusplus/TcpLayer.h"
+#include "pcapplusplus/IPv4Layer.h"
+#include "pcapplusplus/PayloadLayer.h"
+#include "pcapplusplus/PacketUtils.h"
+#include "pcapplusplus/SystemUtils.h"
 
 /**
  * An auxiliary struct for encapsulating rate stats
diff --git a/Examples/HttpAnalyzer/main.cpp b/Examples/HttpAnalyzer/main.cpp
index b321e3cab0..9c368b9228 100644
--- a/Examples/HttpAnalyzer/main.cpp
+++ b/Examples/HttpAnalyzer/main.cpp
@@ -20,17 +20,18 @@
 #include <memory>
 #include <iomanip>
 #include <algorithm>
-#include "PcapLiveDeviceList.h"
-#include "PcapFilter.h"
-#include "PcapFileDevice.h"
-#include "HttpStatsCollector.h"
-#include "TablePrinter.h"
-#include "SystemUtils.h"
-#include "PcapPlusPlusVersion.h"
+#include "pcapplusplus/PcapLiveDeviceList.h"
+#include "pcapplusplus/PcapFilter.h"
+#include "pcapplusplus/PcapFileDevice.h"
+#include "pcapplusplus/TablePrinter.h"
+#include "pcapplusplus/SystemUtils.h"
+#include "pcapplusplus/PcapPlusPlusVersion.h"
 #include <getopt.h>
 #include <iostream>
 #include <sstream>
 
+#include "HttpStatsCollector.h"
+
 #define EXIT_WITH_ERROR(reason)                                                                                        \
 	do                                                                                                                 \
 	{                                                                                                                  \
diff --git a/Examples/IPDefragUtil/main.cpp b/Examples/IPDefragUtil/main.cpp
index 24930fe7ad..3156f0745c 100644
--- a/Examples/IPDefragUtil/main.cpp
+++ b/Examples/IPDefragUtil/main.cpp
@@ -2,12 +2,12 @@
 #include <unordered_map>
 #include <sstream>
 #include <cstring>
-#include "PcapPlusPlusVersion.h"
-#include "IPv4Layer.h"
-#include "IPv6Layer.h"
-#include "IPReassembly.h"
-#include "PcapFileDevice.h"
-#include "SystemUtils.h"
+#include "pcapplusplus/PcapPlusPlusVersion.h"
+#include "pcapplusplus/IPv4Layer.h"
+#include "pcapplusplus/IPv6Layer.h"
+#include "pcapplusplus/IPReassembly.h"
+#include "pcapplusplus/PcapFileDevice.h"
+#include "pcapplusplus/SystemUtils.h"
 #include "getopt.h"
 
 #define EXIT_WITH_ERROR(reason)                                                                                        \
diff --git a/Examples/IPFragUtil/main.cpp b/Examples/IPFragUtil/main.cpp
index 93b09bd0ad..5e0d676f8b 100644
--- a/Examples/IPFragUtil/main.cpp
+++ b/Examples/IPFragUtil/main.cpp
@@ -3,13 +3,13 @@
 #include <sstream>
 #include <cstring>
 #include <cmath>
-#include "PcapPlusPlusVersion.h"
-#include "Packet.h"
-#include "IPv4Layer.h"
-#include "IPv6Layer.h"
-#include "PayloadLayer.h"
-#include "PcapFileDevice.h"
-#include "SystemUtils.h"
+#include "pcapplusplus/PcapPlusPlusVersion.h"
+#include "pcapplusplus/Packet.h"
+#include "pcapplusplus/IPv4Layer.h"
+#include "pcapplusplus/IPv6Layer.h"
+#include "pcapplusplus/PayloadLayer.h"
+#include "pcapplusplus/PcapFileDevice.h"
+#include "pcapplusplus/SystemUtils.h"
 #include "getopt.h"
 
 #define EXIT_WITH_ERROR(reason)                                                                                        \
diff --git a/Examples/IcmpFileTransfer/Common.cpp b/Examples/IcmpFileTransfer/Common.cpp
index 268c4d34f6..ce1b0521a2 100644
--- a/Examples/IcmpFileTransfer/Common.cpp
+++ b/Examples/IcmpFileTransfer/Common.cpp
@@ -2,13 +2,13 @@
 #include <iostream>
 #include <vector>
 #include <getopt.h>
-#include "EthLayer.h"
-#include "IPv4Layer.h"
-#include "IcmpLayer.h"
-#include "Packet.h"
-#include "PcapLiveDeviceList.h"
-#include "SystemUtils.h"
-#include "PcapPlusPlusVersion.h"
+#include "pcapplusplus/EthLayer.h"
+#include "pcapplusplus/IPv4Layer.h"
+#include "pcapplusplus/IcmpLayer.h"
+#include "pcapplusplus/Packet.h"
+#include "pcapplusplus/PcapLiveDeviceList.h"
+#include "pcapplusplus/SystemUtils.h"
+#include "pcapplusplus/PcapPlusPlusVersion.h"
 
 #if defined(_WIN32)
 #	define SEPARATOR '\\'
diff --git a/Examples/IcmpFileTransfer/Common.h b/Examples/IcmpFileTransfer/Common.h
index baf7c0d3e8..7631f734b5 100644
--- a/Examples/IcmpFileTransfer/Common.h
+++ b/Examples/IcmpFileTransfer/Common.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "MacAddress.h"
-#include "IpAddress.h"
-#include "PcapLiveDevice.h"
+#include "pcapplusplus/MacAddress.h"
+#include "pcapplusplus/IpAddress.h"
+#include "pcapplusplus/PcapLiveDevice.h"
 
 #define ICMP_FT_WAITING_FT_START 0x345a56c8e7f3cd67ULL
 #define ICMP_FT_START 0xd45ae6c2e7a3cd67ULL
diff --git a/Examples/IcmpFileTransfer/IcmpFileTransfer-catcher.cpp b/Examples/IcmpFileTransfer/IcmpFileTransfer-catcher.cpp
index 470b666607..5671161f0c 100644
--- a/Examples/IcmpFileTransfer/IcmpFileTransfer-catcher.cpp
+++ b/Examples/IcmpFileTransfer/IcmpFileTransfer-catcher.cpp
@@ -8,14 +8,14 @@
 
 #include <iostream>
 #include <fstream>
-#include "EthLayer.h"
-#include "IPv4Layer.h"
-#include "IcmpLayer.h"
-#include "Packet.h"
-#include "PcapLiveDeviceList.h"
-#include "PcapFilter.h"
+#include "pcapplusplus/EthLayer.h"
+#include "pcapplusplus/IPv4Layer.h"
+#include "pcapplusplus/IcmpLayer.h"
+#include "pcapplusplus/Packet.h"
+#include "pcapplusplus/PcapLiveDeviceList.h"
+#include "pcapplusplus/PcapFilter.h"
 #include "Common.h"
-#include "SystemUtils.h"
+#include "pcapplusplus/SystemUtils.h"
 
 /**
  * A struct used for starting a file transfer, mainly sending or getting the file name
diff --git a/Examples/IcmpFileTransfer/IcmpFileTransfer-pitcher.cpp b/Examples/IcmpFileTransfer/IcmpFileTransfer-pitcher.cpp
index 59019d0745..14fecc0c02 100644
--- a/Examples/IcmpFileTransfer/IcmpFileTransfer-pitcher.cpp
+++ b/Examples/IcmpFileTransfer/IcmpFileTransfer-pitcher.cpp
@@ -10,16 +10,16 @@
 #include <iostream>
 #include <fstream>
 #ifndef _MSC_VER
-#	include "unistd.h"
+#	include <unistd.h>
 #endif
-#include "EthLayer.h"
-#include "IPv4Layer.h"
-#include "IcmpLayer.h"
-#include "Packet.h"
-#include "PcapLiveDeviceList.h"
-#include "NetworkUtils.h"
+#include "pcapplusplus/EthLayer.h"
+#include "pcapplusplus/IPv4Layer.h"
+#include "pcapplusplus/IcmpLayer.h"
+#include "pcapplusplus/Packet.h"
+#include "pcapplusplus/PcapLiveDeviceList.h"
+#include "pcapplusplus/NetworkUtils.h"
 #include "Common.h"
-#include "SystemUtils.h"
+#include "pcapplusplus/SystemUtils.h"
 
 #define SEND_TIMEOUT_BEFORE_FT_START 3
 
diff --git a/Examples/KniPong/main.cpp b/Examples/KniPong/main.cpp
index beb5f89e97..b9cc1ee1a3 100644
--- a/Examples/KniPong/main.cpp
+++ b/Examples/KniPong/main.cpp
@@ -17,19 +17,19 @@
 #include <poll.h>
 #include <getopt.h>
 
-#include <PcapPlusPlusVersion.h>
-#include <SystemUtils.h>
-
-#include <Packet.h>
-#include <EthLayer.h>
-#include <ArpLayer.h>
-#include <IPv4Layer.h>
-#include <UdpLayer.h>
-#include <PayloadLayer.h>
-
-#include <DpdkDeviceList.h>
-#include <KniDevice.h>
-#include <KniDeviceList.h>
+#include "pcapplusplus/PcapPlusPlusVersion.h"
+#include "pcapplusplus/SystemUtils.h"
+
+#include "pcapplusplus/Packet.h"
+#include "pcapplusplus/EthLayer.h"
+#include "pcapplusplus/ArpLayer.h"
+#include "pcapplusplus/IPv4Layer.h"
+#include "pcapplusplus/UdpLayer.h"
+#include "pcapplusplus/PayloadLayer.h"
+
+#include "pcapplusplus/DpdkDeviceList.h"
+#include "pcapplusplus/KniDevice.h"
+#include "pcapplusplus/KniDeviceList.h"
 
 #define EXIT_WITH_ERROR(reason)                                                                                        \
 	do                                                                                                                 \
diff --git a/Examples/PcapPlusPlus-benchmark/benchmark-google.cpp b/Examples/PcapPlusPlus-benchmark/benchmark-google.cpp
index e12ccc30e6..30f477eb8d 100644
--- a/Examples/PcapPlusPlus-benchmark/benchmark-google.cpp
+++ b/Examples/PcapPlusPlus-benchmark/benchmark-google.cpp
@@ -1,12 +1,12 @@
-#include <Packet.h>
-#include <PcapFileDevice.h>
-#include <PcapPlusPlusVersion.h>
-
-#include <EthLayer.h>
-#include <IPv4Layer.h>
-#include <IPv6Layer.h>
-#include <TcpLayer.h>
-#include <UdpLayer.h>
+#include <pcapplusplus/Packet.h>
+#include <pcapplusplus/PcapFileDevice.h>
+#include <pcapplusplus/PcapPlusPlusVersion.h>
+
+#include <pcapplusplus/EthLayer.h>
+#include <pcapplusplus/IPv4Layer.h>
+#include <pcapplusplus/IPv6Layer.h>
+#include <pcapplusplus/TcpLayer.h>
+#include <pcapplusplus/UdpLayer.h>
 
 #include <benchmark/benchmark.h>
 
diff --git a/Examples/PcapPlusPlus-benchmark/benchmark.cpp b/Examples/PcapPlusPlus-benchmark/benchmark.cpp
index 96c77ca63f..2e4442bb3a 100644
--- a/Examples/PcapPlusPlus-benchmark/benchmark.cpp
+++ b/Examples/PcapPlusPlus-benchmark/benchmark.cpp
@@ -14,9 +14,9 @@
  * `./benchmark.sh libpcap PcapPlusPlus libtins libcrafter`
  */
 
-#include <Packet.h>
-#include <DnsLayer.h>
-#include <PcapFileDevice.h>
+#include "pcapplusplus/Packet.h"
+#include "pcapplusplus/DnsLayer.h"
+#include "pcapplusplus/PcapFileDevice.h"
 #include <iostream>
 #include <chrono>
 #include <string>
diff --git a/Examples/PcapPrinter/main.cpp b/Examples/PcapPrinter/main.cpp
index e1d9d7a8f5..34fb70cfdc 100644
--- a/Examples/PcapPrinter/main.cpp
+++ b/Examples/PcapPrinter/main.cpp
@@ -13,11 +13,11 @@
 #include <iostream>
 #include <fstream>
 #include <sstream>
-#include <RawPacket.h>
-#include <Packet.h>
-#include <PcapFileDevice.h>
-#include <PcapPlusPlusVersion.h>
-#include <SystemUtils.h>
+#include "pcapplusplus/RawPacket.h"
+#include "pcapplusplus/Packet.h"
+#include "pcapplusplus/PcapFileDevice.h"
+#include "pcapplusplus/PcapPlusPlusVersion.h"
+#include "pcapplusplus/SystemUtils.h"
 #include <getopt.h>
 
 static struct option PcapPrinterOptions[] = {
diff --git a/Examples/PcapSearch/main.cpp b/Examples/PcapSearch/main.cpp
index f1af7e64d5..bbe6330bba 100644
--- a/Examples/PcapSearch/main.cpp
+++ b/Examples/PcapSearch/main.cpp
@@ -37,12 +37,12 @@
 #include <utility>
 #include <vector>
 #include <unordered_map>
-#include <Logger.h>
-#include <PcapPlusPlusVersion.h>
-#include <SystemUtils.h>
-#include <RawPacket.h>
-#include <Packet.h>
-#include <PcapFileDevice.h>
+#include "pcapplusplus/Logger.h"
+#include "pcapplusplus/PcapPlusPlusVersion.h"
+#include "pcapplusplus/SystemUtils.h"
+#include "pcapplusplus/RawPacket.h"
+#include "pcapplusplus/Packet.h"
+#include "pcapplusplus/PcapFileDevice.h"
 #include <getopt.h>
 
 // clang-format off
diff --git a/Examples/PcapSplitter/IPPortSplitters.h b/Examples/PcapSplitter/IPPortSplitters.h
index 1493d7571b..13535d0a49 100644
--- a/Examples/PcapSplitter/IPPortSplitters.h
+++ b/Examples/PcapSplitter/IPPortSplitters.h
@@ -1,8 +1,8 @@
 #pragma once
 
 #include "Splitters.h"
-#include "PacketUtils.h"
-#include "SystemUtils.h"
+#include "pcapplusplus/PacketUtils.h"
+#include "pcapplusplus/SystemUtils.h"
 
 /**
  * A virtual abstract class for all splitters that split files by IP address or TCP/UDP port. Inherits from
diff --git a/Examples/PcapSplitter/SimpleSplitters.h b/Examples/PcapSplitter/SimpleSplitters.h
index e05abcb575..65a9948bce 100644
--- a/Examples/PcapSplitter/SimpleSplitters.h
+++ b/Examples/PcapSplitter/SimpleSplitters.h
@@ -1,8 +1,8 @@
 #pragma once
 
 #include "Splitters.h"
-#include "PcapDevice.h"
-#include "PcapFilter.h"
+#include "pcapplusplus/PcapDevice.h"
+#include "pcapplusplus/PcapFilter.h"
 
 /**
  * Splits a pcap file by number of packets
diff --git a/Examples/PcapSplitter/Splitters.h b/Examples/PcapSplitter/Splitters.h
index c6c43c30a0..5768f823d6 100644
--- a/Examples/PcapSplitter/Splitters.h
+++ b/Examples/PcapSplitter/Splitters.h
@@ -1,14 +1,14 @@
 #pragma once
 
-#include "LRUList.h"
-#include "RawPacket.h"
-#include "Packet.h"
-#include "IPv4Layer.h"
-#include "IPv6Layer.h"
-#include "TcpLayer.h"
-#include "UdpLayer.h"
-#include "DnsLayer.h"
-#include "PacketUtils.h"
+#include "pcapplusplus/LRUList.h"
+#include "pcapplusplus/RawPacket.h"
+#include "pcapplusplus/Packet.h"
+#include "pcapplusplus/IPv4Layer.h"
+#include "pcapplusplus/IPv6Layer.h"
+#include "pcapplusplus/TcpLayer.h"
+#include "pcapplusplus/UdpLayer.h"
+#include "pcapplusplus/DnsLayer.h"
+#include "pcapplusplus/PacketUtils.h"
 #include <unordered_map>
 #include <algorithm>
 #include <iomanip>
diff --git a/Examples/PcapSplitter/main.cpp b/Examples/PcapSplitter/main.cpp
index 241b10ac7d..773e352f18 100644
--- a/Examples/PcapSplitter/main.cpp
+++ b/Examples/PcapSplitter/main.cpp
@@ -48,15 +48,15 @@
 #include <memory>
 #include <string>
 #include <unordered_map>
-#include <RawPacket.h>
-#include <Packet.h>
-#include <PcapFileDevice.h>
+#include "pcapplusplus/RawPacket.h"
+#include "pcapplusplus/Packet.h"
+#include "pcapplusplus/PcapFileDevice.h"
+#include "pcapplusplus/SystemUtils.h"
+#include "pcapplusplus/PcapPlusPlusVersion.h"
+#include <getopt.h>
 #include "SimpleSplitters.h"
 #include "IPPortSplitters.h"
 #include "ConnectionSplitters.h"
-#include <getopt.h>
-#include <SystemUtils.h>
-#include <PcapPlusPlusVersion.h>
 
 static struct option PcapSplitterOptions[] = {
 	{ "input-file",  required_argument, nullptr, 'f' },
diff --git a/Examples/PfRingExample-FilterTraffic/Common.h b/Examples/PfRingExample-FilterTraffic/Common.h
index 0d00e14820..b8fee3e0d1 100644
--- a/Examples/PfRingExample-FilterTraffic/Common.h
+++ b/Examples/PfRingExample-FilterTraffic/Common.h
@@ -1,7 +1,12 @@
 #pragma once
 
-#include <Packet.h>
-#include <PfRingDeviceList.h>
+#include "pcapplusplus/Packet.h"
+#include "pcapplusplus/PfRingDeviceList.h"
+
+#include <string>
+#include <vector>
+#include <iomanip>
+#include <iostream>
 #include <sstream>
 
 /**
diff --git a/Examples/PfRingExample-FilterTraffic/PacketMatchingEngine.h b/Examples/PfRingExample-FilterTraffic/PacketMatchingEngine.h
index 64d4b4661c..a34579c131 100644
--- a/Examples/PfRingExample-FilterTraffic/PacketMatchingEngine.h
+++ b/Examples/PfRingExample-FilterTraffic/PacketMatchingEngine.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include "Packet.h"
-#include "IPv4Layer.h"
-#include "TcpLayer.h"
-#include "UdpLayer.h"
+#include "pcapplusplus/Packet.h"
+#include "pcapplusplus/IPv4Layer.h"
+#include "pcapplusplus/TcpLayer.h"
+#include "pcapplusplus/UdpLayer.h"
 
 /**
  * Responsible for matching packets by match criteria received from the user. Current match criteria are a combination
diff --git a/Examples/PfRingExample-FilterTraffic/main.cpp b/Examples/PfRingExample-FilterTraffic/main.cpp
index 7f7583ac9c..324eb21e17 100644
--- a/Examples/PfRingExample-FilterTraffic/main.cpp
+++ b/Examples/PfRingExample-FilterTraffic/main.cpp
@@ -32,11 +32,11 @@
 
 #include "Common.h"
 #include "PacketMatchingEngine.h"
-#include <PcapFileDevice.h>
-#include <PacketUtils.h>
-#include <PcapPlusPlusVersion.h>
-#include <TablePrinter.h>
-#include <Logger.h>
+#include "pcapplusplus/PcapFileDevice.h"
+#include "pcapplusplus/PacketUtils.h"
+#include "pcapplusplus/PcapPlusPlusVersion.h"
+#include "pcapplusplus/TablePrinter.h"
+#include "pcapplusplus/Logger.h"
 #include <getopt.h>
 #include <unordered_map>
 #include <sstream>
diff --git a/Examples/SSLAnalyzer/SSLStatsCollector.h b/Examples/SSLAnalyzer/SSLStatsCollector.h
index c7015baa20..00f536f208 100644
--- a/Examples/SSLAnalyzer/SSLStatsCollector.h
+++ b/Examples/SSLAnalyzer/SSLStatsCollector.h
@@ -2,12 +2,12 @@
 
 #include <unordered_map>
 #include <sstream>
-#include "TcpLayer.h"
-#include "IPv4Layer.h"
-#include "PayloadLayer.h"
-#include "PacketUtils.h"
-#include "SSLLayer.h"
-#include "SystemUtils.h"
+#include "pcapplusplus/TcpLayer.h"
+#include "pcapplusplus/IPv4Layer.h"
+#include "pcapplusplus/PayloadLayer.h"
+#include "pcapplusplus/PacketUtils.h"
+#include "pcapplusplus/SSLLayer.h"
+#include "pcapplusplus/SystemUtils.h"
 
 /**
  * An auxiliary struct for encapsulating rate stats
diff --git a/Examples/SSLAnalyzer/main.cpp b/Examples/SSLAnalyzer/main.cpp
index bf644e748b..c0ac478964 100644
--- a/Examples/SSLAnalyzer/main.cpp
+++ b/Examples/SSLAnalyzer/main.cpp
@@ -21,13 +21,15 @@
 #include <iomanip>
 #include <algorithm>
 #include <memory>
-#include "PcapLiveDeviceList.h"
-#include "PcapFilter.h"
-#include "PcapFileDevice.h"
+
+#include "pcapplusplus/PcapLiveDeviceList.h"
+#include "pcapplusplus/PcapFilter.h"
+#include "pcapplusplus/PcapFileDevice.h"
+#include "pcapplusplus/TablePrinter.h"
+#include "pcapplusplus/SystemUtils.h"
+#include "pcapplusplus/PcapPlusPlusVersion.h"
+
 #include "SSLStatsCollector.h"
-#include "TablePrinter.h"
-#include "SystemUtils.h"
-#include "PcapPlusPlusVersion.h"
 #include <getopt.h>
 
 #define EXIT_WITH_ERROR(reason)                                                                                        \
diff --git a/Examples/TLSFingerprinting/main.cpp b/Examples/TLSFingerprinting/main.cpp
index 407e663909..a4f914d8fa 100644
--- a/Examples/TLSFingerprinting/main.cpp
+++ b/Examples/TLSFingerprinting/main.cpp
@@ -15,16 +15,16 @@
 #include <fstream>
 #include <sstream>
 #include <cctype>
-#include "SystemUtils.h"
-#include "TablePrinter.h"
-#include "IPLayer.h"
-#include "TcpLayer.h"
-#include "SSLLayer.h"
-#include "SSLHandshake.h"
-#include "Packet.h"
-#include "PcapPlusPlusVersion.h"
-#include "PcapLiveDeviceList.h"
-#include "PcapFileDevice.h"
+#include "pcapplusplus/SystemUtils.h"
+#include "pcapplusplus/TablePrinter.h"
+#include "pcapplusplus/IPLayer.h"
+#include "pcapplusplus/TcpLayer.h"
+#include "pcapplusplus/SSLLayer.h"
+#include "pcapplusplus/SSLHandshake.h"
+#include "pcapplusplus/Packet.h"
+#include "pcapplusplus/PcapPlusPlusVersion.h"
+#include "pcapplusplus/PcapLiveDeviceList.h"
+#include "pcapplusplus/PcapFileDevice.h"
 #include <getopt.h>
 
 static struct option TLSFingerprintingOptions[] = {
diff --git a/Examples/TcpReassembly/main.cpp b/Examples/TcpReassembly/main.cpp
index 5b6b8a5209..317a8d9cc5 100644
--- a/Examples/TcpReassembly/main.cpp
+++ b/Examples/TcpReassembly/main.cpp
@@ -27,12 +27,12 @@
 #include <fstream>
 #include <sstream>
 #include <algorithm>
-#include "TcpReassembly.h"
-#include "PcapLiveDeviceList.h"
-#include "PcapFileDevice.h"
-#include "SystemUtils.h"
-#include "PcapPlusPlusVersion.h"
-#include "LRUList.h"
+#include "pcapplusplus/TcpReassembly.h"
+#include "pcapplusplus/PcapLiveDeviceList.h"
+#include "pcapplusplus/PcapFileDevice.h"
+#include "pcapplusplus/SystemUtils.h"
+#include "pcapplusplus/PcapPlusPlusVersion.h"
+#include "pcapplusplus/LRUList.h"
 #include <getopt.h>
 
 #define EXIT_WITH_ERROR(reason)                                                                                        \
diff --git a/Examples/Tutorials/Tutorial-DpdkL2Fwd/WorkerThread.h b/Examples/Tutorials/Tutorial-DpdkL2Fwd/WorkerThread.h
index aff9e96933..c5ff6747d3 100644
--- a/Examples/Tutorials/Tutorial-DpdkL2Fwd/WorkerThread.h
+++ b/Examples/Tutorials/Tutorial-DpdkL2Fwd/WorkerThread.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "DpdkDevice.h"
-#include "DpdkDeviceList.h"
+#include "pcapplusplus/DpdkDevice.h"
+#include "pcapplusplus/DpdkDeviceList.h"
 
 class L2FwdWorkerThread : public pcpp::DpdkWorkerThread
 {
diff --git a/Examples/Tutorials/Tutorial-DpdkL2Fwd/main.cpp b/Examples/Tutorials/Tutorial-DpdkL2Fwd/main.cpp
index 59459614f6..f22ab94dbf 100644
--- a/Examples/Tutorials/Tutorial-DpdkL2Fwd/main.cpp
+++ b/Examples/Tutorials/Tutorial-DpdkL2Fwd/main.cpp
@@ -1,9 +1,10 @@
 #include <vector>
 #include <unistd.h>
 #include <sstream>
-#include "SystemUtils.h"
-#include "DpdkDeviceList.h"
-#include "TablePrinter.h"
+#include "pcapplusplus/SystemUtils.h"
+#include "pcapplusplus/DpdkDeviceList.h"
+#include "pcapplusplus/TablePrinter.h"
+
 #include "WorkerThread.h"
 
 #define MBUF_POOL_SIZE 16 * 1024 - 1
diff --git a/Examples/Tutorials/Tutorial-HelloWorld/main.cpp b/Examples/Tutorials/Tutorial-HelloWorld/main.cpp
index 89f3bdf6d2..74028b7487 100644
--- a/Examples/Tutorials/Tutorial-HelloWorld/main.cpp
+++ b/Examples/Tutorials/Tutorial-HelloWorld/main.cpp
@@ -1,7 +1,7 @@
 #include <iostream>
-#include <IPv4Layer.h>
-#include <Packet.h>
-#include <PcapFileDevice.h>
+#include "pcapplusplus/IPv4Layer.h"
+#include "pcapplusplus/Packet.h"
+#include "pcapplusplus/PcapFileDevice.h"
 
 int main(int argc, char* argv[])
 {
diff --git a/Examples/Tutorials/Tutorial-LiveTraffic/main.cpp b/Examples/Tutorials/Tutorial-LiveTraffic/main.cpp
index 5ca3e8b2cc..89701952af 100644
--- a/Examples/Tutorials/Tutorial-LiveTraffic/main.cpp
+++ b/Examples/Tutorials/Tutorial-LiveTraffic/main.cpp
@@ -1,8 +1,8 @@
 #include <iostream>
 #include <algorithm>
-#include "PcapLiveDeviceList.h"
-#include "Packet.h"
-#include "SystemUtils.h"
+#include "pcapplusplus/PcapLiveDeviceList.h"
+#include "pcapplusplus/Packet.h"
+#include "pcapplusplus/SystemUtils.h"
 /**
  * A struct for collecting packet statistics
  */
diff --git a/Examples/Tutorials/Tutorial-PacketCraftAndEdit/main.cpp b/Examples/Tutorials/Tutorial-PacketCraftAndEdit/main.cpp
index b3e9ee247c..29cc68fcce 100644
--- a/Examples/Tutorials/Tutorial-PacketCraftAndEdit/main.cpp
+++ b/Examples/Tutorials/Tutorial-PacketCraftAndEdit/main.cpp
@@ -1,15 +1,15 @@
 #include <iostream>
 #include <memory>
-#include "SystemUtils.h"
-#include "Packet.h"
-#include "EthLayer.h"
-#include "VlanLayer.h"
-#include "IPv4Layer.h"
-#include "TcpLayer.h"
-#include "HttpLayer.h"
-#include "UdpLayer.h"
-#include "DnsLayer.h"
-#include "PcapFileDevice.h"
+#include "pcapplusplus/SystemUtils.h"
+#include "pcapplusplus/Packet.h"
+#include "pcapplusplus/EthLayer.h"
+#include "pcapplusplus/VlanLayer.h"
+#include "pcapplusplus/IPv4Layer.h"
+#include "pcapplusplus/TcpLayer.h"
+#include "pcapplusplus/HttpLayer.h"
+#include "pcapplusplus/UdpLayer.h"
+#include "pcapplusplus/DnsLayer.h"
+#include "pcapplusplus/PcapFileDevice.h"
 
 int main(int argc, char* argv[])
 {
diff --git a/Examples/Tutorials/Tutorial-PacketParsing/main.cpp b/Examples/Tutorials/Tutorial-PacketParsing/main.cpp
index edfbfe1f81..4c2207cc27 100644
--- a/Examples/Tutorials/Tutorial-PacketParsing/main.cpp
+++ b/Examples/Tutorials/Tutorial-PacketParsing/main.cpp
@@ -1,12 +1,12 @@
 #include <iostream>
 #include <memory>
-#include "SystemUtils.h"
-#include "Packet.h"
-#include "EthLayer.h"
-#include "IPv4Layer.h"
-#include "TcpLayer.h"
-#include "HttpLayer.h"
-#include "PcapFileDevice.h"
+#include "pcapplusplus/SystemUtils.h"
+#include "pcapplusplus/Packet.h"
+#include "pcapplusplus/EthLayer.h"
+#include "pcapplusplus/IPv4Layer.h"
+#include "pcapplusplus/TcpLayer.h"
+#include "pcapplusplus/HttpLayer.h"
+#include "pcapplusplus/PcapFileDevice.h"
 
 std::string getProtocolTypeAsString(pcpp::ProtocolType protocolType)
 {
diff --git a/Examples/Tutorials/Tutorial-PcapFiles/main.cpp b/Examples/Tutorials/Tutorial-PcapFiles/main.cpp
index 54e6087793..228dd87600 100644
--- a/Examples/Tutorials/Tutorial-PcapFiles/main.cpp
+++ b/Examples/Tutorials/Tutorial-PcapFiles/main.cpp
@@ -1,6 +1,6 @@
 #include <memory>
 #include <iostream>
-#include "PcapFileDevice.h"
+#include "pcapplusplus/PcapFileDevice.h"
 
 /**
  * main method of the application
diff --git a/Examples/XdpExample-FilterTraffic/PacketMatchingEngine.h b/Examples/XdpExample-FilterTraffic/PacketMatchingEngine.h
index e5354898ed..540f061236 100644
--- a/Examples/XdpExample-FilterTraffic/PacketMatchingEngine.h
+++ b/Examples/XdpExample-FilterTraffic/PacketMatchingEngine.h
@@ -1,10 +1,10 @@
 #pragma once
 
-#include "Packet.h"
-#include "IPv4Layer.h"
-#include "TcpLayer.h"
-#include "UdpLayer.h"
-#include "SystemUtils.h"
+#include "pcapplusplus/Packet.h"
+#include "pcapplusplus/IPv4Layer.h"
+#include "pcapplusplus/TcpLayer.h"
+#include "pcapplusplus/UdpLayer.h"
+#include "pcapplusplus/SystemUtils.h"
 
 /**
  * Responsible for matching packets by match criteria received from the user. Current match criteria are a combination
diff --git a/Examples/XdpExample-FilterTraffic/main.cpp b/Examples/XdpExample-FilterTraffic/main.cpp
index f08b180c44..9f60e810ff 100644
--- a/Examples/XdpExample-FilterTraffic/main.cpp
+++ b/Examples/XdpExample-FilterTraffic/main.cpp
@@ -9,13 +9,14 @@
  */
 
 #include "PacketMatchingEngine.h"
-#include "SystemUtils.h"
-#include "PcapPlusPlusVersion.h"
-#include "PacketUtils.h"
-#include "TablePrinter.h"
-#include "XdpDevice.h"
-#include "PcapFileDevice.h"
-#include "PcapLiveDeviceList.h"
+
+#include "pcapplusplus/SystemUtils.h"
+#include "pcapplusplus/PcapPlusPlusVersion.h"
+#include "pcapplusplus/PacketUtils.h"
+#include "pcapplusplus/TablePrinter.h"
+#include "pcapplusplus/XdpDevice.h"
+#include "pcapplusplus/PcapFileDevice.h"
+#include "pcapplusplus/PcapLiveDeviceList.h"
 #include <getopt.h>
 #include <unordered_map>
 #include <future>
diff --git a/Packet++/CMakeLists.txt b/Packet++/CMakeLists.txt
index 3aa3731a7d..53540ba189 100644
--- a/Packet++/CMakeLists.txt
+++ b/Packet++/CMakeLists.txt
@@ -72,84 +72,89 @@ add_library(
 
 set(
   public_headers
-  header/ArpLayer.h
-  header/Asn1Codec.h
-  header/BgpLayer.h
-  header/CiscoHdlcLayer.h
-  header/CotpLayer.h
-  header/DhcpLayer.h
-  header/DhcpV6Layer.h
-  header/DnsLayerEnums.h
-  header/DnsLayer.h
-  header/DnsResourceData.h
-  header/DnsResource.h
-  header/EthDot3Layer.h
-  header/EthLayer.h
-  header/FtpLayer.h
-  header/GreLayer.h
-  header/GtpLayer.h
-  header/HttpLayer.h
-  header/IcmpLayer.h
-  header/IcmpV6Layer.h
-  header/IgmpLayer.h
-  header/IPLayer.h
-  header/IPReassembly.h
-  header/IPSecLayer.h
-  header/IPv4Layer.h
-  header/IPv6Extensions.h
-  header/IPv6Layer.h
-  header/Layer.h
-  header/LdapLayer.h
-  header/LLCLayer.h
-  header/MplsLayer.h
-  header/NullLoopbackLayer.h
-  header/NdpLayer.h
-  header/NflogLayer.h
-  header/NtpLayer.h
-  header/Packet.h
-  header/PacketTrailerLayer.h
-  header/PacketUtils.h
-  header/PayloadLayer.h
-  header/PPPoELayer.h
-  header/ProtocolType.h
-  header/RadiusLayer.h
-  header/RawPacket.h
-  header/S7CommLayer.h
-  header/SdpLayer.h
-  header/SingleCommandTextProtocol.h
-  header/SipLayer.h
-  header/SllLayer.h
-  header/Sll2Layer.h
-  header/SmtpLayer.h
-  header/SomeIpLayer.h
-  header/SomeIpSdLayer.h
-  header/SSHLayer.h
-  header/SSLCommon.h
-  header/SSLHandshake.h
-  header/SSLLayer.h
-  header/StpLayer.h
-  header/TcpLayer.h
-  header/TcpReassembly.h
-  header/TelnetLayer.h
-  header/TextBasedProtocol.h
-  header/TLVData.h
-  header/TpktLayer.h
-  header/UdpLayer.h
-  header/VlanLayer.h
-  header/VrrpLayer.h
-  header/VxlanLayer.h
-  header/WakeOnLanLayer.h
-  header/WireGuardLayer.h
+  header/pcapplusplus/ArpLayer.h
+  header/pcapplusplus/Asn1Codec.h
+  header/pcapplusplus/BgpLayer.h
+  header/pcapplusplus/CiscoHdlcLayer.h
+  header/pcapplusplus/CotpLayer.h
+  header/pcapplusplus/DhcpLayer.h
+  header/pcapplusplus/DhcpV6Layer.h
+  header/pcapplusplus/DnsLayerEnums.h
+  header/pcapplusplus/DnsLayer.h
+  header/pcapplusplus/DnsResourceData.h
+  header/pcapplusplus/DnsResource.h
+  header/pcapplusplus/EthDot3Layer.h
+  header/pcapplusplus/EthLayer.h
+  header/pcapplusplus/FtpLayer.h
+  header/pcapplusplus/GreLayer.h
+  header/pcapplusplus/GtpLayer.h
+  header/pcapplusplus/HttpLayer.h
+  header/pcapplusplus/IcmpLayer.h
+  header/pcapplusplus/IcmpV6Layer.h
+  header/pcapplusplus/IgmpLayer.h
+  header/pcapplusplus/IPLayer.h
+  header/pcapplusplus/IPReassembly.h
+  header/pcapplusplus/IPSecLayer.h
+  header/pcapplusplus/IPv4Layer.h
+  header/pcapplusplus/IPv6Extensions.h
+  header/pcapplusplus/IPv6Layer.h
+  header/pcapplusplus/Layer.h
+  header/pcapplusplus/LdapLayer.h
+  header/pcapplusplus/LLCLayer.h
+  header/pcapplusplus/MplsLayer.h
+  header/pcapplusplus/NullLoopbackLayer.h
+  header/pcapplusplus/NdpLayer.h
+  header/pcapplusplus/NflogLayer.h
+  header/pcapplusplus/NtpLayer.h
+  header/pcapplusplus/Packet.h
+  header/pcapplusplus/PacketTrailerLayer.h
+  header/pcapplusplus/PacketUtils.h
+  header/pcapplusplus/PayloadLayer.h
+  header/pcapplusplus/PPPoELayer.h
+  header/pcapplusplus/ProtocolType.h
+  header/pcapplusplus/RadiusLayer.h
+  header/pcapplusplus/RawPacket.h
+  header/pcapplusplus/S7CommLayer.h
+  header/pcapplusplus/SdpLayer.h
+  header/pcapplusplus/SingleCommandTextProtocol.h
+  header/pcapplusplus/SipLayer.h
+  header/pcapplusplus/SllLayer.h
+  header/pcapplusplus/Sll2Layer.h
+  header/pcapplusplus/SmtpLayer.h
+  header/pcapplusplus/SomeIpLayer.h
+  header/pcapplusplus/SomeIpSdLayer.h
+  header/pcapplusplus/SSHLayer.h
+  header/pcapplusplus/SSLCommon.h
+  header/pcapplusplus/SSLHandshake.h
+  header/pcapplusplus/SSLLayer.h
+  header/pcapplusplus/StpLayer.h
+  header/pcapplusplus/TcpLayer.h
+  header/pcapplusplus/TcpReassembly.h
+  header/pcapplusplus/TelnetLayer.h
+  header/pcapplusplus/TextBasedProtocol.h
+  header/pcapplusplus/TLVData.h
+  header/pcapplusplus/TpktLayer.h
+  header/pcapplusplus/UdpLayer.h
+  header/pcapplusplus/VlanLayer.h
+  header/pcapplusplus/VrrpLayer.h
+  header/pcapplusplus/VxlanLayer.h
+  header/pcapplusplus/WakeOnLanLayer.h
+  header/pcapplusplus/WireGuardLayer.h
 )
 
 # Don't use set_target_properties CMake limit to 50 elements
 set_property(TARGET Packet++ PROPERTY PUBLIC_HEADER ${public_headers})
 
+set_target_properties(Packet++ PROPERTIES PCAPPP_ENABLE_OLD_STYLE_INCLUDE "${PCAPPP_ENABLE_OLD_STYLE_INCLUDE}")
+
 target_compile_features(Packet++ PUBLIC cxx_std_11)
 
 target_include_directories(
   Packet++
-  PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/header> $<INSTALL_INTERFACE:include/pcapplusplus>
+  PUBLIC
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/header>
+    $<INSTALL_INTERFACE:include>
+    $<$<BOOL:$<TARGET_PROPERTY:Packet++,PCAPPP_ENABLE_OLD_STYLE_INCLUDE>>:$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/header/pcapplusplus>$<INSTALL_INTERFACE:include/pcapplusplus>>
   # Don't link with hash-library nor EndianPortable as they won't be exported
   PRIVATE $<TARGET_PROPERTY:hash-library,INCLUDE_DIRECTORIES>
   PRIVATE $<TARGET_PROPERTY:EndianPortable,INTERFACE_INCLUDE_DIRECTORIES>
diff --git a/Packet++/header/ArpLayer.h b/Packet++/header/pcapplusplus/ArpLayer.h
similarity index 98%
rename from Packet++/header/ArpLayer.h
rename to Packet++/header/pcapplusplus/ArpLayer.h
index 6402a5b753..67b2976742 100644
--- a/Packet++/header/ArpLayer.h
+++ b/Packet++/header/pcapplusplus/ArpLayer.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include "Layer.h"
-#include "IpAddress.h"
-#include "MacAddress.h"
-#include "DeprecationUtils.h"
+#include "pcapplusplus/Layer.h"
+#include "pcapplusplus/IpAddress.h"
+#include "pcapplusplus/MacAddress.h"
+#include "pcapplusplus/DeprecationUtils.h"
 
 /// @file
 
diff --git a/Packet++/header/Asn1Codec.h b/Packet++/header/pcapplusplus/Asn1Codec.h
similarity index 99%
rename from Packet++/header/Asn1Codec.h
rename to Packet++/header/pcapplusplus/Asn1Codec.h
index 1d0f74da26..240606c8c3 100644
--- a/Packet++/header/Asn1Codec.h
+++ b/Packet++/header/pcapplusplus/Asn1Codec.h
@@ -4,7 +4,7 @@
 #include <memory>
 #include <typeinfo>
 #include <stdexcept>
-#include "PointerVector.h"
+#include "pcapplusplus/PointerVector.h"
 
 /// @file
 
diff --git a/Packet++/header/BgpLayer.h b/Packet++/header/pcapplusplus/BgpLayer.h
similarity index 99%
rename from Packet++/header/BgpLayer.h
rename to Packet++/header/pcapplusplus/BgpLayer.h
index 00ced23bfe..1599672352 100644
--- a/Packet++/header/BgpLayer.h
+++ b/Packet++/header/pcapplusplus/BgpLayer.h
@@ -1,8 +1,8 @@
 #pragma once
 
 #include <vector>
-#include "Layer.h"
-#include "IpAddress.h"
+#include "pcapplusplus/Layer.h"
+#include "pcapplusplus/IpAddress.h"
 
 /// @file
 /// This file contains classes for parsing, creating and editing Border Gateway Protocol (BGP) version 4 packets.
diff --git a/Packet++/header/CiscoHdlcLayer.h b/Packet++/header/pcapplusplus/CiscoHdlcLayer.h
similarity index 98%
rename from Packet++/header/CiscoHdlcLayer.h
rename to Packet++/header/pcapplusplus/CiscoHdlcLayer.h
index fe444bdf73..559675bcd3 100644
--- a/Packet++/header/CiscoHdlcLayer.h
+++ b/Packet++/header/pcapplusplus/CiscoHdlcLayer.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Layer.h"
+#include "pcapplusplus/Layer.h"
 
 namespace pcpp
 {
diff --git a/Packet++/header/CotpLayer.h b/Packet++/header/pcapplusplus/CotpLayer.h
similarity index 97%
rename from Packet++/header/CotpLayer.h
rename to Packet++/header/pcapplusplus/CotpLayer.h
index bbd2ec5f18..db81d565db 100644
--- a/Packet++/header/CotpLayer.h
+++ b/Packet++/header/pcapplusplus/CotpLayer.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "EthLayer.h"
-#include "Layer.h"
+#include "pcapplusplus/EthLayer.h"
+#include "pcapplusplus/Layer.h"
 
 /// @file
 
diff --git a/Packet++/header/DhcpLayer.h b/Packet++/header/pcapplusplus/DhcpLayer.h
similarity index 99%
rename from Packet++/header/DhcpLayer.h
rename to Packet++/header/pcapplusplus/DhcpLayer.h
index 34daea5b8c..47d1ba83a8 100644
--- a/Packet++/header/DhcpLayer.h
+++ b/Packet++/header/pcapplusplus/DhcpLayer.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include "Layer.h"
-#include "TLVData.h"
-#include "IpAddress.h"
-#include "MacAddress.h"
+#include "pcapplusplus/Layer.h"
+#include "pcapplusplus/TLVData.h"
+#include "pcapplusplus/IpAddress.h"
+#include "pcapplusplus/MacAddress.h"
 #include <string.h>
 
 /// @file
diff --git a/Packet++/header/DhcpV6Layer.h b/Packet++/header/pcapplusplus/DhcpV6Layer.h
similarity index 99%
rename from Packet++/header/DhcpV6Layer.h
rename to Packet++/header/pcapplusplus/DhcpV6Layer.h
index 019274d550..ca5a2d95b5 100644
--- a/Packet++/header/DhcpV6Layer.h
+++ b/Packet++/header/pcapplusplus/DhcpV6Layer.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "Layer.h"
-#include "TLVData.h"
+#include "pcapplusplus/Layer.h"
+#include "pcapplusplus/TLVData.h"
 
 /// @file
 
diff --git a/Packet++/header/DnsLayer.h b/Packet++/header/pcapplusplus/DnsLayer.h
similarity index 99%
rename from Packet++/header/DnsLayer.h
rename to Packet++/header/pcapplusplus/DnsLayer.h
index c79f269e27..fedabc76ac 100644
--- a/Packet++/header/DnsLayer.h
+++ b/Packet++/header/pcapplusplus/DnsLayer.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include "DnsLayerEnums.h"
-#include "DnsResource.h"
-#include "DnsResourceData.h"
-#include "Layer.h"
+#include "pcapplusplus/DnsLayerEnums.h"
+#include "pcapplusplus/DnsResource.h"
+#include "pcapplusplus/DnsResourceData.h"
+#include "pcapplusplus/Layer.h"
 
 /// @file
 
diff --git a/Packet++/header/DnsLayerEnums.h b/Packet++/header/pcapplusplus/DnsLayerEnums.h
similarity index 100%
rename from Packet++/header/DnsLayerEnums.h
rename to Packet++/header/pcapplusplus/DnsLayerEnums.h
diff --git a/Packet++/header/DnsResource.h b/Packet++/header/pcapplusplus/DnsResource.h
similarity index 98%
rename from Packet++/header/DnsResource.h
rename to Packet++/header/pcapplusplus/DnsResource.h
index 74d5796034..c30c89edd1 100644
--- a/Packet++/header/DnsResource.h
+++ b/Packet++/header/pcapplusplus/DnsResource.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "DnsLayer.h"
-#include "DnsLayerEnums.h"
-#include "DnsResourceData.h"
+#include "pcapplusplus/DnsLayer.h"
+#include "pcapplusplus/DnsLayerEnums.h"
+#include "pcapplusplus/DnsResourceData.h"
 #include <stdio.h>
 #include <string>
 #include <stdint.h>
diff --git a/Packet++/header/DnsResourceData.h b/Packet++/header/pcapplusplus/DnsResourceData.h
similarity index 99%
rename from Packet++/header/DnsResourceData.h
rename to Packet++/header/pcapplusplus/DnsResourceData.h
index fc68c26bb7..5a5d6afda3 100644
--- a/Packet++/header/DnsResourceData.h
+++ b/Packet++/header/pcapplusplus/DnsResourceData.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "DnsResource.h"
-#include "IpAddress.h"
+#include "pcapplusplus/DnsResource.h"
+#include "pcapplusplus/IpAddress.h"
 #include <memory>
 #include <string>
 #include <stdint.h>
diff --git a/Packet++/header/EthDot3Layer.h b/Packet++/header/pcapplusplus/EthDot3Layer.h
similarity index 98%
rename from Packet++/header/EthDot3Layer.h
rename to Packet++/header/pcapplusplus/EthDot3Layer.h
index c725cd86f4..94d9b208dd 100644
--- a/Packet++/header/EthDot3Layer.h
+++ b/Packet++/header/pcapplusplus/EthDot3Layer.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "Layer.h"
-#include "MacAddress.h"
+#include "pcapplusplus/Layer.h"
+#include "pcapplusplus/MacAddress.h"
 
 /// @file
 
diff --git a/Packet++/header/EthLayer.h b/Packet++/header/pcapplusplus/EthLayer.h
similarity index 98%
rename from Packet++/header/EthLayer.h
rename to Packet++/header/pcapplusplus/EthLayer.h
index 750dbfe691..2854fb7d8e 100644
--- a/Packet++/header/EthLayer.h
+++ b/Packet++/header/pcapplusplus/EthLayer.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "Layer.h"
-#include "MacAddress.h"
+#include "pcapplusplus/Layer.h"
+#include "pcapplusplus/MacAddress.h"
 
 /// @file
 
diff --git a/Packet++/header/FtpLayer.h b/Packet++/header/pcapplusplus/FtpLayer.h
similarity index 99%
rename from Packet++/header/FtpLayer.h
rename to Packet++/header/pcapplusplus/FtpLayer.h
index 63cd6565b4..5b7ea58711 100644
--- a/Packet++/header/FtpLayer.h
+++ b/Packet++/header/pcapplusplus/FtpLayer.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "SingleCommandTextProtocol.h"
-#include "PayloadLayer.h"
+#include "pcapplusplus/SingleCommandTextProtocol.h"
+#include "pcapplusplus/PayloadLayer.h"
 
 /// @file
 
diff --git a/Packet++/header/GreLayer.h b/Packet++/header/pcapplusplus/GreLayer.h
similarity index 99%
rename from Packet++/header/GreLayer.h
rename to Packet++/header/pcapplusplus/GreLayer.h
index 38c25d64a6..9e4a8e8889 100644
--- a/Packet++/header/GreLayer.h
+++ b/Packet++/header/pcapplusplus/GreLayer.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Layer.h"
+#include "pcapplusplus/Layer.h"
 
 /// @file
 
diff --git a/Packet++/header/GtpLayer.h b/Packet++/header/pcapplusplus/GtpLayer.h
similarity index 99%
rename from Packet++/header/GtpLayer.h
rename to Packet++/header/pcapplusplus/GtpLayer.h
index 91428fb3df..9d4795a867 100644
--- a/Packet++/header/GtpLayer.h
+++ b/Packet++/header/pcapplusplus/GtpLayer.h
@@ -1,10 +1,11 @@
 #pragma once
 
-#include "Layer.h"
-#include "TLVData.h"
 #include <vector>
 #include <bitset>
 
+#include "pcapplusplus/Layer.h"
+#include "pcapplusplus/TLVData.h"
+
 /// @file
 
 /// @namespace pcpp
diff --git a/Packet++/header/HttpLayer.h b/Packet++/header/pcapplusplus/HttpLayer.h
similarity index 99%
rename from Packet++/header/HttpLayer.h
rename to Packet++/header/pcapplusplus/HttpLayer.h
index fa5a2c1dcd..c71d14d35e 100644
--- a/Packet++/header/HttpLayer.h
+++ b/Packet++/header/pcapplusplus/HttpLayer.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "DeprecationUtils.h"
-#include "TextBasedProtocol.h"
+#include "pcapplusplus/DeprecationUtils.h"
+#include "pcapplusplus/TextBasedProtocol.h"
 #include <string>
 #include <exception>
 
diff --git a/Packet++/header/IPLayer.h b/Packet++/header/pcapplusplus/IPLayer.h
similarity index 96%
rename from Packet++/header/IPLayer.h
rename to Packet++/header/pcapplusplus/IPLayer.h
index 2c2278481c..21079c21de 100644
--- a/Packet++/header/IPLayer.h
+++ b/Packet++/header/pcapplusplus/IPLayer.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "IpAddress.h"
-#include "Layer.h"
+#include "pcapplusplus/IpAddress.h"
+#include "pcapplusplus/Layer.h"
 
 /// @file
 
diff --git a/Packet++/header/IPReassembly.h b/Packet++/header/pcapplusplus/IPReassembly.h
similarity index 99%
rename from Packet++/header/IPReassembly.h
rename to Packet++/header/pcapplusplus/IPReassembly.h
index 7edca76003..3132c19f53 100644
--- a/Packet++/header/IPReassembly.h
+++ b/Packet++/header/pcapplusplus/IPReassembly.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include "Packet.h"
-#include "LRUList.h"
-#include "IpAddress.h"
-#include "PointerVector.h"
+#include "pcapplusplus/Packet.h"
+#include "pcapplusplus/LRUList.h"
+#include "pcapplusplus/IpAddress.h"
+#include "pcapplusplus/PointerVector.h"
 #include <unordered_map>
 
 /// @file
diff --git a/Packet++/header/IPSecLayer.h b/Packet++/header/pcapplusplus/IPSecLayer.h
similarity index 99%
rename from Packet++/header/IPSecLayer.h
rename to Packet++/header/pcapplusplus/IPSecLayer.h
index b38cd3a54f..5501a5fb9c 100644
--- a/Packet++/header/IPSecLayer.h
+++ b/Packet++/header/pcapplusplus/IPSecLayer.h
@@ -2,7 +2,7 @@
 
 /// @file
 
-#include "Layer.h"
+#include "pcapplusplus/Layer.h"
 
 /// @namespace pcpp
 /// @brief The main namespace for the PcapPlusPlus lib
diff --git a/Packet++/header/IPv4Layer.h b/Packet++/header/pcapplusplus/IPv4Layer.h
similarity index 99%
rename from Packet++/header/IPv4Layer.h
rename to Packet++/header/pcapplusplus/IPv4Layer.h
index 20829b9f4e..8332c7591d 100644
--- a/Packet++/header/IPv4Layer.h
+++ b/Packet++/header/pcapplusplus/IPv4Layer.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include "Layer.h"
-#include "TLVData.h"
-#include "IpAddress.h"
-#include "IPLayer.h"
+#include "pcapplusplus/Layer.h"
+#include "pcapplusplus/TLVData.h"
+#include "pcapplusplus/IpAddress.h"
+#include "pcapplusplus/IPLayer.h"
 #include <string.h>
 #include <vector>
 
diff --git a/Packet++/header/IPv6Extensions.h b/Packet++/header/pcapplusplus/IPv6Extensions.h
similarity index 99%
rename from Packet++/header/IPv6Extensions.h
rename to Packet++/header/pcapplusplus/IPv6Extensions.h
index e03d32837d..d1caa190e7 100644
--- a/Packet++/header/IPv6Extensions.h
+++ b/Packet++/header/pcapplusplus/IPv6Extensions.h
@@ -1,9 +1,9 @@
 #pragma once
 
 #include <vector>
-#include "IpAddress.h"
-#include "Layer.h"
-#include "TLVData.h"
+#include "pcapplusplus/IpAddress.h"
+#include "pcapplusplus/Layer.h"
+#include "pcapplusplus/TLVData.h"
 
 /// @file
 
diff --git a/Packet++/header/IPv6Layer.h b/Packet++/header/pcapplusplus/IPv6Layer.h
similarity index 98%
rename from Packet++/header/IPv6Layer.h
rename to Packet++/header/pcapplusplus/IPv6Layer.h
index 87cffaafbe..3e2ebcab14 100644
--- a/Packet++/header/IPv6Layer.h
+++ b/Packet++/header/pcapplusplus/IPv6Layer.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include "Layer.h"
-#include "IPLayer.h"
-#include "IPv6Extensions.h"
-#include "IpAddress.h"
+#include "pcapplusplus/Layer.h"
+#include "pcapplusplus/IPLayer.h"
+#include "pcapplusplus/IPv6Extensions.h"
+#include "pcapplusplus/IpAddress.h"
 
 /// @file
 
diff --git a/Packet++/header/IcmpLayer.h b/Packet++/header/pcapplusplus/IcmpLayer.h
similarity index 99%
rename from Packet++/header/IcmpLayer.h
rename to Packet++/header/pcapplusplus/IcmpLayer.h
index 940aa8ce3d..7652bd703d 100644
--- a/Packet++/header/IcmpLayer.h
+++ b/Packet++/header/pcapplusplus/IcmpLayer.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "Layer.h"
-#include "IPv4Layer.h"
+#include "pcapplusplus/Layer.h"
+#include "pcapplusplus/IPv4Layer.h"
 #ifdef _MSC_VER
 #	include <winsock2.h>
 #else
diff --git a/Packet++/header/IcmpV6Layer.h b/Packet++/header/pcapplusplus/IcmpV6Layer.h
similarity index 99%
rename from Packet++/header/IcmpV6Layer.h
rename to Packet++/header/pcapplusplus/IcmpV6Layer.h
index 4038b5e2f2..7f49d0e515 100644
--- a/Packet++/header/IcmpV6Layer.h
+++ b/Packet++/header/pcapplusplus/IcmpV6Layer.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Layer.h"
+#include "pcapplusplus/Layer.h"
 
 /// @file
 
diff --git a/Packet++/header/IgmpLayer.h b/Packet++/header/pcapplusplus/IgmpLayer.h
similarity index 99%
rename from Packet++/header/IgmpLayer.h
rename to Packet++/header/pcapplusplus/IgmpLayer.h
index 45e00a391a..7d90b77583 100644
--- a/Packet++/header/IgmpLayer.h
+++ b/Packet++/header/pcapplusplus/IgmpLayer.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "Layer.h"
-#include "IpAddress.h"
+#include "pcapplusplus/Layer.h"
+#include "pcapplusplus/IpAddress.h"
 #include <vector>
 
 /// @file
diff --git a/Packet++/header/LLCLayer.h b/Packet++/header/pcapplusplus/LLCLayer.h
similarity index 98%
rename from Packet++/header/LLCLayer.h
rename to Packet++/header/pcapplusplus/LLCLayer.h
index ddaf7a99ad..8d4b37e550 100644
--- a/Packet++/header/LLCLayer.h
+++ b/Packet++/header/pcapplusplus/LLCLayer.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Layer.h"
+#include "pcapplusplus/Layer.h"
 
 /// @file
 
diff --git a/Packet++/header/Layer.h b/Packet++/header/pcapplusplus/Layer.h
similarity index 99%
rename from Packet++/header/Layer.h
rename to Packet++/header/pcapplusplus/Layer.h
index eeb7eaa238..6abd79e302 100644
--- a/Packet++/header/Layer.h
+++ b/Packet++/header/pcapplusplus/Layer.h
@@ -2,7 +2,7 @@
 
 #include <stdint.h>
 #include <stdio.h>
-#include "ProtocolType.h"
+#include "pcapplusplus/ProtocolType.h"
 #include <string>
 #include <stdexcept>
 #include <utility>
diff --git a/Packet++/header/LdapLayer.h b/Packet++/header/pcapplusplus/LdapLayer.h
similarity index 99%
rename from Packet++/header/LdapLayer.h
rename to Packet++/header/pcapplusplus/LdapLayer.h
index 4485d17c28..6c7f4a7636 100644
--- a/Packet++/header/LdapLayer.h
+++ b/Packet++/header/pcapplusplus/LdapLayer.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "Layer.h"
-#include "Asn1Codec.h"
+#include "pcapplusplus/Layer.h"
+#include "pcapplusplus/Asn1Codec.h"
 #include <ostream>
 #include <string>
 #include <functional>
diff --git a/Packet++/header/MplsLayer.h b/Packet++/header/pcapplusplus/MplsLayer.h
similarity index 99%
rename from Packet++/header/MplsLayer.h
rename to Packet++/header/pcapplusplus/MplsLayer.h
index 12ea1cd817..0dd153fde9 100644
--- a/Packet++/header/MplsLayer.h
+++ b/Packet++/header/pcapplusplus/MplsLayer.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Layer.h"
+#include "pcapplusplus/Layer.h"
 
 /// @file
 
diff --git a/Packet++/header/NdpLayer.h b/Packet++/header/pcapplusplus/NdpLayer.h
similarity index 98%
rename from Packet++/header/NdpLayer.h
rename to Packet++/header/pcapplusplus/NdpLayer.h
index e769f5a60f..166bbbe2f5 100644
--- a/Packet++/header/NdpLayer.h
+++ b/Packet++/header/pcapplusplus/NdpLayer.h
@@ -1,10 +1,10 @@
 #pragma once
 
-#include "IcmpV6Layer.h"
-#include "IpAddress.h"
-#include "Layer.h"
-#include "MacAddress.h"
-#include "TLVData.h"
+#include "pcapplusplus/IcmpV6Layer.h"
+#include "pcapplusplus/IpAddress.h"
+#include "pcapplusplus/Layer.h"
+#include "pcapplusplus/MacAddress.h"
+#include "pcapplusplus/TLVData.h"
 
 #include <vector>
 
diff --git a/Packet++/header/NflogLayer.h b/Packet++/header/pcapplusplus/NflogLayer.h
similarity index 98%
rename from Packet++/header/NflogLayer.h
rename to Packet++/header/pcapplusplus/NflogLayer.h
index ed997e50b5..972333cc83 100644
--- a/Packet++/header/NflogLayer.h
+++ b/Packet++/header/pcapplusplus/NflogLayer.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "Layer.h"
-#include "TLVData.h"
-#include "GeneralUtils.h"
+#include "pcapplusplus/Layer.h"
+#include "pcapplusplus/TLVData.h"
+#include "pcapplusplus/GeneralUtils.h"
 
 /// @file
 
diff --git a/Packet++/header/NtpLayer.h b/Packet++/header/pcapplusplus/NtpLayer.h
similarity index 99%
rename from Packet++/header/NtpLayer.h
rename to Packet++/header/pcapplusplus/NtpLayer.h
index 7dec0ae463..45d7c79317 100644
--- a/Packet++/header/NtpLayer.h
+++ b/Packet++/header/pcapplusplus/NtpLayer.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "Logger.h"
-#include "Layer.h"
-#include "IpAddress.h"
+#include "pcapplusplus/Logger.h"
+#include "pcapplusplus/Layer.h"
+#include "pcapplusplus/IpAddress.h"
 
 /// @file
 
diff --git a/Packet++/header/NullLoopbackLayer.h b/Packet++/header/pcapplusplus/NullLoopbackLayer.h
similarity index 98%
rename from Packet++/header/NullLoopbackLayer.h
rename to Packet++/header/pcapplusplus/NullLoopbackLayer.h
index 0903781771..fdd78b63d7 100644
--- a/Packet++/header/NullLoopbackLayer.h
+++ b/Packet++/header/pcapplusplus/NullLoopbackLayer.h
@@ -1,6 +1,8 @@
 #pragma once
 
-#include "Layer.h"
+/// @file
+
+#include "pcapplusplus/Layer.h"
 
 /// @file
 
diff --git a/Packet++/header/PPPoELayer.h b/Packet++/header/pcapplusplus/PPPoELayer.h
similarity index 99%
rename from Packet++/header/PPPoELayer.h
rename to Packet++/header/pcapplusplus/PPPoELayer.h
index aba14b0c8a..a0644886c3 100644
--- a/Packet++/header/PPPoELayer.h
+++ b/Packet++/header/pcapplusplus/PPPoELayer.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "Layer.h"
-#include "TLVData.h"
+#include "pcapplusplus/Layer.h"
+#include "pcapplusplus/TLVData.h"
 #include <vector>
 #include <string.h>
 
diff --git a/Packet++/header/Packet.h b/Packet++/header/pcapplusplus/Packet.h
similarity index 99%
rename from Packet++/header/Packet.h
rename to Packet++/header/pcapplusplus/Packet.h
index d8f66d18bf..80601007bd 100644
--- a/Packet++/header/Packet.h
+++ b/Packet++/header/pcapplusplus/Packet.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "RawPacket.h"
-#include "Layer.h"
+#include "pcapplusplus/RawPacket.h"
+#include "pcapplusplus/Layer.h"
 #include <vector>
 
 /// @file
diff --git a/Packet++/header/PacketTrailerLayer.h b/Packet++/header/pcapplusplus/PacketTrailerLayer.h
similarity index 98%
rename from Packet++/header/PacketTrailerLayer.h
rename to Packet++/header/pcapplusplus/PacketTrailerLayer.h
index fdcb8e6487..765eebbfa8 100644
--- a/Packet++/header/PacketTrailerLayer.h
+++ b/Packet++/header/pcapplusplus/PacketTrailerLayer.h
@@ -1,6 +1,8 @@
 #pragma once
 
-#include "Layer.h"
+/// @file
+
+#include "pcapplusplus/Layer.h"
 
 /// @file
 
diff --git a/Packet++/header/PacketUtils.h b/Packet++/header/pcapplusplus/PacketUtils.h
similarity index 97%
rename from Packet++/header/PacketUtils.h
rename to Packet++/header/pcapplusplus/PacketUtils.h
index 7be431337e..06b77c65ec 100644
--- a/Packet++/header/PacketUtils.h
+++ b/Packet++/header/pcapplusplus/PacketUtils.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "Packet.h"
-#include "IpAddress.h"
+#include "pcapplusplus/Packet.h"
+#include "pcapplusplus/IpAddress.h"
 
 /// @file
 
diff --git a/Packet++/header/PayloadLayer.h b/Packet++/header/pcapplusplus/PayloadLayer.h
similarity index 99%
rename from Packet++/header/PayloadLayer.h
rename to Packet++/header/pcapplusplus/PayloadLayer.h
index 2c760d1178..fe8b93866b 100644
--- a/Packet++/header/PayloadLayer.h
+++ b/Packet++/header/pcapplusplus/PayloadLayer.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Layer.h"
+#include "pcapplusplus/Layer.h"
 
 /// @file
 
diff --git a/Packet++/header/ProtocolType.h b/Packet++/header/pcapplusplus/ProtocolType.h
similarity index 100%
rename from Packet++/header/ProtocolType.h
rename to Packet++/header/pcapplusplus/ProtocolType.h
diff --git a/Packet++/header/RadiusLayer.h b/Packet++/header/pcapplusplus/RadiusLayer.h
similarity index 99%
rename from Packet++/header/RadiusLayer.h
rename to Packet++/header/pcapplusplus/RadiusLayer.h
index f65fb66b66..7b6513c582 100644
--- a/Packet++/header/RadiusLayer.h
+++ b/Packet++/header/pcapplusplus/RadiusLayer.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "Layer.h"
-#include "TLVData.h"
+#include "pcapplusplus/Layer.h"
+#include "pcapplusplus/TLVData.h"
 
 /// @file
 
diff --git a/Packet++/header/RawPacket.h b/Packet++/header/pcapplusplus/RawPacket.h
similarity index 100%
rename from Packet++/header/RawPacket.h
rename to Packet++/header/pcapplusplus/RawPacket.h
diff --git a/Packet++/header/S7CommLayer.h b/Packet++/header/pcapplusplus/S7CommLayer.h
similarity index 98%
rename from Packet++/header/S7CommLayer.h
rename to Packet++/header/pcapplusplus/S7CommLayer.h
index 6a65e7913b..e1031127c9 100644
--- a/Packet++/header/S7CommLayer.h
+++ b/Packet++/header/pcapplusplus/S7CommLayer.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "EthLayer.h"
-#include "Layer.h"
+#include "pcapplusplus/EthLayer.h"
+#include "pcapplusplus/Layer.h"
 
 /// @namespace pcpp
 /// @brief The main namespace for the PcapPlusPlus lib
diff --git a/Packet++/header/SSHLayer.h b/Packet++/header/pcapplusplus/SSHLayer.h
similarity index 99%
rename from Packet++/header/SSHLayer.h
rename to Packet++/header/pcapplusplus/SSHLayer.h
index ef07f14d5f..460ae9e95d 100644
--- a/Packet++/header/SSHLayer.h
+++ b/Packet++/header/pcapplusplus/SSHLayer.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Layer.h"
+#include "pcapplusplus/Layer.h"
 
 /// @file
 /// This file introduces classes and structures that represent the SSH (Secure Shell) protocol.
diff --git a/Packet++/header/SSLCommon.h b/Packet++/header/pcapplusplus/SSLCommon.h
similarity index 100%
rename from Packet++/header/SSLCommon.h
rename to Packet++/header/pcapplusplus/SSLCommon.h
diff --git a/Packet++/header/SSLHandshake.h b/Packet++/header/pcapplusplus/SSLHandshake.h
similarity index 99%
rename from Packet++/header/SSLHandshake.h
rename to Packet++/header/pcapplusplus/SSLHandshake.h
index 04b31dec04..8a7b0ad4e6 100644
--- a/Packet++/header/SSLHandshake.h
+++ b/Packet++/header/pcapplusplus/SSLHandshake.h
@@ -1,9 +1,9 @@
 #pragma once
 
 #include <utility>
-#include "SSLCommon.h"
-#include "PointerVector.h"
-#include "Asn1Codec.h"
+#include "pcapplusplus/SSLCommon.h"
+#include "pcapplusplus/PointerVector.h"
+#include "pcapplusplus/Asn1Codec.h"
 
 /// @file
 /// See detailed explanation of the TLS/SSL protocol support in PcapPlusPlus in SSLLayer.h
diff --git a/Packet++/header/SSLLayer.h b/Packet++/header/pcapplusplus/SSLLayer.h
similarity index 99%
rename from Packet++/header/SSLLayer.h
rename to Packet++/header/pcapplusplus/SSLLayer.h
index 5c7a5fc010..4fc6d46e96 100644
--- a/Packet++/header/SSLLayer.h
+++ b/Packet++/header/pcapplusplus/SSLLayer.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include "PointerVector.h"
-#include "Layer.h"
-#include "SSLCommon.h"
-#include "SSLHandshake.h"
+#include "pcapplusplus/PointerVector.h"
+#include "pcapplusplus/Layer.h"
+#include "pcapplusplus/SSLCommon.h"
+#include "pcapplusplus/SSLHandshake.h"
 
 #ifdef __GNUC__
 #	pragma GCC diagnostic push
diff --git a/Packet++/header/SdpLayer.h b/Packet++/header/pcapplusplus/SdpLayer.h
similarity index 98%
rename from Packet++/header/SdpLayer.h
rename to Packet++/header/pcapplusplus/SdpLayer.h
index 3e83a09c38..cb315ecc40 100644
--- a/Packet++/header/SdpLayer.h
+++ b/Packet++/header/pcapplusplus/SdpLayer.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "IpAddress.h"
-#include "TextBasedProtocol.h"
+#include "pcapplusplus/IpAddress.h"
+#include "pcapplusplus/TextBasedProtocol.h"
 #include <vector>
 
 /// @file
diff --git a/Packet++/header/SingleCommandTextProtocol.h b/Packet++/header/pcapplusplus/SingleCommandTextProtocol.h
similarity index 98%
rename from Packet++/header/SingleCommandTextProtocol.h
rename to Packet++/header/pcapplusplus/SingleCommandTextProtocol.h
index edf4fa88cc..0153c8e118 100644
--- a/Packet++/header/SingleCommandTextProtocol.h
+++ b/Packet++/header/pcapplusplus/SingleCommandTextProtocol.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <sstream>
-#include "Layer.h"
+#include "pcapplusplus/Layer.h"
 
 /// @file
 
diff --git a/Packet++/header/SipLayer.h b/Packet++/header/pcapplusplus/SipLayer.h
similarity index 99%
rename from Packet++/header/SipLayer.h
rename to Packet++/header/pcapplusplus/SipLayer.h
index bd25e4cd83..9f2302b453 100644
--- a/Packet++/header/SipLayer.h
+++ b/Packet++/header/pcapplusplus/SipLayer.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "TextBasedProtocol.h"
+#include "pcapplusplus/TextBasedProtocol.h"
 
 /// @file
 
diff --git a/Packet++/header/Sll2Layer.h b/Packet++/header/pcapplusplus/Sll2Layer.h
similarity index 98%
rename from Packet++/header/Sll2Layer.h
rename to Packet++/header/pcapplusplus/Sll2Layer.h
index 83a55253c2..cdc1ed5783 100644
--- a/Packet++/header/Sll2Layer.h
+++ b/Packet++/header/pcapplusplus/Sll2Layer.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "MacAddress.h"
-#include "Layer.h"
+#include "pcapplusplus/MacAddress.h"
+#include "pcapplusplus/Layer.h"
 
 /// @file
 
diff --git a/Packet++/header/SllLayer.h b/Packet++/header/pcapplusplus/SllLayer.h
similarity index 98%
rename from Packet++/header/SllLayer.h
rename to Packet++/header/pcapplusplus/SllLayer.h
index a97b83e983..d01b4fac91 100644
--- a/Packet++/header/SllLayer.h
+++ b/Packet++/header/pcapplusplus/SllLayer.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "MacAddress.h"
-#include "Layer.h"
+#include "pcapplusplus/MacAddress.h"
+#include "pcapplusplus/Layer.h"
 
 /// @file
 
diff --git a/Packet++/header/SmtpLayer.h b/Packet++/header/pcapplusplus/SmtpLayer.h
similarity index 99%
rename from Packet++/header/SmtpLayer.h
rename to Packet++/header/pcapplusplus/SmtpLayer.h
index 871a597233..016d6661ff 100644
--- a/Packet++/header/SmtpLayer.h
+++ b/Packet++/header/pcapplusplus/SmtpLayer.h
@@ -1,8 +1,8 @@
 #ifndef PACKETPP_SMTP_LAYER
 #define PACKETPP_SMTP_LAYER
 
-#include "PayloadLayer.h"
-#include "SingleCommandTextProtocol.h"
+#include "pcapplusplus/PayloadLayer.h"
+#include "pcapplusplus/SingleCommandTextProtocol.h"
 
 /// @file
 
diff --git a/Packet++/header/SomeIpLayer.h b/Packet++/header/pcapplusplus/SomeIpLayer.h
similarity index 99%
rename from Packet++/header/SomeIpLayer.h
rename to Packet++/header/pcapplusplus/SomeIpLayer.h
index 1f67adb9f0..c21a59970b 100644
--- a/Packet++/header/SomeIpLayer.h
+++ b/Packet++/header/pcapplusplus/SomeIpLayer.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Layer.h"
+#include "pcapplusplus/Layer.h"
 #include <unordered_set>
 
 /// @file
diff --git a/Packet++/header/SomeIpSdLayer.h b/Packet++/header/pcapplusplus/SomeIpSdLayer.h
similarity index 99%
rename from Packet++/header/SomeIpSdLayer.h
rename to Packet++/header/pcapplusplus/SomeIpSdLayer.h
index 5ea4cc1123..a31f1056b7 100644
--- a/Packet++/header/SomeIpSdLayer.h
+++ b/Packet++/header/pcapplusplus/SomeIpSdLayer.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "IpAddress.h"
-#include "Layer.h"
-#include "SomeIpLayer.h"
+#include "pcapplusplus/IpAddress.h"
+#include "pcapplusplus/Layer.h"
+#include "pcapplusplus/SomeIpLayer.h"
 #include <cstring>
 #include <iterator>
 #include <unordered_map>
diff --git a/Packet++/header/StpLayer.h b/Packet++/header/pcapplusplus/StpLayer.h
similarity index 99%
rename from Packet++/header/StpLayer.h
rename to Packet++/header/pcapplusplus/StpLayer.h
index 26c90312f4..82f4d78c2b 100644
--- a/Packet++/header/StpLayer.h
+++ b/Packet++/header/pcapplusplus/StpLayer.h
@@ -1,9 +1,10 @@
 #pragma once
 
-#include "Layer.h"
-#include "MacAddress.h"
 #include <cstring>
 
+#include "pcapplusplus/Layer.h"
+#include "pcapplusplus/MacAddress.h"
+
 /// @file
 
 /// @namespace pcpp
diff --git a/Packet++/header/TLVData.h b/Packet++/header/pcapplusplus/TLVData.h
similarity index 99%
rename from Packet++/header/TLVData.h
rename to Packet++/header/pcapplusplus/TLVData.h
index b24dd6f708..44da3a8059 100644
--- a/Packet++/header/TLVData.h
+++ b/Packet++/header/pcapplusplus/TLVData.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "Layer.h"
-#include "IpAddress.h"
+#include "pcapplusplus/Layer.h"
+#include "pcapplusplus/IpAddress.h"
 #include <string.h>
 
 /// @file
diff --git a/Packet++/header/TcpLayer.h b/Packet++/header/pcapplusplus/TcpLayer.h
similarity index 99%
rename from Packet++/header/TcpLayer.h
rename to Packet++/header/pcapplusplus/TcpLayer.h
index 43b0adac47..da59631d0e 100644
--- a/Packet++/header/TcpLayer.h
+++ b/Packet++/header/pcapplusplus/TcpLayer.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "DeprecationUtils.h"
-#include "Layer.h"
+#include "pcapplusplus/DeprecationUtils.h"
+#include "pcapplusplus/Layer.h"
 #include "TLVData.h"
 #include <string.h>
 
diff --git a/Packet++/header/TcpReassembly.h b/Packet++/header/pcapplusplus/TcpReassembly.h
similarity index 99%
rename from Packet++/header/TcpReassembly.h
rename to Packet++/header/pcapplusplus/TcpReassembly.h
index f0c3497722..66ffb1479c 100644
--- a/Packet++/header/TcpReassembly.h
+++ b/Packet++/header/pcapplusplus/TcpReassembly.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "Packet.h"
-#include "IpAddress.h"
-#include "PointerVector.h"
+#include "pcapplusplus/Packet.h"
+#include "pcapplusplus/IpAddress.h"
+#include "pcapplusplus/PointerVector.h"
 #include <unordered_map>
 #include <chrono>
 #include <map>
diff --git a/Packet++/header/TelnetLayer.h b/Packet++/header/pcapplusplus/TelnetLayer.h
similarity index 99%
rename from Packet++/header/TelnetLayer.h
rename to Packet++/header/pcapplusplus/TelnetLayer.h
index 6b56529b5c..4c5ef7f27d 100644
--- a/Packet++/header/TelnetLayer.h
+++ b/Packet++/header/pcapplusplus/TelnetLayer.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Layer.h"
+#include "pcapplusplus/Layer.h"
 
 /// @file
 
diff --git a/Packet++/header/TextBasedProtocol.h b/Packet++/header/pcapplusplus/TextBasedProtocol.h
similarity index 99%
rename from Packet++/header/TextBasedProtocol.h
rename to Packet++/header/pcapplusplus/TextBasedProtocol.h
index 67e109ca7f..30b2c00feb 100644
--- a/Packet++/header/TextBasedProtocol.h
+++ b/Packet++/header/pcapplusplus/TextBasedProtocol.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <map>
-#include "Layer.h"
+#include "pcapplusplus/Layer.h"
 
 /// @file
 
diff --git a/Packet++/header/TpktLayer.h b/Packet++/header/pcapplusplus/TpktLayer.h
similarity index 98%
rename from Packet++/header/TpktLayer.h
rename to Packet++/header/pcapplusplus/TpktLayer.h
index 073942ca54..4edb63e26a 100644
--- a/Packet++/header/TpktLayer.h
+++ b/Packet++/header/pcapplusplus/TpktLayer.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "EthLayer.h"
-#include "Layer.h"
+#include "pcapplusplus/EthLayer.h"
+#include "pcapplusplus/Layer.h"
 
 /// @file
 
diff --git a/Packet++/header/UdpLayer.h b/Packet++/header/pcapplusplus/UdpLayer.h
similarity index 98%
rename from Packet++/header/UdpLayer.h
rename to Packet++/header/pcapplusplus/UdpLayer.h
index c78bc2ded9..f16bc09748 100644
--- a/Packet++/header/UdpLayer.h
+++ b/Packet++/header/pcapplusplus/UdpLayer.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Layer.h"
+#include "pcapplusplus/Layer.h"
 
 /// @file
 
diff --git a/Packet++/header/VlanLayer.h b/Packet++/header/pcapplusplus/VlanLayer.h
similarity index 98%
rename from Packet++/header/VlanLayer.h
rename to Packet++/header/pcapplusplus/VlanLayer.h
index 238d36bd1d..dbc29d48b1 100644
--- a/Packet++/header/VlanLayer.h
+++ b/Packet++/header/pcapplusplus/VlanLayer.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "Layer.h"
-#include "EthLayer.h"
+#include "pcapplusplus/Layer.h"
+#include "pcapplusplus/EthLayer.h"
 
 /// @file
 
diff --git a/Packet++/header/VrrpLayer.h b/Packet++/header/pcapplusplus/VrrpLayer.h
similarity index 99%
rename from Packet++/header/VrrpLayer.h
rename to Packet++/header/pcapplusplus/VrrpLayer.h
index eb6f888d88..defe9fcd21 100644
--- a/Packet++/header/VrrpLayer.h
+++ b/Packet++/header/pcapplusplus/VrrpLayer.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "Layer.h"
-#include "IpAddress.h"
+#include "pcapplusplus/Layer.h"
+#include "pcapplusplus/IpAddress.h"
 #include <vector>
 
 /// @file
diff --git a/Packet++/header/VxlanLayer.h b/Packet++/header/pcapplusplus/VxlanLayer.h
similarity index 99%
rename from Packet++/header/VxlanLayer.h
rename to Packet++/header/pcapplusplus/VxlanLayer.h
index 0924dc5b3e..ff74833d2d 100644
--- a/Packet++/header/VxlanLayer.h
+++ b/Packet++/header/pcapplusplus/VxlanLayer.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Layer.h"
+#include "pcapplusplus/Layer.h"
 
 /// @file
 
diff --git a/Packet++/header/WakeOnLanLayer.h b/Packet++/header/pcapplusplus/WakeOnLanLayer.h
similarity index 97%
rename from Packet++/header/WakeOnLanLayer.h
rename to Packet++/header/pcapplusplus/WakeOnLanLayer.h
index 3e98acc46a..0425e8f298 100644
--- a/Packet++/header/WakeOnLanLayer.h
+++ b/Packet++/header/pcapplusplus/WakeOnLanLayer.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "IpAddress.h"
-#include "Layer.h"
-#include "MacAddress.h"
+#include "pcapplusplus/IpAddress.h"
+#include "pcapplusplus/Layer.h"
+#include "pcapplusplus/MacAddress.h"
 
 /// @file
 
diff --git a/Packet++/header/WireGuardLayer.h b/Packet++/header/pcapplusplus/WireGuardLayer.h
similarity index 99%
rename from Packet++/header/WireGuardLayer.h
rename to Packet++/header/pcapplusplus/WireGuardLayer.h
index 0d59287e93..8a968ca249 100644
--- a/Packet++/header/WireGuardLayer.h
+++ b/Packet++/header/pcapplusplus/WireGuardLayer.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "Layer.h"
-#include "IpAddress.h"
-#include "MacAddress.h"
+#include "pcapplusplus/Layer.h"
+#include "pcapplusplus/IpAddress.h"
+#include "pcapplusplus/MacAddress.h"
 
 /// @file
 
diff --git a/Packet++/src/ArpLayer.cpp b/Packet++/src/ArpLayer.cpp
index 0ae415d27f..10eaa4a2f6 100644
--- a/Packet++/src/ArpLayer.cpp
+++ b/Packet++/src/ArpLayer.cpp
@@ -1,7 +1,7 @@
 #define LOG_MODULE PacketLogModuleArpLayer
 
-#include "ArpLayer.h"
-#include "EthLayer.h"
+#include "pcapplusplus/ArpLayer.h"
+#include "pcapplusplus/EthLayer.h"
 #include "EndianPortable.h"
 
 namespace pcpp
diff --git a/Packet++/src/Asn1Codec.cpp b/Packet++/src/Asn1Codec.cpp
index ae260650f1..762114d06d 100644
--- a/Packet++/src/Asn1Codec.cpp
+++ b/Packet++/src/Asn1Codec.cpp
@@ -1,7 +1,7 @@
 #define LOG_MODULE PacketLogModuleAsn1Codec
 
-#include "Asn1Codec.h"
-#include "GeneralUtils.h"
+#include "pcapplusplus/Asn1Codec.h"
+#include "pcapplusplus/GeneralUtils.h"
 #include "EndianPortable.h"
 #include <unordered_map>
 #include <numeric>
diff --git a/Packet++/src/BgpLayer.cpp b/Packet++/src/BgpLayer.cpp
index b32ab8d010..b936fd7968 100644
--- a/Packet++/src/BgpLayer.cpp
+++ b/Packet++/src/BgpLayer.cpp
@@ -1,9 +1,9 @@
 #define LOG_MODULE PacketLogModuleBgpLayer
 
-#include "Logger.h"
-#include "BgpLayer.h"
+#include "pcapplusplus/Logger.h"
+#include "pcapplusplus/BgpLayer.h"
 #include "EndianPortable.h"
-#include "GeneralUtils.h"
+#include "pcapplusplus/GeneralUtils.h"
 
 namespace pcpp
 {
diff --git a/Packet++/src/CiscoHdlcLayer.cpp b/Packet++/src/CiscoHdlcLayer.cpp
index 7fac1ae5cd..9679f1f0a2 100644
--- a/Packet++/src/CiscoHdlcLayer.cpp
+++ b/Packet++/src/CiscoHdlcLayer.cpp
@@ -1,8 +1,8 @@
-#include "CiscoHdlcLayer.h"
-#include "Layer.h"
-#include "IPv4Layer.h"
-#include "IPv6Layer.h"
-#include "PayloadLayer.h"
+#include "pcapplusplus/CiscoHdlcLayer.h"
+#include "pcapplusplus/Layer.h"
+#include "pcapplusplus/IPv4Layer.h"
+#include "pcapplusplus/IPv6Layer.h"
+#include "pcapplusplus/PayloadLayer.h"
 #include "EndianPortable.h"
 #include <string.h>
 
diff --git a/Packet++/src/CotpLayer.cpp b/Packet++/src/CotpLayer.cpp
index 1183df5f13..19aadfbd2d 100644
--- a/Packet++/src/CotpLayer.cpp
+++ b/Packet++/src/CotpLayer.cpp
@@ -1,6 +1,6 @@
-#include "../header/CotpLayer.h"
-#include "S7CommLayer.h"
-#include <PayloadLayer.h>
+#include "pcapplusplus/CotpLayer.h"
+#include "pcapplusplus/S7CommLayer.h"
+#include "pcapplusplus/PayloadLayer.h"
 
 #include <cstring>
 
diff --git a/Packet++/src/DhcpLayer.cpp b/Packet++/src/DhcpLayer.cpp
index b5f15511fc..01c2abd578 100644
--- a/Packet++/src/DhcpLayer.cpp
+++ b/Packet++/src/DhcpLayer.cpp
@@ -1,7 +1,7 @@
 #define LOG_MODULE PacketLogModuleDhcpLayer
 
-#include "DhcpLayer.h"
-#include "Logger.h"
+#include "pcapplusplus/DhcpLayer.h"
+#include "pcapplusplus/Logger.h"
 
 namespace pcpp
 {
diff --git a/Packet++/src/DhcpV6Layer.cpp b/Packet++/src/DhcpV6Layer.cpp
index e6a2d2a0e5..44d1314ff9 100644
--- a/Packet++/src/DhcpV6Layer.cpp
+++ b/Packet++/src/DhcpV6Layer.cpp
@@ -1,8 +1,8 @@
 #define LOG_MODULE PacketLogModuleDhcpV6Layer
 
-#include "DhcpV6Layer.h"
-#include "Logger.h"
-#include "GeneralUtils.h"
+#include "pcapplusplus/DhcpV6Layer.h"
+#include "pcapplusplus/Logger.h"
+#include "pcapplusplus/GeneralUtils.h"
 #include "EndianPortable.h"
 
 namespace pcpp
diff --git a/Packet++/src/DnsLayer.cpp b/Packet++/src/DnsLayer.cpp
index bc6beeb5e9..f9d4588ddc 100644
--- a/Packet++/src/DnsLayer.cpp
+++ b/Packet++/src/DnsLayer.cpp
@@ -1,7 +1,7 @@
 #define LOG_MODULE PacketLogModuleDnsLayer
 
-#include "DnsLayer.h"
-#include "Logger.h"
+#include "pcapplusplus/DnsLayer.h"
+#include "pcapplusplus/Logger.h"
 #include <sstream>
 #include "EndianPortable.h"
 
diff --git a/Packet++/src/DnsResource.cpp b/Packet++/src/DnsResource.cpp
index aa102fa13e..19eb6b7c19 100644
--- a/Packet++/src/DnsResource.cpp
+++ b/Packet++/src/DnsResource.cpp
@@ -1,7 +1,7 @@
 #define LOG_MODULE PacketLogModuleDnsLayer
 
-#include "DnsResource.h"
-#include "Logger.h"
+#include "pcapplusplus/DnsResource.h"
+#include "pcapplusplus/Logger.h"
 #include <sstream>
 #include "EndianPortable.h"
 
diff --git a/Packet++/src/DnsResourceData.cpp b/Packet++/src/DnsResourceData.cpp
index 5365954639..e3600439d2 100644
--- a/Packet++/src/DnsResourceData.cpp
+++ b/Packet++/src/DnsResourceData.cpp
@@ -1,8 +1,8 @@
 #define LOG_MODULE PacketLogModuleDnsLayer
 
-#include "DnsResourceData.h"
-#include "Logger.h"
-#include "GeneralUtils.h"
+#include "pcapplusplus/DnsResourceData.h"
+#include "pcapplusplus/Logger.h"
+#include "pcapplusplus/GeneralUtils.h"
 #include <sstream>
 #include <utility>
 #include "EndianPortable.h"
diff --git a/Packet++/src/EthDot3Layer.cpp b/Packet++/src/EthDot3Layer.cpp
index 35d6d48b14..85b9de5d09 100644
--- a/Packet++/src/EthDot3Layer.cpp
+++ b/Packet++/src/EthDot3Layer.cpp
@@ -1,7 +1,7 @@
-#include "EthDot3Layer.h"
+#include "pcapplusplus/EthDot3Layer.h"
 #include "EndianPortable.h"
-#include "PayloadLayer.h"
-#include "LLCLayer.h"
+#include "pcapplusplus/PayloadLayer.h"
+#include "pcapplusplus/LLCLayer.h"
 
 #include <cstring>
 
diff --git a/Packet++/src/EthLayer.cpp b/Packet++/src/EthLayer.cpp
index 40954d3174..cf579f76ba 100644
--- a/Packet++/src/EthLayer.cpp
+++ b/Packet++/src/EthLayer.cpp
@@ -1,14 +1,14 @@
 #define LOG_MODULE PacketLogModuleEthLayer
 
-#include "EthLayer.h"
-#include "IPv4Layer.h"
-#include "IPv6Layer.h"
-#include "PayloadLayer.h"
-#include "ArpLayer.h"
-#include "VlanLayer.h"
-#include "PPPoELayer.h"
-#include "MplsLayer.h"
-#include "WakeOnLanLayer.h"
+#include "pcapplusplus/EthLayer.h"
+#include "pcapplusplus/IPv4Layer.h"
+#include "pcapplusplus/IPv6Layer.h"
+#include "pcapplusplus/PayloadLayer.h"
+#include "pcapplusplus/ArpLayer.h"
+#include "pcapplusplus/VlanLayer.h"
+#include "pcapplusplus/PPPoELayer.h"
+#include "pcapplusplus/MplsLayer.h"
+#include "pcapplusplus/WakeOnLanLayer.h"
 #include "EndianPortable.h"
 
 namespace pcpp
diff --git a/Packet++/src/FtpLayer.cpp b/Packet++/src/FtpLayer.cpp
index dba5828da4..47f1175f3c 100644
--- a/Packet++/src/FtpLayer.cpp
+++ b/Packet++/src/FtpLayer.cpp
@@ -1,6 +1,6 @@
 #define LOG_MODULE PacketLogModuleFtpLayer
 
-#include "FtpLayer.h"
+#include "pcapplusplus/FtpLayer.h"
 
 namespace pcpp
 {
diff --git a/Packet++/src/GreLayer.cpp b/Packet++/src/GreLayer.cpp
index 37eee3a879..cb41ea8406 100644
--- a/Packet++/src/GreLayer.cpp
+++ b/Packet++/src/GreLayer.cpp
@@ -1,16 +1,16 @@
 #define LOG_MODULE PacketLogModuleGreLayer
 
-#include "GreLayer.h"
-#include "EthLayer.h"
-#include "EthDot3Layer.h"
-#include "IPv4Layer.h"
-#include "IPv6Layer.h"
-#include "PPPoELayer.h"
-#include "VlanLayer.h"
-#include "MplsLayer.h"
-#include "PayloadLayer.h"
-#include "PacketUtils.h"
-#include "Logger.h"
+#include "pcapplusplus/GreLayer.h"
+#include "pcapplusplus/EthLayer.h"
+#include "pcapplusplus/EthDot3Layer.h"
+#include "pcapplusplus/IPv4Layer.h"
+#include "pcapplusplus/IPv6Layer.h"
+#include "pcapplusplus/PPPoELayer.h"
+#include "pcapplusplus/VlanLayer.h"
+#include "pcapplusplus/MplsLayer.h"
+#include "pcapplusplus/PayloadLayer.h"
+#include "pcapplusplus/PacketUtils.h"
+#include "pcapplusplus/Logger.h"
 #include "EndianPortable.h"
 
 // ==============
diff --git a/Packet++/src/GtpLayer.cpp b/Packet++/src/GtpLayer.cpp
index 97129b1418..851c63469a 100644
--- a/Packet++/src/GtpLayer.cpp
+++ b/Packet++/src/GtpLayer.cpp
@@ -2,11 +2,11 @@
 
 #include <unordered_map>
 #include <sstream>
-#include "Logger.h"
-#include "GtpLayer.h"
-#include "IPv4Layer.h"
-#include "IPv6Layer.h"
-#include "PayloadLayer.h"
+#include "pcapplusplus/Logger.h"
+#include "pcapplusplus/GtpLayer.h"
+#include "pcapplusplus/IPv4Layer.h"
+#include "pcapplusplus/IPv6Layer.h"
+#include "pcapplusplus/PayloadLayer.h"
 #include "EndianPortable.h"
 
 namespace pcpp
diff --git a/Packet++/src/HttpLayer.cpp b/Packet++/src/HttpLayer.cpp
index d3452b3aff..9ce2cf919b 100644
--- a/Packet++/src/HttpLayer.cpp
+++ b/Packet++/src/HttpLayer.cpp
@@ -1,8 +1,8 @@
 #define LOG_MODULE PacketLogModuleHttpLayer
 
-#include "Logger.h"
-#include "GeneralUtils.h"
-#include "HttpLayer.h"
+#include "pcapplusplus/Logger.h"
+#include "pcapplusplus/GeneralUtils.h"
+#include "pcapplusplus/HttpLayer.h"
 #include <cstring>
 #include <algorithm>
 #include <exception>
diff --git a/Packet++/src/IPLayer.cpp b/Packet++/src/IPLayer.cpp
index fc2d40d3e9..72c5916647 100644
--- a/Packet++/src/IPLayer.cpp
+++ b/Packet++/src/IPLayer.cpp
@@ -1,4 +1,4 @@
-#include "IPLayer.h"
+#include "pcapplusplus/IPLayer.h"
 
 namespace pcpp
 {
diff --git a/Packet++/src/IPReassembly.cpp b/Packet++/src/IPReassembly.cpp
index 6151d45ef7..505dcd1bc2 100644
--- a/Packet++/src/IPReassembly.cpp
+++ b/Packet++/src/IPReassembly.cpp
@@ -1,10 +1,10 @@
 #define LOG_MODULE PacketLogModuleIPReassembly
 
-#include "IPReassembly.h"
-#include "IPv4Layer.h"
-#include "IPv6Layer.h"
-#include "PacketUtils.h"
-#include "Logger.h"
+#include "pcapplusplus/IPReassembly.h"
+#include "pcapplusplus/IPv4Layer.h"
+#include "pcapplusplus/IPv6Layer.h"
+#include "pcapplusplus/PacketUtils.h"
+#include "pcapplusplus/Logger.h"
 #include "EndianPortable.h"
 
 namespace pcpp
diff --git a/Packet++/src/IPSecLayer.cpp b/Packet++/src/IPSecLayer.cpp
index 5f26dc0468..3b069e73a7 100644
--- a/Packet++/src/IPSecLayer.cpp
+++ b/Packet++/src/IPSecLayer.cpp
@@ -1,13 +1,13 @@
 #define LOG_MODULE PacketLogModuleIPSecLayer
 
 #include "EndianPortable.h"
-#include "GeneralUtils.h"
-#include "IPSecLayer.h"
-#include "IPv4Layer.h"
-#include "IPv6Layer.h"
-#include "UdpLayer.h"
-#include "TcpLayer.h"
-#include "PayloadLayer.h"
+#include "pcapplusplus/GeneralUtils.h"
+#include "pcapplusplus/IPSecLayer.h"
+#include "pcapplusplus/IPv4Layer.h"
+#include "pcapplusplus/IPv6Layer.h"
+#include "pcapplusplus/UdpLayer.h"
+#include "pcapplusplus/TcpLayer.h"
+#include "pcapplusplus/PayloadLayer.h"
 #include <sstream>
 
 namespace pcpp
diff --git a/Packet++/src/IPv4Layer.cpp b/Packet++/src/IPv4Layer.cpp
index 4a09134b96..718d46cb7e 100644
--- a/Packet++/src/IPv4Layer.cpp
+++ b/Packet++/src/IPv4Layer.cpp
@@ -1,18 +1,18 @@
 #define LOG_MODULE PacketLogModuleIPv4Layer
 
-#include "IPv4Layer.h"
-#include "IPv6Layer.h"
-#include "PayloadLayer.h"
-#include "UdpLayer.h"
-#include "TcpLayer.h"
-#include "IcmpLayer.h"
-#include "GreLayer.h"
-#include "IgmpLayer.h"
-#include "IPSecLayer.h"
-#include "VrrpLayer.h"
-#include "PacketUtils.h"
+#include "pcapplusplus/Logger.h"
+#include "pcapplusplus/IPv4Layer.h"
+#include "pcapplusplus/IPv6Layer.h"
+#include "pcapplusplus/PayloadLayer.h"
+#include "pcapplusplus/UdpLayer.h"
+#include "pcapplusplus/TcpLayer.h"
+#include "pcapplusplus/IcmpLayer.h"
+#include "pcapplusplus/GreLayer.h"
+#include "pcapplusplus/IgmpLayer.h"
+#include "pcapplusplus/IPSecLayer.h"
+#include "pcapplusplus/VrrpLayer.h"
+#include "pcapplusplus/PacketUtils.h"
 #include <sstream>
-#include "Logger.h"
 #include "EndianPortable.h"
 
 namespace pcpp
diff --git a/Packet++/src/IPv6Extensions.cpp b/Packet++/src/IPv6Extensions.cpp
index 7eb18db985..e9fbd68b5b 100644
--- a/Packet++/src/IPv6Extensions.cpp
+++ b/Packet++/src/IPv6Extensions.cpp
@@ -1,11 +1,11 @@
 #define LOG_MODULE PacketLogModuleIPv6ExtensionLayer
 
 #include "EndianPortable.h"
-#include "IPv6Extensions.h"
-#include "IPv6Layer.h"
-#include "IPv4Layer.h"
-#include "UdpLayer.h"
-#include "TcpLayer.h"
+#include "pcapplusplus/IPv6Extensions.h"
+#include "pcapplusplus/IPv6Layer.h"
+#include "pcapplusplus/IPv4Layer.h"
+#include "pcapplusplus/UdpLayer.h"
+#include "pcapplusplus/TcpLayer.h"
 
 namespace pcpp
 {
diff --git a/Packet++/src/IPv6Layer.cpp b/Packet++/src/IPv6Layer.cpp
index fb17d09051..ca513fb409 100644
--- a/Packet++/src/IPv6Layer.cpp
+++ b/Packet++/src/IPv6Layer.cpp
@@ -1,16 +1,16 @@
 #define LOG_MODULE PacketLogModuleIPv6Layer
 
 #include <stdexcept>
-#include "IPv6Layer.h"
-#include "IPv4Layer.h"
-#include "PayloadLayer.h"
-#include "UdpLayer.h"
-#include "TcpLayer.h"
-#include "GreLayer.h"
-#include "IPSecLayer.h"
-#include "IcmpV6Layer.h"
-#include "VrrpLayer.h"
-#include "Packet.h"
+#include "pcapplusplus/IPv6Layer.h"
+#include "pcapplusplus/IPv4Layer.h"
+#include "pcapplusplus/PayloadLayer.h"
+#include "pcapplusplus/UdpLayer.h"
+#include "pcapplusplus/TcpLayer.h"
+#include "pcapplusplus/GreLayer.h"
+#include "pcapplusplus/IPSecLayer.h"
+#include "pcapplusplus/IcmpV6Layer.h"
+#include "pcapplusplus/VrrpLayer.h"
+#include "pcapplusplus/Packet.h"
 #include "EndianPortable.h"
 
 namespace pcpp
diff --git a/Packet++/src/IcmpLayer.cpp b/Packet++/src/IcmpLayer.cpp
index a69f4a3769..83a52244cf 100644
--- a/Packet++/src/IcmpLayer.cpp
+++ b/Packet++/src/IcmpLayer.cpp
@@ -1,10 +1,10 @@
 #define LOG_MODULE PacketLogModuleIcmpLayer
 
-#include "IcmpLayer.h"
-#include "PayloadLayer.h"
-#include "Packet.h"
-#include "PacketUtils.h"
-#include "Logger.h"
+#include "pcapplusplus/IcmpLayer.h"
+#include "pcapplusplus/PayloadLayer.h"
+#include "pcapplusplus/Packet.h"
+#include "pcapplusplus/PacketUtils.h"
+#include "pcapplusplus/Logger.h"
 #include <sstream>
 #include "EndianPortable.h"
 
diff --git a/Packet++/src/IcmpV6Layer.cpp b/Packet++/src/IcmpV6Layer.cpp
index 000031845c..9838e0ad78 100644
--- a/Packet++/src/IcmpV6Layer.cpp
+++ b/Packet++/src/IcmpV6Layer.cpp
@@ -1,12 +1,12 @@
 #define LOG_MODULE PacketLogModuleIcmpV6Layer
 
-#include "IcmpV6Layer.h"
+#include "pcapplusplus/IcmpV6Layer.h"
 #include "EndianPortable.h"
-#include "IPv4Layer.h"
-#include "IPv6Layer.h"
-#include "NdpLayer.h"
-#include "PacketUtils.h"
-#include "PayloadLayer.h"
+#include "pcapplusplus/IPv4Layer.h"
+#include "pcapplusplus/IPv6Layer.h"
+#include "pcapplusplus/NdpLayer.h"
+#include "pcapplusplus/PacketUtils.h"
+#include "pcapplusplus/PayloadLayer.h"
 #include <sstream>
 
 // IcmpV6Layer
diff --git a/Packet++/src/IgmpLayer.cpp b/Packet++/src/IgmpLayer.cpp
index 141b7351f5..4aabc9f46f 100644
--- a/Packet++/src/IgmpLayer.cpp
+++ b/Packet++/src/IgmpLayer.cpp
@@ -1,8 +1,8 @@
 #define LOG_MODULE PacketLogModuleIgmpLayer
 
-#include "IgmpLayer.h"
-#include "PacketUtils.h"
-#include "Logger.h"
+#include "pcapplusplus/IgmpLayer.h"
+#include "pcapplusplus/PacketUtils.h"
+#include "pcapplusplus/Logger.h"
 #include "EndianPortable.h"
 
 namespace pcpp
diff --git a/Packet++/src/LLCLayer.cpp b/Packet++/src/LLCLayer.cpp
index 5cfe5d84da..d249f1e7e1 100644
--- a/Packet++/src/LLCLayer.cpp
+++ b/Packet++/src/LLCLayer.cpp
@@ -1,8 +1,8 @@
 #define LOG_MODULE PacketLogModuleLLCLayer
 
-#include "LLCLayer.h"
-#include "PayloadLayer.h"
-#include "StpLayer.h"
+#include "pcapplusplus/LLCLayer.h"
+#include "pcapplusplus/PayloadLayer.h"
+#include "pcapplusplus/StpLayer.h"
 
 #include <cstring>
 
diff --git a/Packet++/src/Layer.cpp b/Packet++/src/Layer.cpp
index ce1b0d6afa..58a6fd196a 100644
--- a/Packet++/src/Layer.cpp
+++ b/Packet++/src/Layer.cpp
@@ -1,8 +1,8 @@
 #define LOG_MODULE PacketLogModuleLayer
 
-#include "Layer.h"
-#include "Logger.h"
-#include "Packet.h"
+#include "pcapplusplus/Layer.h"
+#include "pcapplusplus/Logger.h"
+#include "pcapplusplus/Packet.h"
 #include <cstring>
 
 namespace pcpp
diff --git a/Packet++/src/LdapLayer.cpp b/Packet++/src/LdapLayer.cpp
index 9b16619e2f..ed49bb824d 100644
--- a/Packet++/src/LdapLayer.cpp
+++ b/Packet++/src/LdapLayer.cpp
@@ -1,5 +1,5 @@
-#include "LdapLayer.h"
-#include "GeneralUtils.h"
+#include "pcapplusplus/LdapLayer.h"
+#include "pcapplusplus/GeneralUtils.h"
 #include <unordered_map>
 
 namespace pcpp
diff --git a/Packet++/src/MplsLayer.cpp b/Packet++/src/MplsLayer.cpp
index fe57a68529..6addde6efe 100644
--- a/Packet++/src/MplsLayer.cpp
+++ b/Packet++/src/MplsLayer.cpp
@@ -1,10 +1,10 @@
 #define LOG_MODULE PacketLogModuleMplsLayer
 
-#include "MplsLayer.h"
-#include "IPv4Layer.h"
-#include "IPv6Layer.h"
-#include "PayloadLayer.h"
-#include "Logger.h"
+#include "pcapplusplus/MplsLayer.h"
+#include "pcapplusplus/IPv4Layer.h"
+#include "pcapplusplus/IPv6Layer.h"
+#include "pcapplusplus/PayloadLayer.h"
+#include "pcapplusplus/Logger.h"
 #include <sstream>
 #include "EndianPortable.h"
 
diff --git a/Packet++/src/NdpLayer.cpp b/Packet++/src/NdpLayer.cpp
index 38da82ec9e..14c7728005 100644
--- a/Packet++/src/NdpLayer.cpp
+++ b/Packet++/src/NdpLayer.cpp
@@ -1,7 +1,7 @@
 #define LOG_MODULE PacketLogModuleNdpLayer
 
-#include "NdpLayer.h"
-#include "Logger.h"
+#include "pcapplusplus/NdpLayer.h"
+#include "pcapplusplus/Logger.h"
 
 namespace pcpp
 {
diff --git a/Packet++/src/NflogLayer.cpp b/Packet++/src/NflogLayer.cpp
index 3dc6f94480..746e4ce421 100644
--- a/Packet++/src/NflogLayer.cpp
+++ b/Packet++/src/NflogLayer.cpp
@@ -1,10 +1,10 @@
 #define LOG_MODULE PacketLogModuleNflogLayer
 
-#include "NflogLayer.h"
-#include "IPv4Layer.h"
-#include "IPv6Layer.h"
-#include "PayloadLayer.h"
-#include "GeneralUtils.h"
+#include "pcapplusplus/NflogLayer.h"
+#include "pcapplusplus/IPv4Layer.h"
+#include "pcapplusplus/IPv6Layer.h"
+#include "pcapplusplus/PayloadLayer.h"
+#include "pcapplusplus/GeneralUtils.h"
 #include "EndianPortable.h"
 
 namespace pcpp
diff --git a/Packet++/src/NtpLayer.cpp b/Packet++/src/NtpLayer.cpp
index b7031be775..7193642c14 100644
--- a/Packet++/src/NtpLayer.cpp
+++ b/Packet++/src/NtpLayer.cpp
@@ -1,9 +1,9 @@
 #define LOG_MODULE PacketLogModuleNtpLayer
 
-#include "Logger.h"
-#include "NtpLayer.h"
-#include "SystemUtils.h"
-#include "GeneralUtils.h"
+#include "pcapplusplus/Logger.h"
+#include "pcapplusplus/NtpLayer.h"
+#include "pcapplusplus/SystemUtils.h"
+#include "pcapplusplus/GeneralUtils.h"
 #include <cmath>
 
 /// 2^16 as a double
diff --git a/Packet++/src/NullLoopbackLayer.cpp b/Packet++/src/NullLoopbackLayer.cpp
index 2717d8ff6c..a9db51b423 100644
--- a/Packet++/src/NullLoopbackLayer.cpp
+++ b/Packet++/src/NullLoopbackLayer.cpp
@@ -1,8 +1,8 @@
-#include "NullLoopbackLayer.h"
-#include "EthLayer.h"
-#include "IPv4Layer.h"
-#include "IPv6Layer.h"
-#include "PayloadLayer.h"
+#include "pcapplusplus/NullLoopbackLayer.h"
+#include "pcapplusplus/EthLayer.h"
+#include "pcapplusplus/IPv4Layer.h"
+#include "pcapplusplus/IPv6Layer.h"
+#include "pcapplusplus/PayloadLayer.h"
 
 namespace pcpp
 {
diff --git a/Packet++/src/PPPoELayer.cpp b/Packet++/src/PPPoELayer.cpp
index c30625cfd9..f5bfb5c006 100644
--- a/Packet++/src/PPPoELayer.cpp
+++ b/Packet++/src/PPPoELayer.cpp
@@ -1,10 +1,10 @@
 #define LOG_MODULE PacketLogModulePPPoELayer
 
-#include "PPPoELayer.h"
-#include "IPv4Layer.h"
-#include "IPv6Layer.h"
-#include "PayloadLayer.h"
-#include "Logger.h"
+#include "pcapplusplus/PPPoELayer.h"
+#include "pcapplusplus/IPv4Layer.h"
+#include "pcapplusplus/IPv6Layer.h"
+#include "pcapplusplus/PayloadLayer.h"
+#include "pcapplusplus/Logger.h"
 #include <unordered_map>
 #include <sstream>
 #include "EndianPortable.h"
diff --git a/Packet++/src/Packet.cpp b/Packet++/src/Packet.cpp
index c0754a8126..efc73b5564 100644
--- a/Packet++/src/Packet.cpp
+++ b/Packet++/src/Packet.cpp
@@ -1,23 +1,23 @@
 #define LOG_MODULE PacketLogModulePacket
 
-#include "Packet.h"
-#include "EthLayer.h"
-#include "EthDot3Layer.h"
-#include "SllLayer.h"
-#include "Sll2Layer.h"
-#include "NflogLayer.h"
-#include "NullLoopbackLayer.h"
-#include "IPv4Layer.h"
-#include "IPv6Layer.h"
-#include "CiscoHdlcLayer.h"
-#include "PayloadLayer.h"
-#include "PacketTrailerLayer.h"
-#include "Logger.h"
+#include "pcapplusplus/Packet.h"
+#include "pcapplusplus/EthLayer.h"
+#include "pcapplusplus/EthDot3Layer.h"
+#include "pcapplusplus/SllLayer.h"
+#include "pcapplusplus/Sll2Layer.h"
+#include "pcapplusplus/NflogLayer.h"
+#include "pcapplusplus/NullLoopbackLayer.h"
+#include "pcapplusplus/IPv4Layer.h"
+#include "pcapplusplus/IPv6Layer.h"
+#include "pcapplusplus/CiscoHdlcLayer.h"
+#include "pcapplusplus/PayloadLayer.h"
+#include "pcapplusplus/PacketTrailerLayer.h"
+#include "pcapplusplus/Logger.h"
 #include <numeric>
 #include <sstream>
 #ifdef _MSC_VER
 #	include <time.h>
-#	include "SystemUtils.h"
+#	include "pcapplusplus/SystemUtils.h"
 #endif
 
 namespace pcpp
diff --git a/Packet++/src/PacketTrailerLayer.cpp b/Packet++/src/PacketTrailerLayer.cpp
index f937680de1..8f1bb9cd77 100644
--- a/Packet++/src/PacketTrailerLayer.cpp
+++ b/Packet++/src/PacketTrailerLayer.cpp
@@ -1,5 +1,5 @@
-#include "PacketTrailerLayer.h"
-#include "GeneralUtils.h"
+#include "pcapplusplus/PacketTrailerLayer.h"
+#include "pcapplusplus/GeneralUtils.h"
 #include <sstream>
 
 namespace pcpp
diff --git a/Packet++/src/PacketUtils.cpp b/Packet++/src/PacketUtils.cpp
index fda7a9bc40..066774e9fd 100644
--- a/Packet++/src/PacketUtils.cpp
+++ b/Packet++/src/PacketUtils.cpp
@@ -1,9 +1,9 @@
-#include "PacketUtils.h"
-#include "IPv4Layer.h"
-#include "IPv6Layer.h"
-#include "TcpLayer.h"
-#include "UdpLayer.h"
-#include "Logger.h"
+#include "pcapplusplus/PacketUtils.h"
+#include "pcapplusplus/IPv4Layer.h"
+#include "pcapplusplus/IPv6Layer.h"
+#include "pcapplusplus/TcpLayer.h"
+#include "pcapplusplus/UdpLayer.h"
+#include "pcapplusplus/Logger.h"
 #include "EndianPortable.h"
 
 namespace pcpp
diff --git a/Packet++/src/PayloadLayer.cpp b/Packet++/src/PayloadLayer.cpp
index e94a4b4bd9..b204169cd5 100644
--- a/Packet++/src/PayloadLayer.cpp
+++ b/Packet++/src/PayloadLayer.cpp
@@ -1,7 +1,7 @@
 #define LOG_MODULE PacketLogModulePayloadLayer
 
-#include "PayloadLayer.h"
-#include "GeneralUtils.h"
+#include "pcapplusplus/PayloadLayer.h"
+#include "pcapplusplus/GeneralUtils.h"
 #include <sstream>
 #include <cstring>
 
diff --git a/Packet++/src/RadiusLayer.cpp b/Packet++/src/RadiusLayer.cpp
index 72a8a656f6..80dbe656ed 100644
--- a/Packet++/src/RadiusLayer.cpp
+++ b/Packet++/src/RadiusLayer.cpp
@@ -1,7 +1,7 @@
 #define LOG_MODULE PacketLogModuleRadiusLayer
-#include "RadiusLayer.h"
-#include "Logger.h"
-#include "GeneralUtils.h"
+#include "pcapplusplus/RadiusLayer.h"
+#include "pcapplusplus/Logger.h"
+#include "pcapplusplus/GeneralUtils.h"
 #include <sstream>
 #include "EndianPortable.h"
 
diff --git a/Packet++/src/RawPacket.cpp b/Packet++/src/RawPacket.cpp
index 4eb36b31a6..21c77aa5b8 100644
--- a/Packet++/src/RawPacket.cpp
+++ b/Packet++/src/RawPacket.cpp
@@ -1,8 +1,8 @@
 #define LOG_MODULE PacketLogModuleRawPacket
 
-#include "RawPacket.h"
-#include "Logger.h"
-#include "TimespecTimeval.h"
+#include "pcapplusplus/RawPacket.h"
+#include "pcapplusplus/Logger.h"
+#include "pcapplusplus/TimespecTimeval.h"
 #include <cstring>
 
 namespace pcpp
diff --git a/Packet++/src/S7CommLayer.cpp b/Packet++/src/S7CommLayer.cpp
index 0affaa8145..1119ad6128 100644
--- a/Packet++/src/S7CommLayer.cpp
+++ b/Packet++/src/S7CommLayer.cpp
@@ -1,6 +1,6 @@
 #include "EndianPortable.h"
 
-#include "S7CommLayer.h"
+#include "pcapplusplus/S7CommLayer.h"
 #include <iostream>
 #include <cstring>
 #include <sstream>
diff --git a/Packet++/src/SSHLayer.cpp b/Packet++/src/SSHLayer.cpp
index 468f91b6c1..48e6875bd1 100644
--- a/Packet++/src/SSHLayer.cpp
+++ b/Packet++/src/SSHLayer.cpp
@@ -1,8 +1,8 @@
 #define LOG_MODULE PacketLogModuleSSHLayer
 
-#include "SSHLayer.h"
-#include "GeneralUtils.h"
-#include "Logger.h"
+#include "pcapplusplus/SSHLayer.h"
+#include "pcapplusplus/GeneralUtils.h"
+#include "pcapplusplus/Logger.h"
 #include "EndianPortable.h"
 #include <cstring>
 
diff --git a/Packet++/src/SSLCommon.cpp b/Packet++/src/SSLCommon.cpp
index 1ddd0bea97..5b3680330e 100644
--- a/Packet++/src/SSLCommon.cpp
+++ b/Packet++/src/SSLCommon.cpp
@@ -1,6 +1,6 @@
 #define LOG_MODULE PacketLogModuleSSLLayer
 
-#include "SSLCommon.h"
+#include "pcapplusplus/SSLCommon.h"
 
 namespace pcpp
 {
diff --git a/Packet++/src/SSLHandshake.cpp b/Packet++/src/SSLHandshake.cpp
index d7a0328517..25b2b979f2 100644
--- a/Packet++/src/SSLHandshake.cpp
+++ b/Packet++/src/SSLHandshake.cpp
@@ -7,8 +7,8 @@
 #include <set>
 #include <utility>
 #include <cstring>
-#include "Logger.h"
-#include "SSLHandshake.h"
+#include "pcapplusplus/Logger.h"
+#include "pcapplusplus/SSLHandshake.h"
 
 namespace pcpp
 {
diff --git a/Packet++/src/SSLLayer.cpp b/Packet++/src/SSLLayer.cpp
index e83b789c07..7c8a8d901f 100644
--- a/Packet++/src/SSLLayer.cpp
+++ b/Packet++/src/SSLLayer.cpp
@@ -1,6 +1,6 @@
 #define LOG_MODULE PacketLogModuleSSLLayer
 
-#include "SSLLayer.h"
+#include "pcapplusplus/SSLLayer.h"
 #include "EndianPortable.h"
 #include <sstream>
 
diff --git a/Packet++/src/SdpLayer.cpp b/Packet++/src/SdpLayer.cpp
index 5fa2fd0e94..884fae76ba 100644
--- a/Packet++/src/SdpLayer.cpp
+++ b/Packet++/src/SdpLayer.cpp
@@ -1,7 +1,7 @@
 #define LOG_MODULE PacketLogModuleSdpLayer
 
-#include "SdpLayer.h"
-#include "Logger.h"
+#include "pcapplusplus/SdpLayer.h"
+#include "pcapplusplus/Logger.h"
 #include <sstream>
 
 namespace pcpp
diff --git a/Packet++/src/SingleCommandTextProtocol.cpp b/Packet++/src/SingleCommandTextProtocol.cpp
index ebb3b3cd81..6c700eef7f 100644
--- a/Packet++/src/SingleCommandTextProtocol.cpp
+++ b/Packet++/src/SingleCommandTextProtocol.cpp
@@ -1,4 +1,4 @@
-#include "SingleCommandTextProtocol.h"
+#include "pcapplusplus/SingleCommandTextProtocol.h"
 #include <cstring>
 #include <algorithm>
 #include <vector>
diff --git a/Packet++/src/SipLayer.cpp b/Packet++/src/SipLayer.cpp
index ac9acb1289..7962ef2458 100644
--- a/Packet++/src/SipLayer.cpp
+++ b/Packet++/src/SipLayer.cpp
@@ -1,10 +1,10 @@
 #define LOG_MODULE PacketLogModuleSipLayer
 
-#include "SipLayer.h"
-#include "SdpLayer.h"
-#include "PayloadLayer.h"
-#include "Logger.h"
-#include "GeneralUtils.h"
+#include "pcapplusplus/SipLayer.h"
+#include "pcapplusplus/SdpLayer.h"
+#include "pcapplusplus/PayloadLayer.h"
+#include "pcapplusplus/Logger.h"
+#include "pcapplusplus/GeneralUtils.h"
 #include <algorithm>
 #include <exception>
 #include <utility>
diff --git a/Packet++/src/Sll2Layer.cpp b/Packet++/src/Sll2Layer.cpp
index 8bcbd3cedd..e987a6cbf7 100644
--- a/Packet++/src/Sll2Layer.cpp
+++ b/Packet++/src/Sll2Layer.cpp
@@ -1,14 +1,14 @@
 #define LOG_MODULE PacketLogModuleSll2Layer
 
-#include "Sll2Layer.h"
-#include "Logger.h"
-#include "IPv4Layer.h"
-#include "IPv6Layer.h"
-#include "PayloadLayer.h"
-#include "ArpLayer.h"
-#include "VlanLayer.h"
-#include "PPPoELayer.h"
-#include "MplsLayer.h"
+#include "pcapplusplus/Sll2Layer.h"
+#include "pcapplusplus/Logger.h"
+#include "pcapplusplus/IPv4Layer.h"
+#include "pcapplusplus/IPv6Layer.h"
+#include "pcapplusplus/PayloadLayer.h"
+#include "pcapplusplus/ArpLayer.h"
+#include "pcapplusplus/VlanLayer.h"
+#include "pcapplusplus/PPPoELayer.h"
+#include "pcapplusplus/MplsLayer.h"
 #include "EndianPortable.h"
 
 namespace pcpp
diff --git a/Packet++/src/SllLayer.cpp b/Packet++/src/SllLayer.cpp
index 1f5b9daa84..395e6bf9a0 100644
--- a/Packet++/src/SllLayer.cpp
+++ b/Packet++/src/SllLayer.cpp
@@ -1,14 +1,14 @@
 #define LOG_MODULE PacketLogModuleSllLayer
 
-#include "SllLayer.h"
-#include "Logger.h"
-#include "IPv4Layer.h"
-#include "IPv6Layer.h"
-#include "PayloadLayer.h"
-#include "ArpLayer.h"
-#include "VlanLayer.h"
-#include "PPPoELayer.h"
-#include "MplsLayer.h"
+#include "pcapplusplus/SllLayer.h"
+#include "pcapplusplus/Logger.h"
+#include "pcapplusplus/IPv4Layer.h"
+#include "pcapplusplus/IPv6Layer.h"
+#include "pcapplusplus/PayloadLayer.h"
+#include "pcapplusplus/ArpLayer.h"
+#include "pcapplusplus/VlanLayer.h"
+#include "pcapplusplus/PPPoELayer.h"
+#include "pcapplusplus/MplsLayer.h"
 #include "EndianPortable.h"
 
 namespace pcpp
diff --git a/Packet++/src/SmtpLayer.cpp b/Packet++/src/SmtpLayer.cpp
index bf2a703637..f2d0d3f026 100644
--- a/Packet++/src/SmtpLayer.cpp
+++ b/Packet++/src/SmtpLayer.cpp
@@ -1,6 +1,6 @@
 #define LOG_MODULE PacketLogModuleSmtpLayer
 
-#include "SmtpLayer.h"
+#include "pcapplusplus/SmtpLayer.h"
 
 #include <algorithm>
 
diff --git a/Packet++/src/SomeIpLayer.cpp b/Packet++/src/SomeIpLayer.cpp
index 1c7bdec1c3..f8bbc7eb16 100644
--- a/Packet++/src/SomeIpLayer.cpp
+++ b/Packet++/src/SomeIpLayer.cpp
@@ -1,9 +1,9 @@
 #define LOG_MODULE PacketLogModuleSomeIpLayer
 
-#include "SomeIpLayer.h"
-#include "SomeIpSdLayer.h"
-#include "Packet.h"
-#include "PayloadLayer.h"
+#include "pcapplusplus/SomeIpLayer.h"
+#include "pcapplusplus/SomeIpSdLayer.h"
+#include "pcapplusplus/Packet.h"
+#include "pcapplusplus/PayloadLayer.h"
 #include "EndianPortable.h"
 #include <algorithm>
 #include <sstream>
diff --git a/Packet++/src/SomeIpSdLayer.cpp b/Packet++/src/SomeIpSdLayer.cpp
index b92edf5552..bb322339be 100644
--- a/Packet++/src/SomeIpSdLayer.cpp
+++ b/Packet++/src/SomeIpSdLayer.cpp
@@ -1,6 +1,6 @@
 #define LOG_MODULE PacketLogModuleSomeIpSdLayer
 
-#include "SomeIpSdLayer.h"
+#include "pcapplusplus/SomeIpSdLayer.h"
 #include "EndianPortable.h"
 #include <algorithm>
 #include <sstream>
diff --git a/Packet++/src/StpLayer.cpp b/Packet++/src/StpLayer.cpp
index 147395018d..d08f209356 100644
--- a/Packet++/src/StpLayer.cpp
+++ b/Packet++/src/StpLayer.cpp
@@ -1,9 +1,9 @@
 #define LOG_MODULE PacketLogModuleStpLayer
 
-#include "StpLayer.h"
-#include "PayloadLayer.h"
+#include "pcapplusplus/StpLayer.h"
+#include "pcapplusplus/PayloadLayer.h"
 #include "EndianPortable.h"
-#include "Logger.h"
+#include "pcapplusplus/Logger.h"
 
 namespace pcpp
 {
diff --git a/Packet++/src/TLVData.cpp b/Packet++/src/TLVData.cpp
index 48da747aa2..65caadaf21 100644
--- a/Packet++/src/TLVData.cpp
+++ b/Packet++/src/TLVData.cpp
@@ -1,5 +1,5 @@
-#include "TLVData.h"
-#include "GeneralUtils.h"
+#include "pcapplusplus/TLVData.h"
+#include "pcapplusplus/GeneralUtils.h"
 #include "EndianPortable.h"
 
 namespace pcpp
diff --git a/Packet++/src/TcpLayer.cpp b/Packet++/src/TcpLayer.cpp
index 5fe34027ba..d20c92f52f 100644
--- a/Packet++/src/TcpLayer.cpp
+++ b/Packet++/src/TcpLayer.cpp
@@ -1,26 +1,26 @@
 #define LOG_MODULE PacketLogModuleTcpLayer
 
 #include "EndianPortable.h"
-#include "TcpLayer.h"
-#include "IPv4Layer.h"
-#include "IPv6Layer.h"
-#include "PayloadLayer.h"
-#include "HttpLayer.h"
-#include "SSLLayer.h"
-#include "SipLayer.h"
-#include "BgpLayer.h"
-#include "SSHLayer.h"
-#include "DnsLayer.h"
-#include "TelnetLayer.h"
-#include "TpktLayer.h"
-#include "FtpLayer.h"
-#include "SomeIpLayer.h"
-#include "SmtpLayer.h"
-#include "LdapLayer.h"
-#include "GtpLayer.h"
-#include "PacketUtils.h"
-#include "Logger.h"
-#include "DeprecationUtils.h"
+#include "pcapplusplus/TcpLayer.h"
+#include "pcapplusplus/IPv4Layer.h"
+#include "pcapplusplus/IPv6Layer.h"
+#include "pcapplusplus/PayloadLayer.h"
+#include "pcapplusplus/HttpLayer.h"
+#include "pcapplusplus/SSLLayer.h"
+#include "pcapplusplus/SipLayer.h"
+#include "pcapplusplus/BgpLayer.h"
+#include "pcapplusplus/SSHLayer.h"
+#include "pcapplusplus/DnsLayer.h"
+#include "pcapplusplus/TelnetLayer.h"
+#include "pcapplusplus/TpktLayer.h"
+#include "pcapplusplus/FtpLayer.h"
+#include "pcapplusplus/SomeIpLayer.h"
+#include "pcapplusplus/SmtpLayer.h"
+#include "pcapplusplus/LdapLayer.h"
+#include "pcapplusplus/GtpLayer.h"
+#include "pcapplusplus/PacketUtils.h"
+#include "pcapplusplus/Logger.h"
+#include "pcapplusplus/DeprecationUtils.h"
 #include <sstream>
 
 namespace pcpp
diff --git a/Packet++/src/TcpReassembly.cpp b/Packet++/src/TcpReassembly.cpp
index 002f59454c..97855a7582 100644
--- a/Packet++/src/TcpReassembly.cpp
+++ b/Packet++/src/TcpReassembly.cpp
@@ -1,14 +1,14 @@
 #define LOG_MODULE PacketLogModuleTcpReassembly
 
-#include "TcpReassembly.h"
-#include "TcpLayer.h"
-#include "IPLayer.h"
-#include "PacketUtils.h"
-#include "Logger.h"
+#include "pcapplusplus/TcpReassembly.h"
+#include "pcapplusplus/TcpLayer.h"
+#include "pcapplusplus/IPLayer.h"
+#include "pcapplusplus/PacketUtils.h"
+#include "pcapplusplus/Logger.h"
 #include <sstream>
 #include <vector>
 #include "EndianPortable.h"
-#include "TimespecTimeval.h"
+#include "pcapplusplus/TimespecTimeval.h"
 #ifdef _MSC_VER
 #	include <time.h>
 #endif
diff --git a/Packet++/src/TelnetLayer.cpp b/Packet++/src/TelnetLayer.cpp
index 3f3dec8e22..65efc0796b 100644
--- a/Packet++/src/TelnetLayer.cpp
+++ b/Packet++/src/TelnetLayer.cpp
@@ -1,8 +1,8 @@
 #define LOG_MODULE PacketLogModuleTelnetLayer
 
-#include "TelnetLayer.h"
-#include "Logger.h"
-#include "GeneralUtils.h"
+#include "pcapplusplus/TelnetLayer.h"
+#include "pcapplusplus/Logger.h"
+#include "pcapplusplus/GeneralUtils.h"
 #include <cstring>
 
 namespace pcpp
diff --git a/Packet++/src/TextBasedProtocol.cpp b/Packet++/src/TextBasedProtocol.cpp
index 1d35996384..c28644a3dc 100644
--- a/Packet++/src/TextBasedProtocol.cpp
+++ b/Packet++/src/TextBasedProtocol.cpp
@@ -1,6 +1,6 @@
-#include "TextBasedProtocol.h"
-#include "Logger.h"
-#include "PayloadLayer.h"
+#include "pcapplusplus/TextBasedProtocol.h"
+#include "pcapplusplus/Logger.h"
+#include "pcapplusplus/PayloadLayer.h"
 #include <cstring>
 #include <algorithm>
 #include <utility>
diff --git a/Packet++/src/TpktLayer.cpp b/Packet++/src/TpktLayer.cpp
index c3fe3a9ff7..bf54665e28 100644
--- a/Packet++/src/TpktLayer.cpp
+++ b/Packet++/src/TpktLayer.cpp
@@ -1,7 +1,8 @@
-#include "TpktLayer.h"
+#include "pcapplusplus/TpktLayer.h"
+#include "pcapplusplus/TcpLayer.h"
+#include "pcapplusplus/CotpLayer.h"
+#include "pcapplusplus/PayloadLayer.h"
 #include "EndianPortable.h"
-#include "CotpLayer.h"
-#include "PayloadLayer.h"
 #include <cstring>
 #include <sstream>
 
diff --git a/Packet++/src/UdpLayer.cpp b/Packet++/src/UdpLayer.cpp
index 9cfaa2cbe0..1106f3b389 100644
--- a/Packet++/src/UdpLayer.cpp
+++ b/Packet++/src/UdpLayer.cpp
@@ -1,23 +1,23 @@
 #define LOG_MODULE PacketLogModuleUdpLayer
 
 #include "EndianPortable.h"
-#include "UdpLayer.h"
-#include "PayloadLayer.h"
-#include "IPv4Layer.h"
-#include "IPv6Layer.h"
-#include "DnsLayer.h"
-#include "DhcpLayer.h"
-#include "DhcpV6Layer.h"
-#include "VxlanLayer.h"
-#include "SipLayer.h"
-#include "RadiusLayer.h"
-#include "GtpLayer.h"
-#include "NtpLayer.h"
-#include "SomeIpLayer.h"
-#include "WakeOnLanLayer.h"
-#include "WireGuardLayer.h"
-#include "PacketUtils.h"
-#include "Logger.h"
+#include "pcapplusplus/UdpLayer.h"
+#include "pcapplusplus/PayloadLayer.h"
+#include "pcapplusplus/IPv4Layer.h"
+#include "pcapplusplus/IPv6Layer.h"
+#include "pcapplusplus/DnsLayer.h"
+#include "pcapplusplus/DhcpLayer.h"
+#include "pcapplusplus/DhcpV6Layer.h"
+#include "pcapplusplus/VxlanLayer.h"
+#include "pcapplusplus/SipLayer.h"
+#include "pcapplusplus/RadiusLayer.h"
+#include "pcapplusplus/GtpLayer.h"
+#include "pcapplusplus/NtpLayer.h"
+#include "pcapplusplus/SomeIpLayer.h"
+#include "pcapplusplus/WakeOnLanLayer.h"
+#include "pcapplusplus/WireGuardLayer.h"
+#include "pcapplusplus/PacketUtils.h"
+#include "pcapplusplus/Logger.h"
 #include <sstream>
 
 namespace pcpp
diff --git a/Packet++/src/VlanLayer.cpp b/Packet++/src/VlanLayer.cpp
index f12ca798ae..d33532dc6e 100644
--- a/Packet++/src/VlanLayer.cpp
+++ b/Packet++/src/VlanLayer.cpp
@@ -1,13 +1,13 @@
 #define LOG_MODULE PacketLogModuleVlanLayer
 
-#include "VlanLayer.h"
-#include "IPv4Layer.h"
-#include "IPv6Layer.h"
-#include "PayloadLayer.h"
-#include "ArpLayer.h"
-#include "PPPoELayer.h"
-#include "MplsLayer.h"
-#include "LLCLayer.h"
+#include "pcapplusplus/VlanLayer.h"
+#include "pcapplusplus/IPv4Layer.h"
+#include "pcapplusplus/IPv6Layer.h"
+#include "pcapplusplus/PayloadLayer.h"
+#include "pcapplusplus/ArpLayer.h"
+#include "pcapplusplus/PPPoELayer.h"
+#include "pcapplusplus/MplsLayer.h"
+#include "pcapplusplus/LLCLayer.h"
 #include <sstream>
 #include "EndianPortable.h"
 
diff --git a/Packet++/src/VrrpLayer.cpp b/Packet++/src/VrrpLayer.cpp
index d40ab6770d..cb3b7b16a3 100644
--- a/Packet++/src/VrrpLayer.cpp
+++ b/Packet++/src/VrrpLayer.cpp
@@ -1,12 +1,12 @@
 #define LOG_MODULE PacketLogModuleVrrpLayer
 
-#include <SystemUtils.h>
-#include "PacketUtils.h"
-#include "Logger.h"
+#include "pcapplusplus/SystemUtils.h"
+#include "pcapplusplus/PacketUtils.h"
+#include "pcapplusplus/Logger.h"
 #include "EndianPortable.h"
-#include "IPv4Layer.h"
-#include "PayloadLayer.h"
-#include "VrrpLayer.h"
+#include "pcapplusplus/IPv4Layer.h"
+#include "pcapplusplus/PayloadLayer.h"
+#include "pcapplusplus/VrrpLayer.h"
 
 namespace pcpp
 {
diff --git a/Packet++/src/VxlanLayer.cpp b/Packet++/src/VxlanLayer.cpp
index 6001b4197b..48891e1989 100644
--- a/Packet++/src/VxlanLayer.cpp
+++ b/Packet++/src/VxlanLayer.cpp
@@ -1,5 +1,5 @@
-#include "VxlanLayer.h"
-#include "EthLayer.h"
+#include "pcapplusplus/VxlanLayer.h"
+#include "pcapplusplus/EthLayer.h"
 #include "EndianPortable.h"
 
 #include <cstring>
diff --git a/Packet++/src/WakeOnLanLayer.cpp b/Packet++/src/WakeOnLanLayer.cpp
index 1175375d5a..ae1a4cc313 100644
--- a/Packet++/src/WakeOnLanLayer.cpp
+++ b/Packet++/src/WakeOnLanLayer.cpp
@@ -1,8 +1,8 @@
 #define LOG_MODULE PacketLogModuleWakeOnLanLayer
 
-#include "WakeOnLanLayer.h"
-#include "GeneralUtils.h"
-#include "Logger.h"
+#include "pcapplusplus/WakeOnLanLayer.h"
+#include "pcapplusplus/GeneralUtils.h"
+#include "pcapplusplus/Logger.h"
 
 namespace pcpp
 {
diff --git a/Packet++/src/WireGuardLayer.cpp b/Packet++/src/WireGuardLayer.cpp
index a00bbf6b99..839eec78fa 100644
--- a/Packet++/src/WireGuardLayer.cpp
+++ b/Packet++/src/WireGuardLayer.cpp
@@ -1,7 +1,7 @@
 #define LOG_MODULE PacketLogModuleWireGuardLayer
 
-#include "UdpLayer.h"
-#include "WireGuardLayer.h"
+#include "pcapplusplus/UdpLayer.h"
+#include "pcapplusplus/WireGuardLayer.h"
 #include "EndianPortable.h"
 #include <iomanip>
 
diff --git a/Pcap++/CMakeLists.txt b/Pcap++/CMakeLists.txt
index 9b15306b11..ba913cceb9 100644
--- a/Pcap++/CMakeLists.txt
+++ b/Pcap++/CMakeLists.txt
@@ -27,42 +27,56 @@ add_library(
 
 set(
   public_headers
-  header/Device.h
-  header/NetworkUtils.h
-  header/PcapDevice.h
-  header/PcapFileDevice.h
-  header/PcapFilter.h
-  header/PcapLiveDevice.h
-  header/PcapLiveDeviceList.h
-  header/RawSocketDevice.h
+  header/pcapplusplus/Device.h
+  header/pcapplusplus/NetworkUtils.h
+  header/pcapplusplus/PcapDevice.h
+  header/pcapplusplus/PcapFileDevice.h
+  header/pcapplusplus/PcapFilter.h
+  header/pcapplusplus/PcapLiveDevice.h
+  header/pcapplusplus/PcapLiveDeviceList.h
+  header/pcapplusplus/RawSocketDevice.h
 )
 
 if(PCAPPP_USE_DPDK)
-  list(APPEND public_headers header/DpdkDevice.h header/DpdkDeviceList.h header/MBufRawPacket.h)
+  list(
+    APPEND
+    public_headers
+    header/pcapplusplus/DpdkDevice.h
+    header/pcapplusplus/DpdkDeviceList.h
+    header/pcapplusplus/MBufRawPacket.h
+  )
 endif()
 
 if(PCAPPP_USE_DPDK_KNI)
-  list(APPEND public_headers header/KniDevice.h header/KniDeviceList.h)
+  list(APPEND public_headers header/pcapplusplus/KniDevice.h header/pcapplusplus/KniDeviceList.h)
 endif()
 
 if(PCAPPP_USE_PF_RING)
-  list(APPEND public_headers header/PfRingDevice.h header/PfRingDeviceList.h)
+  list(APPEND public_headers header/pcapplusplus/PfRingDevice.h header/pcapplusplus/PfRingDeviceList.h)
 endif()
 
 if(PCAPPP_USE_XDP)
-  list(APPEND public_headers header/XdpDevice.h)
+  list(APPEND public_headers header/pcapplusplus/XdpDevice.h)
 endif()
 
 if(LINUX)
-  list(APPEND public_headers header/LinuxNicInformationSocket.h)
+  list(APPEND public_headers header/pcapplusplus/LinuxNicInformationSocket.h)
 endif()
 
 if(WIN32)
-  list(APPEND public_headers header/PcapRemoteDevice.h header/PcapRemoteDeviceList.h header/WinPcapLiveDevice.h)
+  list(
+    APPEND
+    public_headers
+    header/pcapplusplus/WinPcapLiveDevice.h
+    header/pcapplusplus/PcapRemoteDevice.h
+    header/pcapplusplus/PcapRemoteDeviceList.h
+  )
 endif()
 
 set_property(TARGET Pcap++ PROPERTY PUBLIC_HEADER ${public_headers})
 
+set_target_properties(Pcap++ PROPERTIES PCAPPP_ENABLE_OLD_STYLE_INCLUDE "${PCAPPP_ENABLE_OLD_STYLE_INCLUDE}")
+
 target_compile_features(Pcap++ PUBLIC cxx_std_11)
 
 if(APPLE)
@@ -76,7 +90,10 @@ endif()
 
 target_include_directories(
   Pcap++
-  PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/header> $<INSTALL_INTERFACE:include/pcapplusplus>
+  PUBLIC
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/header>
+    $<INSTALL_INTERFACE:include>
+    $<$<BOOL:$<TARGET_PROPERTY:Pcap++,PCAPPP_ENABLE_OLD_STYLE_INCLUDE>>:$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/header/pcapplusplus>$<INSTALL_INTERFACE:include/pcapplusplus>>
   # Don't link with EndianPortable nor Light_PcapNG as they won't be exported
   PRIVATE
     $<TARGET_PROPERTY:EndianPortable,INTERFACE_INCLUDE_DIRECTORIES>
diff --git a/Pcap++/header/Device.h b/Pcap++/header/pcapplusplus/Device.h
similarity index 95%
rename from Pcap++/header/Device.h
rename to Pcap++/header/pcapplusplus/Device.h
index ac493066e7..5e67272482 100644
--- a/Pcap++/header/Device.h
+++ b/Pcap++/header/pcapplusplus/Device.h
@@ -2,9 +2,9 @@
 
 /// @file
 
-#include "PointerVector.h"
-#include "RawPacket.h"
-#include "PcapFilter.h"
+#include "pcapplusplus/PointerVector.h"
+#include "pcapplusplus/RawPacket.h"
+#include "pcapplusplus/PcapFilter.h"
 
 /// @namespace pcpp
 /// @brief The main namespace for the PcapPlusPlus lib
diff --git a/Pcap++/header/DeviceUtils.h b/Pcap++/header/pcapplusplus/DeviceUtils.h
similarity index 88%
rename from Pcap++/header/DeviceUtils.h
rename to Pcap++/header/pcapplusplus/DeviceUtils.h
index d5525defe5..e54b90302b 100644
--- a/Pcap++/header/DeviceUtils.h
+++ b/Pcap++/header/pcapplusplus/DeviceUtils.h
@@ -3,8 +3,8 @@
 /// @file
 
 #include <memory>
-#include "IpAddress.h"
-#include "PcapUtils.h"
+#include "pcapplusplus/IpAddress.h"
+#include "pcapplusplus/PcapUtils.h"
 
 /// @namespace pcpp
 /// @brief The main namespace for the PcapPlusPlus lib
diff --git a/Pcap++/header/DpdkDevice.h b/Pcap++/header/pcapplusplus/DpdkDevice.h
similarity index 99%
rename from Pcap++/header/DpdkDevice.h
rename to Pcap++/header/pcapplusplus/DpdkDevice.h
index 1bd58c4be6..6df802afcd 100644
--- a/Pcap++/header/DpdkDevice.h
+++ b/Pcap++/header/pcapplusplus/DpdkDevice.h
@@ -5,10 +5,10 @@
 #include <pthread.h>
 #include <time.h>
 #include <vector>
-#include "MacAddress.h"
-#include "SystemUtils.h"
-#include "Device.h"
-#include "MBufRawPacket.h"
+#include "pcapplusplus/MacAddress.h"
+#include "pcapplusplus/SystemUtils.h"
+#include "pcapplusplus/Device.h"
+#include "pcapplusplus/MBufRawPacket.h"
 
 /// @file
 /// This file and DpdkDeviceList.h provide PcapPlusPlus C++ wrapper for DPDK (stands for data-plan development kit).
diff --git a/Pcap++/header/DpdkDeviceList.h b/Pcap++/header/pcapplusplus/DpdkDeviceList.h
similarity index 98%
rename from Pcap++/header/DpdkDeviceList.h
rename to Pcap++/header/pcapplusplus/DpdkDeviceList.h
index 2d91f91ef7..f73e41c806 100644
--- a/Pcap++/header/DpdkDeviceList.h
+++ b/Pcap++/header/pcapplusplus/DpdkDeviceList.h
@@ -2,9 +2,9 @@
 
 // GCOVR_EXCL_START
 
-#include "SystemUtils.h"
-#include "DpdkDevice.h"
-#include "Logger.h"
+#include "pcapplusplus/SystemUtils.h"
+#include "pcapplusplus/DpdkDevice.h"
+#include "pcapplusplus/Logger.h"
 #include <vector>
 
 /// @file
diff --git a/Pcap++/header/KniDevice.h b/Pcap++/header/pcapplusplus/KniDevice.h
similarity index 99%
rename from Pcap++/header/KniDevice.h
rename to Pcap++/header/pcapplusplus/KniDevice.h
index 64d3099e15..e292c3dd9a 100644
--- a/Pcap++/header/KniDevice.h
+++ b/Pcap++/header/pcapplusplus/KniDevice.h
@@ -5,10 +5,10 @@
 #include <string>
 #include <atomic>
 
-#include "Device.h"
-#include "MacAddress.h"
-#include "MBufRawPacket.h"
-#include "LinuxNicInformationSocket.h"
+#include "pcapplusplus/Device.h"
+#include "pcapplusplus/MacAddress.h"
+#include "pcapplusplus/MBufRawPacket.h"
+#include "pcapplusplus/LinuxNicInformationSocket.h"
 
 /// @file
 /// @brief This file and KniDeviceList.h provide PcapPlusPlus C++ wrapper
diff --git a/Pcap++/header/KniDeviceList.h b/Pcap++/header/pcapplusplus/KniDeviceList.h
similarity index 98%
rename from Pcap++/header/KniDeviceList.h
rename to Pcap++/header/pcapplusplus/KniDeviceList.h
index bfd2386fd6..6801a03d67 100644
--- a/Pcap++/header/KniDeviceList.h
+++ b/Pcap++/header/pcapplusplus/KniDeviceList.h
@@ -4,8 +4,8 @@
 
 #include <vector>
 
-#include "KniDevice.h"
-#include "DpdkDeviceList.h"
+#include "pcapplusplus/KniDevice.h"
+#include "pcapplusplus/DpdkDeviceList.h"
 
 /// @namespace pcpp
 /// @brief The main namespace for the PcapPlusPlus lib
diff --git a/Pcap++/header/LinuxNicInformationSocket.h b/Pcap++/header/pcapplusplus/LinuxNicInformationSocket.h
similarity index 100%
rename from Pcap++/header/LinuxNicInformationSocket.h
rename to Pcap++/header/pcapplusplus/LinuxNicInformationSocket.h
diff --git a/Pcap++/header/MBufRawPacket.h b/Pcap++/header/pcapplusplus/MBufRawPacket.h
similarity index 99%
rename from Pcap++/header/MBufRawPacket.h
rename to Pcap++/header/pcapplusplus/MBufRawPacket.h
index 4568ee9d46..3c096f3bcb 100644
--- a/Pcap++/header/MBufRawPacket.h
+++ b/Pcap++/header/pcapplusplus/MBufRawPacket.h
@@ -3,8 +3,8 @@
 // GCOVR_EXCL_START
 
 #include <time.h>
-#include "Packet.h"
-#include "PointerVector.h"
+#include "pcapplusplus/Packet.h"
+#include "pcapplusplus/PointerVector.h"
 
 struct rte_mbuf;
 struct rte_mempool;
diff --git a/Pcap++/header/NetworkUtils.h b/Pcap++/header/pcapplusplus/NetworkUtils.h
similarity index 97%
rename from Pcap++/header/NetworkUtils.h
rename to Pcap++/header/pcapplusplus/NetworkUtils.h
index d6aebd50b9..b8cab945d5 100644
--- a/Pcap++/header/NetworkUtils.h
+++ b/Pcap++/header/pcapplusplus/NetworkUtils.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "MacAddress.h"
-#include "IpAddress.h"
-#include "PcapLiveDevice.h"
+#include "pcapplusplus/MacAddress.h"
+#include "pcapplusplus/IpAddress.h"
+#include "pcapplusplus/PcapLiveDevice.h"
 
 /// @file
 
diff --git a/Pcap++/header/PcapDevice.h b/Pcap++/header/pcapplusplus/PcapDevice.h
similarity index 99%
rename from Pcap++/header/PcapDevice.h
rename to Pcap++/header/pcapplusplus/PcapDevice.h
index 7352ef9c28..5c7e12e008 100644
--- a/Pcap++/header/PcapDevice.h
+++ b/Pcap++/header/pcapplusplus/PcapDevice.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Device.h"
+#include "pcapplusplus/Device.h"
 
 // forward declaration for the pcap descriptor defined in pcap.h
 struct pcap;
diff --git a/Pcap++/header/PcapFileDevice.h b/Pcap++/header/pcapplusplus/PcapFileDevice.h
similarity index 98%
rename from Pcap++/header/PcapFileDevice.h
rename to Pcap++/header/pcapplusplus/PcapFileDevice.h
index a6172d5792..750d5742fe 100644
--- a/Pcap++/header/PcapFileDevice.h
+++ b/Pcap++/header/pcapplusplus/PcapFileDevice.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "PcapDevice.h"
-#include "RawPacket.h"
+#include "pcapplusplus/PcapDevice.h"
+#include "pcapplusplus/RawPacket.h"
 #include <fstream>
 
 // forward declaration for structs and typedefs defined in pcap.h
@@ -102,7 +102,7 @@ namespace pcpp
 		/// A constructor for this class that gets the pcap full path file name to open. Notice that after calling this
 		/// constructor the file isn't opened yet, so reading packets will fail. For opening the file call open()
 		/// @param[in] fileName The full path of the file to read
-		PcapFileReaderDevice(const std::string& fileName)
+		explicit PcapFileReaderDevice(const std::string& fileName)
 		    : IFileReaderDevice(fileName), m_Precision(FileTimestampPrecision::Unknown),
 		      m_PcapLinkLayerType(LINKTYPE_ETHERNET)
 		{}
@@ -185,7 +185,7 @@ namespace pcpp
 		/// A constructor for this class that gets the snoop full path file name to open. Notice that after calling this
 		/// constructor the file isn't opened yet, so reading packets will fail. For opening the file call open()
 		/// @param[in] fileName The full path of the file to read
-		SnoopFileReaderDevice(const std::string& fileName)
+		explicit SnoopFileReaderDevice(const std::string& fileName)
 		    : IFileReaderDevice(fileName), m_PcapLinkLayerType(LINKTYPE_ETHERNET)
 		{}
 
@@ -237,7 +237,7 @@ namespace pcpp
 		/// A constructor for this class that gets the pcap-ng full path file name to open. Notice that after calling
 		/// this constructor the file isn't opened yet, so reading packets will fail. For opening the file call open()
 		/// @param[in] fileName The full path of the file to read
-		PcapNgFileReaderDevice(const std::string& fileName);
+		explicit PcapNgFileReaderDevice(const std::string& fileName);
 
 		/// A destructor for this class
 		virtual ~PcapNgFileReaderDevice()
diff --git a/Pcap++/header/PcapFilter.h b/Pcap++/header/pcapplusplus/PcapFilter.h
similarity index 99%
rename from Pcap++/header/PcapFilter.h
rename to Pcap++/header/pcapplusplus/PcapFilter.h
index e11a54a33d..b3040a372d 100644
--- a/Pcap++/header/PcapFilter.h
+++ b/Pcap++/header/pcapplusplus/PcapFilter.h
@@ -3,10 +3,10 @@
 #include <string>
 #include <vector>
 #include <memory>
-#include "ProtocolType.h"
+#include "pcapplusplus/ProtocolType.h"
 #include <stdint.h>
-#include "ArpLayer.h"
-#include "RawPacket.h"
+#include "pcapplusplus/ArpLayer.h"
+#include "pcapplusplus/RawPacket.h"
 
 // Forward Declaration - used in GeneralFilter
 struct bpf_program;
diff --git a/Pcap++/header/PcapLiveDevice.h b/Pcap++/header/pcapplusplus/PcapLiveDevice.h
similarity index 99%
rename from Pcap++/header/PcapLiveDevice.h
rename to Pcap++/header/pcapplusplus/PcapLiveDevice.h
index ad1d0445a6..e5999c2238 100644
--- a/Pcap++/header/PcapLiveDevice.h
+++ b/Pcap++/header/pcapplusplus/PcapLiveDevice.h
@@ -5,8 +5,8 @@
 #include <thread>
 #include <functional>
 
-#include "IpAddress.h"
-#include "PcapDevice.h"
+#include "pcapplusplus/IpAddress.h"
+#include "pcapplusplus/PcapDevice.h"
 
 // forward declarations for structs and typedefs that are defined in pcap.h
 struct pcap_if;
diff --git a/Pcap++/header/PcapLiveDeviceList.h b/Pcap++/header/pcapplusplus/PcapLiveDeviceList.h
similarity index 98%
rename from Pcap++/header/PcapLiveDeviceList.h
rename to Pcap++/header/pcapplusplus/PcapLiveDeviceList.h
index bb4a842d6d..8b0636c7cd 100644
--- a/Pcap++/header/PcapLiveDeviceList.h
+++ b/Pcap++/header/pcapplusplus/PcapLiveDeviceList.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "IpAddress.h"
-#include "PcapLiveDevice.h"
+#include "pcapplusplus/IpAddress.h"
+#include "pcapplusplus/PcapLiveDevice.h"
 #include <vector>
 #include <memory>
 
diff --git a/Pcap++/header/PcapRemoteDevice.h b/Pcap++/header/pcapplusplus/PcapRemoteDevice.h
similarity index 100%
rename from Pcap++/header/PcapRemoteDevice.h
rename to Pcap++/header/pcapplusplus/PcapRemoteDevice.h
diff --git a/Pcap++/header/PcapRemoteDeviceList.h b/Pcap++/header/pcapplusplus/PcapRemoteDeviceList.h
similarity index 98%
rename from Pcap++/header/PcapRemoteDeviceList.h
rename to Pcap++/header/pcapplusplus/PcapRemoteDeviceList.h
index b8a07bbf50..831a6e7eac 100644
--- a/Pcap++/header/PcapRemoteDeviceList.h
+++ b/Pcap++/header/pcapplusplus/PcapRemoteDeviceList.h
@@ -1,9 +1,9 @@
 #pragma once
 
 #include <memory>
-#include "IpAddress.h"
-#include "PcapRemoteDevice.h"
-#include "DeprecationUtils.h"
+#include "pcapplusplus/IpAddress.h"
+#include "pcapplusplus/PcapRemoteDevice.h"
+#include "pcapplusplus/DeprecationUtils.h"
 
 /// @file
 
diff --git a/Pcap++/header/PcapUtils.h b/Pcap++/header/pcapplusplus/PcapUtils.h
similarity index 100%
rename from Pcap++/header/PcapUtils.h
rename to Pcap++/header/pcapplusplus/PcapUtils.h
diff --git a/Pcap++/header/PfRingDevice.h b/Pcap++/header/pcapplusplus/PfRingDevice.h
similarity index 98%
rename from Pcap++/header/PfRingDevice.h
rename to Pcap++/header/pcapplusplus/PfRingDevice.h
index 9ca01c312d..a1c488f48f 100644
--- a/Pcap++/header/PfRingDevice.h
+++ b/Pcap++/header/pcapplusplus/PfRingDevice.h
@@ -2,10 +2,10 @@
 
 // GCOVR_EXCL_START
 
-#include "Device.h"
-#include "MacAddress.h"
-#include "SystemUtils.h"
-#include "Packet.h"
+#include "pcapplusplus/Device.h"
+#include "pcapplusplus/MacAddress.h"
+#include "pcapplusplus/SystemUtils.h"
+#include "pcapplusplus/Packet.h"
 #include <array>
 #include <vector>
 #include <thread>
diff --git a/Pcap++/header/PfRingDeviceList.h b/Pcap++/header/pcapplusplus/PfRingDeviceList.h
similarity index 100%
rename from Pcap++/header/PfRingDeviceList.h
rename to Pcap++/header/pcapplusplus/PfRingDeviceList.h
diff --git a/Pcap++/header/RawSocketDevice.h b/Pcap++/header/pcapplusplus/RawSocketDevice.h
similarity index 99%
rename from Pcap++/header/RawSocketDevice.h
rename to Pcap++/header/pcapplusplus/RawSocketDevice.h
index 8b69c84d87..7a97497b6f 100644
--- a/Pcap++/header/RawSocketDevice.h
+++ b/Pcap++/header/pcapplusplus/RawSocketDevice.h
@@ -2,7 +2,7 @@
 
 /// @file
 
-#include "IpAddress.h"
+#include "pcapplusplus/IpAddress.h"
 #include "Device.h"
 
 /// @namespace pcpp
diff --git a/Pcap++/header/WinPcapLiveDevice.h b/Pcap++/header/pcapplusplus/WinPcapLiveDevice.h
similarity index 100%
rename from Pcap++/header/WinPcapLiveDevice.h
rename to Pcap++/header/pcapplusplus/WinPcapLiveDevice.h
diff --git a/Pcap++/header/XdpDevice.h b/Pcap++/header/pcapplusplus/XdpDevice.h
similarity index 99%
rename from Pcap++/header/XdpDevice.h
rename to Pcap++/header/pcapplusplus/XdpDevice.h
index e60498d505..c37f008439 100644
--- a/Pcap++/header/XdpDevice.h
+++ b/Pcap++/header/pcapplusplus/XdpDevice.h
@@ -2,7 +2,7 @@
 
 /// @file
 
-#include "Device.h"
+#include "pcapplusplus/Device.h"
 #include <utility>
 #include <functional>
 
diff --git a/Pcap++/src/DeviceUtils.cpp b/Pcap++/src/DeviceUtils.cpp
index 25bb5e5f20..3c2513683f 100644
--- a/Pcap++/src/DeviceUtils.cpp
+++ b/Pcap++/src/DeviceUtils.cpp
@@ -1,11 +1,11 @@
-#include "DeviceUtils.h"
+#include "pcapplusplus/DeviceUtils.h"
 
 #include <array>
 #include <string>
 
-#include "pcap.h"
-#include "Logger.h"
-#include "IpAddress.h"
+#include <pcap.h>
+#include "pcapplusplus/Logger.h"
+#include "pcapplusplus/IpAddress.h"
 
 namespace pcpp
 {
diff --git a/Pcap++/src/DpdkDevice.cpp b/Pcap++/src/DpdkDevice.cpp
index cd01094b43..86ca844c8d 100644
--- a/Pcap++/src/DpdkDevice.cpp
+++ b/Pcap++/src/DpdkDevice.cpp
@@ -5,19 +5,19 @@
 #define __STDC_LIMIT_MACROS
 #define __STDC_FORMAT_MACROS
 
-#include "DpdkDevice.h"
-#include "DpdkDeviceList.h"
-#include "Logger.h"
-#include "rte_version.h"
+#include "pcapplusplus/DpdkDevice.h"
+#include "pcapplusplus/DpdkDeviceList.h"
+#include "pcapplusplus/Logger.h"
+#include <rte_version.h>
 #if (RTE_VER_YEAR > 17) || (RTE_VER_YEAR == 17 && RTE_VER_MONTH >= 11)
-#	include "rte_bus_pci.h"
+#	include <rte_bus_pci.h>
 #endif
-#include "rte_pci.h"
-#include "rte_config.h"
-#include "rte_ethdev.h"
-#include "rte_errno.h"
-#include "rte_malloc.h"
-#include "rte_cycles.h"
+#include <rte_pci.h>
+#include <rte_config.h>
+#include <rte_ethdev.h>
+#include <rte_errno.h>
+#include <rte_malloc.h>
+#include <rte_cycles.h>
 #include <string>
 #include <unistd.h>
 
diff --git a/Pcap++/src/DpdkDeviceList.cpp b/Pcap++/src/DpdkDeviceList.cpp
index 9331734707..18adc12c4d 100644
--- a/Pcap++/src/DpdkDeviceList.cpp
+++ b/Pcap++/src/DpdkDeviceList.cpp
@@ -5,8 +5,8 @@
 #define __STDC_LIMIT_MACROS
 #define __STDC_FORMAT_MACROS
 
-#include "DpdkDeviceList.h"
-#include "Logger.h"
+#include "pcapplusplus/DpdkDeviceList.h"
+#include "pcapplusplus/Logger.h"
 
 #include <rte_config.h>
 #include <rte_common.h>
diff --git a/Pcap++/src/KniDevice.cpp b/Pcap++/src/KniDevice.cpp
index 0adc8a73eb..d704d70bf1 100644
--- a/Pcap++/src/KniDevice.cpp
+++ b/Pcap++/src/KniDevice.cpp
@@ -2,9 +2,9 @@
 
 #define LOG_MODULE PcapLogModuleKniDevice
 
-#include "KniDevice.h"
-#include "Logger.h"
-#include "SystemUtils.h"
+#include "pcapplusplus/KniDevice.h"
+#include "pcapplusplus/Logger.h"
+#include "pcapplusplus/SystemUtils.h"
 
 #include <unistd.h>
 #include <time.h>
diff --git a/Pcap++/src/KniDeviceList.cpp b/Pcap++/src/KniDeviceList.cpp
index 1b639c14f9..0b12770c10 100644
--- a/Pcap++/src/KniDeviceList.cpp
+++ b/Pcap++/src/KniDeviceList.cpp
@@ -5,9 +5,9 @@
 #include <inttypes.h>
 #include <algorithm>
 
-#include "KniDeviceList.h"
-#include "Logger.h"
-#include "SystemUtils.h"
+#include "pcapplusplus/KniDeviceList.h"
+#include "pcapplusplus/Logger.h"
+#include "pcapplusplus/SystemUtils.h"
 
 #include <rte_version.h>
 #include <rte_kni.h>
diff --git a/Pcap++/src/LinuxNicInformationSocket.cpp b/Pcap++/src/LinuxNicInformationSocket.cpp
index f75d1d8c36..97d5e6721f 100644
--- a/Pcap++/src/LinuxNicInformationSocket.cpp
+++ b/Pcap++/src/LinuxNicInformationSocket.cpp
@@ -1,7 +1,7 @@
 #define LOG_MODULE UndefinedLogModule
 
-#include "Logger.h"
-#include "LinuxNicInformationSocket.h"
+#include "pcapplusplus/Logger.h"
+#include "pcapplusplus/LinuxNicInformationSocket.h"
 
 #include <sys/types.h>
 #include <unistd.h>
diff --git a/Pcap++/src/MBufRawPacket.cpp b/Pcap++/src/MBufRawPacket.cpp
index 9922205785..d6cc89e056 100644
--- a/Pcap++/src/MBufRawPacket.cpp
+++ b/Pcap++/src/MBufRawPacket.cpp
@@ -5,15 +5,15 @@
 #define __STDC_LIMIT_MACROS
 #define __STDC_FORMAT_MACROS
 
-#include "rte_mbuf.h"
-#include "rte_mempool.h"
-#include "rte_errno.h"
+#include <rte_mbuf.h>
+#include <rte_mempool.h>
+#include <rte_errno.h>
 
-#include "MBufRawPacket.h"
-#include "Logger.h"
-#include "DpdkDevice.h"
+#include "pcapplusplus/MBufRawPacket.h"
+#include "pcapplusplus/Logger.h"
+#include "pcapplusplus/DpdkDevice.h"
 #ifdef USE_DPDK_KNI
-#	include "KniDevice.h"
+#	include "pcapplusplus/KniDevice.h"
 #endif
 
 #include <string>
diff --git a/Pcap++/src/NetworkUtils.cpp b/Pcap++/src/NetworkUtils.cpp
index c6eff7b82c..f9d066b4f8 100644
--- a/Pcap++/src/NetworkUtils.cpp
+++ b/Pcap++/src/NetworkUtils.cpp
@@ -2,19 +2,18 @@
 
 #include <condition_variable>
 #include <mutex>
-#include "Logger.h"
-#include "Packet.h"
-#include "EthLayer.h"
-#include "ArpLayer.h"
-#include "IPv4Layer.h"
-#include "UdpLayer.h"
-#include "DnsLayer.h"
-#include "PcapFilter.h"
-#include "NetworkUtils.h"
+
+#include "pcapplusplus/Logger.h"
+#include "pcapplusplus/Packet.h"
+#include "pcapplusplus/EthLayer.h"
+#include "pcapplusplus/ArpLayer.h"
+#include "pcapplusplus/IPv4Layer.h"
+#include "pcapplusplus/UdpLayer.h"
+#include "pcapplusplus/DnsLayer.h"
+#include "pcapplusplus/PcapFilter.h"
+#include "pcapplusplus/NetworkUtils.h"
+#include "pcapplusplus/SystemUtils.h"
 #include "EndianPortable.h"
-#ifdef _MSC_VER
-#	include "SystemUtils.h"
-#endif
 #ifndef ETIMEDOUT
 #	define ETIMEDOUT 10060
 #endif
diff --git a/Pcap++/src/PcapDevice.cpp b/Pcap++/src/PcapDevice.cpp
index 6f68092cc2..cf8133a3aa 100644
--- a/Pcap++/src/PcapDevice.cpp
+++ b/Pcap++/src/PcapDevice.cpp
@@ -1,6 +1,6 @@
-#include "PcapDevice.h"
-#include "PcapFilter.h"
-#include "Logger.h"
+#include "pcapplusplus/PcapDevice.h"
+#include "pcapplusplus/PcapFilter.h"
+#include "pcapplusplus/Logger.h"
 #include "pcap.h"
 
 namespace pcpp
diff --git a/Pcap++/src/PcapFileDevice.cpp b/Pcap++/src/PcapFileDevice.cpp
index cf6ff236b2..53c44ea719 100644
--- a/Pcap++/src/PcapFileDevice.cpp
+++ b/Pcap++/src/PcapFileDevice.cpp
@@ -1,11 +1,11 @@
 #define LOG_MODULE PcapLogModuleFileDevice
 
 #include <cerrno>
-#include "PcapFileDevice.h"
+#include "pcapplusplus/PcapFileDevice.h"
 #include "light_pcapng_ext.h"
-#include "Logger.h"
-#include "TimespecTimeval.h"
-#include "pcap.h"
+#include "pcapplusplus/Logger.h"
+#include "pcapplusplus/TimespecTimeval.h"
+#include <pcap.h>
 #include <fstream>
 #include "EndianPortable.h"
 
diff --git a/Pcap++/src/PcapFilter.cpp b/Pcap++/src/PcapFilter.cpp
index 65d6973df9..7bce28405c 100644
--- a/Pcap++/src/PcapFilter.cpp
+++ b/Pcap++/src/PcapFilter.cpp
@@ -1,17 +1,17 @@
 #define LOG_MODULE PcapLogModuleLiveDevice
 
-#include "PcapFilter.h"
-#include "Logger.h"
-#include "IPv4Layer.h"
-#include "PcapUtils.h"
+#include "pcapplusplus/PcapFilter.h"
+#include "pcapplusplus/Logger.h"
+#include "pcapplusplus/IPv4Layer.h"
+#include "pcapplusplus/PcapUtils.h"
 #include <sstream>
 #include <array>
 #if defined(_WIN32)
 #	include <winsock2.h>
 #endif
-#include "pcap.h"
-#include "RawPacket.h"
-#include "TimespecTimeval.h"
+#include <pcap.h>
+#include "pcapplusplus/RawPacket.h"
+#include "pcapplusplus/TimespecTimeval.h"
 
 namespace pcpp
 {
diff --git a/Pcap++/src/PcapLiveDevice.cpp b/Pcap++/src/PcapLiveDevice.cpp
index 091fdef891..dfedd57c5f 100644
--- a/Pcap++/src/PcapLiveDevice.cpp
+++ b/Pcap++/src/PcapLiveDevice.cpp
@@ -1,18 +1,18 @@
 #define LOG_MODULE PcapLogModuleLiveDevice
 
-#include "IpUtils.h"
-#include "DeviceUtils.h"
-#include "PcapUtils.h"
-#include "PcapLiveDevice.h"
-#include "PcapLiveDeviceList.h"
-#include "Packet.h"
+#include "pcapplusplus/IpUtils.h"
+#include "pcapplusplus/DeviceUtils.h"
+#include "pcapplusplus/PcapUtils.h"
+#include "pcapplusplus/PcapLiveDevice.h"
+#include "pcapplusplus/PcapLiveDeviceList.h"
+#include "pcapplusplus/Packet.h"
 #ifndef _MSC_VER
 #	include <unistd.h>
 #endif  // ! _MSC_VER
-#include "pcap.h"
+#include <pcap.h>
 #include <thread>
-#include "Logger.h"
-#include "SystemUtils.h"
+#include "pcapplusplus/Logger.h"
+#include "pcapplusplus/SystemUtils.h"
 #include <cstring>
 #include <iostream>
 #include <fstream>
diff --git a/Pcap++/src/PcapLiveDeviceList.cpp b/Pcap++/src/PcapLiveDeviceList.cpp
index a68e65a406..09b0d21f13 100644
--- a/Pcap++/src/PcapLiveDeviceList.cpp
+++ b/Pcap++/src/PcapLiveDeviceList.cpp
@@ -1,20 +1,20 @@
 #define LOG_MODULE PcapLogModuleLiveDevice
 
-#include "IpUtils.h"
-#include "IpAddressUtils.h"
-#include "PcapLiveDeviceList.h"
-#include "Logger.h"
-#include "PcapUtils.h"
-#include "DeviceUtils.h"
-#include "SystemUtils.h"
-#include "pcap.h"
+#include "pcapplusplus/IpUtils.h"
+#include "pcapplusplus/IpAddressUtils.h"
+#include "pcapplusplus/PcapLiveDeviceList.h"
+#include "pcapplusplus/Logger.h"
+#include "pcapplusplus/PcapUtils.h"
+#include "pcapplusplus/DeviceUtils.h"
+#include "pcapplusplus/SystemUtils.h"
+#include <pcap.h>
 #include <array>
 #include <sstream>
 #include <algorithm>
 #if defined(_WIN32)
 #	include <ws2tcpip.h>
 #	include <iphlpapi.h>
-#	include "WinPcapLiveDevice.h"
+#	include "pcapplusplus/WinPcapLiveDevice.h"
 #elif defined(__APPLE__)
 #	include <systemconfiguration/scdynamicstore.h>
 #elif defined(__FreeBSD__)
diff --git a/Pcap++/src/PcapRemoteDevice.cpp b/Pcap++/src/PcapRemoteDevice.cpp
index d27ccbc5c2..3fb3086fab 100644
--- a/Pcap++/src/PcapRemoteDevice.cpp
+++ b/Pcap++/src/PcapRemoteDevice.cpp
@@ -1,8 +1,8 @@
 #define LOG_MODULE PcapLogModuleRemoteDevice
 
-#include "PcapRemoteDevice.h"
-#include "Logger.h"
-#include "pcap.h"
+#include "pcapplusplus/PcapRemoteDevice.h"
+#include "pcapplusplus/Logger.h"
+#include <pcap.h>
 
 namespace pcpp
 {
diff --git a/Pcap++/src/PcapRemoteDeviceList.cpp b/Pcap++/src/PcapRemoteDeviceList.cpp
index ca8629c8f3..79c84238d3 100644
--- a/Pcap++/src/PcapRemoteDeviceList.cpp
+++ b/Pcap++/src/PcapRemoteDeviceList.cpp
@@ -1,11 +1,11 @@
 #define LOG_MODULE PcapLogModuleRemoteDevice
 
-#include "PcapRemoteDeviceList.h"
-#include "Logger.h"
-#include "IpUtils.h"
-#include "PcapUtils.h"
-#include "IpAddressUtils.h"
-#include "pcap.h"
+#include "pcapplusplus/PcapRemoteDeviceList.h"
+#include "pcapplusplus/Logger.h"
+#include "pcapplusplus/IpUtils.h"
+#include "pcapplusplus/PcapUtils.h"
+#include "pcapplusplus/IpAddressUtils.h"
+#include <pcap.h>
 #include <array>
 #include <ws2tcpip.h>
 
diff --git a/Pcap++/src/PcapUtils.cpp b/Pcap++/src/PcapUtils.cpp
index 5f3ae77024..12d01fea14 100644
--- a/Pcap++/src/PcapUtils.cpp
+++ b/Pcap++/src/PcapUtils.cpp
@@ -1,6 +1,6 @@
-#include "PcapUtils.h"
+#include "pcapplusplus/PcapUtils.h"
 
-#include "pcap.h"
+#include <pcap.h>
 
 namespace pcpp
 {
diff --git a/Pcap++/src/PfRingDevice.cpp b/Pcap++/src/PfRingDevice.cpp
index 540a2c0ae3..9835e08b4e 100644
--- a/Pcap++/src/PfRingDevice.cpp
+++ b/Pcap++/src/PfRingDevice.cpp
@@ -2,10 +2,10 @@
 
 #define LOG_MODULE PcapLogModulePfRingDevice
 
-#include "PfRingDevice.h"
-#include "EthLayer.h"
-#include "VlanLayer.h"
-#include "Logger.h"
+#include "pcapplusplus/PfRingDevice.h"
+#include "pcapplusplus/EthLayer.h"
+#include "pcapplusplus/VlanLayer.h"
+#include "pcapplusplus/Logger.h"
 #include <errno.h>
 #include <pfring.h>
 #include <pthread.h>
diff --git a/Pcap++/src/PfRingDeviceList.cpp b/Pcap++/src/PfRingDeviceList.cpp
index 06973c09f2..dd4e2bc764 100644
--- a/Pcap++/src/PfRingDeviceList.cpp
+++ b/Pcap++/src/PfRingDeviceList.cpp
@@ -4,11 +4,11 @@
 
 #include <cstdio>
 #include <array>
-#include "PfRingDeviceList.h"
-#include "SystemUtils.h"
-#include "DeviceUtils.h"
-#include "Logger.h"
-#include "pcap.h"
+#include "pcapplusplus/PfRingDeviceList.h"
+#include "pcapplusplus/SystemUtils.h"
+#include "pcapplusplus/DeviceUtils.h"
+#include "pcapplusplus/Logger.h"
+#include <pcap.h>
 #include "pfring.h"
 
 namespace pcpp
diff --git a/Pcap++/src/RawSocketDevice.cpp b/Pcap++/src/RawSocketDevice.cpp
index 956d3460e9..ed9c485330 100644
--- a/Pcap++/src/RawSocketDevice.cpp
+++ b/Pcap++/src/RawSocketDevice.cpp
@@ -1,4 +1,4 @@
-#include "RawSocketDevice.h"
+#include "pcapplusplus/RawSocketDevice.h"
 #include "EndianPortable.h"
 #include <chrono>
 #ifdef __linux__
@@ -10,11 +10,11 @@
 #	include <ifaddrs.h>
 #	include <net/if.h>
 #endif
-#include "Logger.h"
-#include "IpUtils.h"
-#include "SystemUtils.h"
-#include "Packet.h"
-#include "EthLayer.h"
+#include "pcapplusplus/Logger.h"
+#include "pcapplusplus/IpUtils.h"
+#include "pcapplusplus/SystemUtils.h"
+#include "pcapplusplus/Packet.h"
+#include "pcapplusplus/EthLayer.h"
 
 namespace pcpp
 {
diff --git a/Pcap++/src/WinPcapLiveDevice.cpp b/Pcap++/src/WinPcapLiveDevice.cpp
index 3cbf10b20d..ffdb40aa4e 100644
--- a/Pcap++/src/WinPcapLiveDevice.cpp
+++ b/Pcap++/src/WinPcapLiveDevice.cpp
@@ -1,9 +1,9 @@
 #define LOG_MODULE PcapLogModuleWinPcapLiveDevice
 
-#include "WinPcapLiveDevice.h"
-#include "Logger.h"
-#include "TimespecTimeval.h"
-#include "pcap.h"
+#include "pcapplusplus/WinPcapLiveDevice.h"
+#include "pcapplusplus/Logger.h"
+#include "pcapplusplus/TimespecTimeval.h"
+#include <pcap.h>
 
 #include <memory>
 #include <vector>
diff --git a/Pcap++/src/XdpDevice.cpp b/Pcap++/src/XdpDevice.cpp
index 04378bcbf2..80eb989c4c 100644
--- a/Pcap++/src/XdpDevice.cpp
+++ b/Pcap++/src/XdpDevice.cpp
@@ -1,9 +1,9 @@
 #define LOG_MODULE PcapLogModuleXdpDevice
 
-#include "XdpDevice.h"
-#include "GeneralUtils.h"
-#include "Logger.h"
-#include "Packet.h"
+#include "pcapplusplus/XdpDevice.h"
+#include "pcapplusplus/GeneralUtils.h"
+#include "pcapplusplus/Logger.h"
+#include "pcapplusplus/Packet.h"
 #include <bpf/libbpf.h>
 #include <bpf/xsk.h>
 #include <linux/if_link.h>
diff --git a/Tests/Fuzzers/FuzzTarget.cpp b/Tests/Fuzzers/FuzzTarget.cpp
index c81ab1d91a..9a9a535224 100644
--- a/Tests/Fuzzers/FuzzTarget.cpp
+++ b/Tests/Fuzzers/FuzzTarget.cpp
@@ -1,6 +1,6 @@
-#include <PcapFileDevice.h>
-#include <Packet.h>
-#include <Logger.h>
+#include <pcapplusplus/PcapFileDevice.h>
+#include <pcapplusplus/Packet.h>
+#include <pcapplusplus/Logger.h>
 #include "DumpToFile.h"
 #include "ReadParsedPacket.h"
 
diff --git a/Tests/Fuzzers/FuzzWriter.cpp b/Tests/Fuzzers/FuzzWriter.cpp
index 588040d421..c07cf12847 100644
--- a/Tests/Fuzzers/FuzzWriter.cpp
+++ b/Tests/Fuzzers/FuzzWriter.cpp
@@ -1,8 +1,8 @@
 #include <functional>
-#include <Packet.h>
-#include <PcapFileDevice.h>
+#include <pcapplusplus/Logger.h>
+#include <pcapplusplus/Packet.h>
+#include <pcapplusplus/PcapFileDevice.h>
 
-#include "Logger.h"
 #include "DumpToFile.h"
 
 static std::string tmpName;
diff --git a/Tests/Fuzzers/ReadParsedPacket.h b/Tests/Fuzzers/ReadParsedPacket.h
index ad17867c86..1373d5b3d8 100644
--- a/Tests/Fuzzers/ReadParsedPacket.h
+++ b/Tests/Fuzzers/ReadParsedPacket.h
@@ -1,24 +1,24 @@
 #pragma once
 
-#include <Packet.h>
-#include <IPv4Layer.h>
-#include <TelnetLayer.h>
-#include <BgpLayer.h>
-#include <DhcpLayer.h>
-#include <DhcpV6Layer.h>
-#include <DnsLayer.h>
-#include <IcmpLayer.h>
-#include <NtpLayer.h>
-#include <SSLLayer.h>
-#include <SSLHandshake.h>
-#include <TcpLayer.h>
-#include <SdpLayer.h>
-#include <VrrpLayer.h>
-#include <Sll2Layer.h>
-#include <FtpLayer.h>
-#include <GreLayer.h>
-#include <GtpLayer.h>
-#include <SomeIpSdLayer.h>
+#include <pcapplusplus/Packet.h>
+#include <pcapplusplus/IPv4Layer.h>
+#include <pcapplusplus/TelnetLayer.h>
+#include <pcapplusplus/BgpLayer.h>
+#include <pcapplusplus/DhcpLayer.h>
+#include <pcapplusplus/DhcpV6Layer.h>
+#include <pcapplusplus/DnsLayer.h>
+#include <pcapplusplus/IcmpLayer.h>
+#include <pcapplusplus/NtpLayer.h>
+#include <pcapplusplus/SSLLayer.h>
+#include <pcapplusplus/SSLHandshake.h>
+#include <pcapplusplus/TcpLayer.h>
+#include <pcapplusplus/SdpLayer.h>
+#include <pcapplusplus/VrrpLayer.h>
+#include <pcapplusplus/Sll2Layer.h>
+#include <pcapplusplus/FtpLayer.h>
+#include <pcapplusplus/GreLayer.h>
+#include <pcapplusplus/GtpLayer.h>
+#include <pcapplusplus/SomeIpSdLayer.h>
 
 // Call some pcpp::Packet methods that are not invoked from general virtual methods
 // as `pcpp::Packet::toString` or `pcpp::Packet::computeCalculateFields` to trigger possible crashes.
diff --git a/Tests/Packet++Test/Tests/Asn1Tests.cpp b/Tests/Packet++Test/Tests/Asn1Tests.cpp
index 6006f3438f..98e624bab5 100644
--- a/Tests/Packet++Test/Tests/Asn1Tests.cpp
+++ b/Tests/Packet++Test/Tests/Asn1Tests.cpp
@@ -1,7 +1,7 @@
 #include "../TestDefinition.h"
-#include "Asn1Codec.h"
-#include "RawPacket.h"
-#include "GeneralUtils.h"
+#include "pcapplusplus/Asn1Codec.h"
+#include "pcapplusplus/RawPacket.h"
+#include "pcapplusplus/GeneralUtils.h"
 #include <functional>
 #include <cstring>
 #include <sstream>
diff --git a/Tests/Packet++Test/Tests/BgpTests.cpp b/Tests/Packet++Test/Tests/BgpTests.cpp
index ae047337a7..539014e297 100644
--- a/Tests/Packet++Test/Tests/BgpTests.cpp
+++ b/Tests/Packet++Test/Tests/BgpTests.cpp
@@ -1,12 +1,12 @@
 #include "../TestDefinition.h"
 #include "../Utils/TestUtils.h"
 #include "EndianPortable.h"
-#include "Packet.h"
-#include "EthLayer.h"
-#include "IPv4Layer.h"
-#include "TcpLayer.h"
-#include "BgpLayer.h"
-#include "SystemUtils.h"
+#include "pcapplusplus/Packet.h"
+#include "pcapplusplus/EthLayer.h"
+#include "pcapplusplus/IPv4Layer.h"
+#include "pcapplusplus/TcpLayer.h"
+#include "pcapplusplus/BgpLayer.h"
+#include "pcapplusplus/SystemUtils.h"
 
 PTF_TEST_CASE(BgpLayerParsingTest)
 {
diff --git a/Tests/Packet++Test/Tests/CiscoHdlcTests.cpp b/Tests/Packet++Test/Tests/CiscoHdlcTests.cpp
index 805061b764..2e31f2e91f 100644
--- a/Tests/Packet++Test/Tests/CiscoHdlcTests.cpp
+++ b/Tests/Packet++Test/Tests/CiscoHdlcTests.cpp
@@ -1,10 +1,10 @@
 #include "../TestDefinition.h"
 #include "../Utils/TestUtils.h"
-#include "Packet.h"
-#include "CiscoHdlcLayer.h"
-#include "IPv4Layer.h"
-#include "IPv6Layer.h"
-#include "SystemUtils.h"
+#include "pcapplusplus/Packet.h"
+#include "pcapplusplus/CiscoHdlcLayer.h"
+#include "pcapplusplus/IPv4Layer.h"
+#include "pcapplusplus/IPv6Layer.h"
+#include "pcapplusplus/SystemUtils.h"
 
 PTF_TEST_CASE(CiscoHdlcParsingTest)
 {
diff --git a/Tests/Packet++Test/Tests/CotpTests.cpp b/Tests/Packet++Test/Tests/CotpTests.cpp
index b8f9ee8b35..252177b341 100644
--- a/Tests/Packet++Test/Tests/CotpTests.cpp
+++ b/Tests/Packet++Test/Tests/CotpTests.cpp
@@ -1,8 +1,8 @@
 #include "../TestDefinition.h"
 #include "../Utils/TestUtils.h"
-#include "CotpLayer.h"
-#include "Packet.h"
-#include "SystemUtils.h"
+#include "pcapplusplus/CotpLayer.h"
+#include "pcapplusplus/Packet.h"
+#include "pcapplusplus/SystemUtils.h"
 
 using namespace std;
 
diff --git a/Tests/Packet++Test/Tests/DhcpTests.cpp b/Tests/Packet++Test/Tests/DhcpTests.cpp
index f60071d6bb..f2412b26b9 100644
--- a/Tests/Packet++Test/Tests/DhcpTests.cpp
+++ b/Tests/Packet++Test/Tests/DhcpTests.cpp
@@ -1,12 +1,12 @@
 #include "../TestDefinition.h"
 #include "../Utils/TestUtils.h"
 #include "EndianPortable.h"
-#include "Packet.h"
-#include "EthLayer.h"
-#include "IPv4Layer.h"
-#include "DhcpLayer.h"
-#include "UdpLayer.h"
-#include "SystemUtils.h"
+#include "pcapplusplus/Packet.h"
+#include "pcapplusplus/EthLayer.h"
+#include "pcapplusplus/IPv4Layer.h"
+#include "pcapplusplus/DhcpLayer.h"
+#include "pcapplusplus/UdpLayer.h"
+#include "pcapplusplus/SystemUtils.h"
 
 PTF_TEST_CASE(DhcpParsingTest)
 {
diff --git a/Tests/Packet++Test/Tests/DhcpV6Tests.cpp b/Tests/Packet++Test/Tests/DhcpV6Tests.cpp
index 0d7ca263de..97147ebe21 100644
--- a/Tests/Packet++Test/Tests/DhcpV6Tests.cpp
+++ b/Tests/Packet++Test/Tests/DhcpV6Tests.cpp
@@ -1,9 +1,9 @@
 #include "../TestDefinition.h"
 #include "../Utils/TestUtils.h"
-#include "Logger.h"
-#include "Packet.h"
-#include "DhcpV6Layer.h"
-#include "SystemUtils.h"
+#include "pcapplusplus/Logger.h"
+#include "pcapplusplus/Packet.h"
+#include "pcapplusplus/DhcpV6Layer.h"
+#include "pcapplusplus/SystemUtils.h"
 
 PTF_TEST_CASE(DhcpV6ParsingTest)
 {
diff --git a/Tests/Packet++Test/Tests/DnsTests.cpp b/Tests/Packet++Test/Tests/DnsTests.cpp
index 1d0b371038..5366d8926f 100644
--- a/Tests/Packet++Test/Tests/DnsTests.cpp
+++ b/Tests/Packet++Test/Tests/DnsTests.cpp
@@ -2,14 +2,14 @@
 #include "../Utils/TestUtils.h"
 #include <sstream>
 #include "EndianPortable.h"
-#include "Logger.h"
-#include "Packet.h"
-#include "EthLayer.h"
-#include "IPv4Layer.h"
-#include "IPv6Layer.h"
-#include "UdpLayer.h"
-#include "DnsLayer.h"
-#include "SystemUtils.h"
+#include "pcapplusplus/Logger.h"
+#include "pcapplusplus/Packet.h"
+#include "pcapplusplus/EthLayer.h"
+#include "pcapplusplus/IPv4Layer.h"
+#include "pcapplusplus/IPv6Layer.h"
+#include "pcapplusplus/UdpLayer.h"
+#include "pcapplusplus/DnsLayer.h"
+#include "pcapplusplus/SystemUtils.h"
 
 PTF_TEST_CASE(DnsLayerParsingTest)
 {
diff --git a/Tests/Packet++Test/Tests/EthAndArpTests.cpp b/Tests/Packet++Test/Tests/EthAndArpTests.cpp
index 5628c63692..dcf8015e75 100644
--- a/Tests/Packet++Test/Tests/EthAndArpTests.cpp
+++ b/Tests/Packet++Test/Tests/EthAndArpTests.cpp
@@ -1,14 +1,14 @@
 #include "../TestDefinition.h"
 #include "../Utils/TestUtils.h"
 #include "EndianPortable.h"
-#include "IpAddress.h"
-#include "EthLayer.h"
-#include "EthDot3Layer.h"
-#include "ArpLayer.h"
-#include "PayloadLayer.h"
-#include "Packet.h"
-#include "OUILookup.h"
-#include "SystemUtils.h"
+#include "pcapplusplus/IpAddress.h"
+#include "pcapplusplus/EthLayer.h"
+#include "pcapplusplus/EthDot3Layer.h"
+#include "pcapplusplus/ArpLayer.h"
+#include "pcapplusplus/PayloadLayer.h"
+#include "pcapplusplus/Packet.h"
+#include "pcapplusplus/OUILookup.h"
+#include "pcapplusplus/SystemUtils.h"
 
 PTF_TEST_CASE(OUILookup)
 {
diff --git a/Tests/Packet++Test/Tests/FtpTests.cpp b/Tests/Packet++Test/Tests/FtpTests.cpp
index d9047dce24..4bf1693ccb 100644
--- a/Tests/Packet++Test/Tests/FtpTests.cpp
+++ b/Tests/Packet++Test/Tests/FtpTests.cpp
@@ -1,13 +1,14 @@
 #include "../TestDefinition.h"
 #include "../Utils/TestUtils.h"
+
 #include "EndianPortable.h"
-#include "EthLayer.h"
-#include "FtpLayer.h"
-#include "IPv4Layer.h"
-#include "IPv6Layer.h"
-#include "Packet.h"
-#include "SystemUtils.h"
-#include "TcpLayer.h"
+#include "pcapplusplus/EthLayer.h"
+#include "pcapplusplus/FtpLayer.h"
+#include "pcapplusplus/IPv4Layer.h"
+#include "pcapplusplus/IPv6Layer.h"
+#include "pcapplusplus/Packet.h"
+#include "pcapplusplus/SystemUtils.h"
+#include "pcapplusplus/TcpLayer.h"
 
 PTF_TEST_CASE(FtpParsingTests)
 {
diff --git a/Tests/Packet++Test/Tests/GreTests.cpp b/Tests/Packet++Test/Tests/GreTests.cpp
index 9c587f38c8..9f9a366512 100644
--- a/Tests/Packet++Test/Tests/GreTests.cpp
+++ b/Tests/Packet++Test/Tests/GreTests.cpp
@@ -1,16 +1,16 @@
 #include "../TestDefinition.h"
 #include "../Utils/TestUtils.h"
 #include "EndianPortable.h"
-#include "Logger.h"
-#include "EthLayer.h"
-#include "TcpLayer.h"
-#include "IPv4Layer.h"
-#include "IPv6Layer.h"
-#include "PPPoELayer.h"
-#include "GreLayer.h"
-#include "PayloadLayer.h"
-#include "Packet.h"
-#include "SystemUtils.h"
+#include "pcapplusplus/Logger.h"
+#include "pcapplusplus/EthLayer.h"
+#include "pcapplusplus/TcpLayer.h"
+#include "pcapplusplus/IPv4Layer.h"
+#include "pcapplusplus/IPv6Layer.h"
+#include "pcapplusplus/PPPoELayer.h"
+#include "pcapplusplus/GreLayer.h"
+#include "pcapplusplus/PayloadLayer.h"
+#include "pcapplusplus/Packet.h"
+#include "pcapplusplus/SystemUtils.h"
 
 PTF_TEST_CASE(GreParsingTest)
 {
diff --git a/Tests/Packet++Test/Tests/GtpTests.cpp b/Tests/Packet++Test/Tests/GtpTests.cpp
index 541b009bdf..3afef40da1 100644
--- a/Tests/Packet++Test/Tests/GtpTests.cpp
+++ b/Tests/Packet++Test/Tests/GtpTests.cpp
@@ -1,14 +1,14 @@
 #include "../TestDefinition.h"
 #include "../Utils/TestUtils.h"
 #include "EndianPortable.h"
-#include "Packet.h"
-#include "EthLayer.h"
-#include "IPv4Layer.h"
-#include "IPv6Layer.h"
-#include "GtpLayer.h"
-#include "UdpLayer.h"
-#include "IcmpLayer.h"
-#include "SystemUtils.h"
+#include "pcapplusplus/Packet.h"
+#include "pcapplusplus/EthLayer.h"
+#include "pcapplusplus/IPv4Layer.h"
+#include "pcapplusplus/IPv6Layer.h"
+#include "pcapplusplus/GtpLayer.h"
+#include "pcapplusplus/UdpLayer.h"
+#include "pcapplusplus/IcmpLayer.h"
+#include "pcapplusplus/SystemUtils.h"
 #include <tuple>
 
 PTF_TEST_CASE(GtpV1LayerParsingTest)
diff --git a/Tests/Packet++Test/Tests/HttpTests.cpp b/Tests/Packet++Test/Tests/HttpTests.cpp
index 6fab318743..e5ff61458a 100644
--- a/Tests/Packet++Test/Tests/HttpTests.cpp
+++ b/Tests/Packet++Test/Tests/HttpTests.cpp
@@ -1,15 +1,16 @@
 #include "../TestDefinition.h"
 #include "../Utils/TestUtils.h"
 #include "EndianPortable.h"
-#include "Logger.h"
-#include "Packet.h"
-#include "EthLayer.h"
-#include "IPv4Layer.h"
-#include "TcpLayer.h"
-#include "HttpLayer.h"
-#include "PayloadLayer.h"
-#include "SystemUtils.h"
+#include "pcapplusplus/Logger.h"
+#include "pcapplusplus/Packet.h"
+#include "pcapplusplus/EthLayer.h"
+#include "pcapplusplus/IPv4Layer.h"
+#include "pcapplusplus/TcpLayer.h"
+#include "pcapplusplus/HttpLayer.h"
+#include "pcapplusplus/PayloadLayer.h"
+#include "pcapplusplus/SystemUtils.h"
 #include <iostream>
+
 PTF_TEST_CASE(HttpRequestParseMethodTest)
 {
 	PTF_ASSERT_EQUAL(pcpp::HttpRequestFirstLine::parseMethod(nullptr, 0),
diff --git a/Tests/Packet++Test/Tests/IPSecTests.cpp b/Tests/Packet++Test/Tests/IPSecTests.cpp
index 331eed8b50..0288d4b8d5 100644
--- a/Tests/Packet++Test/Tests/IPSecTests.cpp
+++ b/Tests/Packet++Test/Tests/IPSecTests.cpp
@@ -1,8 +1,8 @@
 #include "../TestDefinition.h"
 #include "../Utils/TestUtils.h"
-#include "Packet.h"
-#include "IPSecLayer.h"
-#include "SystemUtils.h"
+#include "pcapplusplus/Packet.h"
+#include "pcapplusplus/IPSecLayer.h"
+#include "pcapplusplus/SystemUtils.h"
 
 PTF_TEST_CASE(IPSecParsingTest)
 {
diff --git a/Tests/Packet++Test/Tests/IPv4Tests.cpp b/Tests/Packet++Test/Tests/IPv4Tests.cpp
index 3dbe99c4aa..56489ec02b 100644
--- a/Tests/Packet++Test/Tests/IPv4Tests.cpp
+++ b/Tests/Packet++Test/Tests/IPv4Tests.cpp
@@ -2,15 +2,15 @@
 #include "../Utils/TestUtils.h"
 #include <sstream>
 #include "EndianPortable.h"
-#include "Logger.h"
-#include "MacAddress.h"
-#include "Packet.h"
-#include "EthLayer.h"
-#include "IPv4Layer.h"
-#include "IPv6Layer.h"
-#include "UdpLayer.h"
-#include "PayloadLayer.h"
-#include "SystemUtils.h"
+#include "pcapplusplus/Logger.h"
+#include "pcapplusplus/MacAddress.h"
+#include "pcapplusplus/Packet.h"
+#include "pcapplusplus/EthLayer.h"
+#include "pcapplusplus/IPv4Layer.h"
+#include "pcapplusplus/IPv6Layer.h"
+#include "pcapplusplus/UdpLayer.h"
+#include "pcapplusplus/PayloadLayer.h"
+#include "pcapplusplus/SystemUtils.h"
 
 PTF_TEST_CASE(IPv4PacketCreation)
 {
diff --git a/Tests/Packet++Test/Tests/IPv6Tests.cpp b/Tests/Packet++Test/Tests/IPv6Tests.cpp
index 0852c0a95c..bb78269bdb 100644
--- a/Tests/Packet++Test/Tests/IPv6Tests.cpp
+++ b/Tests/Packet++Test/Tests/IPv6Tests.cpp
@@ -1,15 +1,15 @@
 #include "../TestDefinition.h"
 #include "../Utils/TestUtils.h"
 #include "EndianPortable.h"
-#include "IpAddress.h"
-#include "EthLayer.h"
-#include "IPv4Layer.h"
-#include "IPv6Layer.h"
-#include "UdpLayer.h"
-#include "IcmpV6Layer.h"
-#include "PayloadLayer.h"
-#include "Packet.h"
-#include "SystemUtils.h"
+#include "pcapplusplus/IpAddress.h"
+#include "pcapplusplus/EthLayer.h"
+#include "pcapplusplus/IPv4Layer.h"
+#include "pcapplusplus/IPv6Layer.h"
+#include "pcapplusplus/UdpLayer.h"
+#include "pcapplusplus/IcmpV6Layer.h"
+#include "pcapplusplus/PayloadLayer.h"
+#include "pcapplusplus/Packet.h"
+#include "pcapplusplus/SystemUtils.h"
 
 PTF_TEST_CASE(IPv6UdpPacketParseAndCreate)
 {
diff --git a/Tests/Packet++Test/Tests/IcmpTests.cpp b/Tests/Packet++Test/Tests/IcmpTests.cpp
index 63c810cce0..41b33b1aec 100644
--- a/Tests/Packet++Test/Tests/IcmpTests.cpp
+++ b/Tests/Packet++Test/Tests/IcmpTests.cpp
@@ -1,13 +1,13 @@
 #include "../TestDefinition.h"
 #include "../Utils/TestUtils.h"
 #include "EndianPortable.h"
-#include "Packet.h"
-#include "Logger.h"
-#include "EthLayer.h"
-#include "IcmpLayer.h"
-#include "IPv4Layer.h"
-#include "UdpLayer.h"
-#include "SystemUtils.h"
+#include "pcapplusplus/Packet.h"
+#include "pcapplusplus/Logger.h"
+#include "pcapplusplus/EthLayer.h"
+#include "pcapplusplus/IcmpLayer.h"
+#include "pcapplusplus/IPv4Layer.h"
+#include "pcapplusplus/UdpLayer.h"
+#include "pcapplusplus/SystemUtils.h"
 
 PTF_TEST_CASE(IcmpParsingTest)
 {
diff --git a/Tests/Packet++Test/Tests/IcmpV6Tests.cpp b/Tests/Packet++Test/Tests/IcmpV6Tests.cpp
index 5ed38a27bb..63b5c15dad 100644
--- a/Tests/Packet++Test/Tests/IcmpV6Tests.cpp
+++ b/Tests/Packet++Test/Tests/IcmpV6Tests.cpp
@@ -1,16 +1,16 @@
 #include "../TestDefinition.h"
 #include "../Utils/TestUtils.h"
 #include "EndianPortable.h"
-#include "EthLayer.h"
-#include "GeneralUtils.h"
-#include "IPv6Layer.h"
-#include "IcmpV6Layer.h"
-#include "Logger.h"
-#include "MacAddress.h"
-#include "NdpLayer.h"
-#include "Packet.h"
-#include "SystemUtils.h"
-#include "VlanLayer.h"
+#include "pcapplusplus/EthLayer.h"
+#include "pcapplusplus/GeneralUtils.h"
+#include "pcapplusplus/IPv6Layer.h"
+#include "pcapplusplus/IcmpV6Layer.h"
+#include "pcapplusplus/Logger.h"
+#include "pcapplusplus/MacAddress.h"
+#include "pcapplusplus/NdpLayer.h"
+#include "pcapplusplus/Packet.h"
+#include "pcapplusplus/SystemUtils.h"
+#include "pcapplusplus/VlanLayer.h"
 #include <sstream>
 
 PTF_TEST_CASE(IcmpV6ParsingTest)
diff --git a/Tests/Packet++Test/Tests/IgmpTests.cpp b/Tests/Packet++Test/Tests/IgmpTests.cpp
index d702d556d8..459e64ef48 100644
--- a/Tests/Packet++Test/Tests/IgmpTests.cpp
+++ b/Tests/Packet++Test/Tests/IgmpTests.cpp
@@ -1,12 +1,12 @@
 #include "../TestDefinition.h"
 #include "../Utils/TestUtils.h"
 #include "EndianPortable.h"
-#include "Logger.h"
-#include "Packet.h"
-#include "EthLayer.h"
-#include "IPv4Layer.h"
-#include "IgmpLayer.h"
-#include "SystemUtils.h"
+#include "pcapplusplus/Logger.h"
+#include "pcapplusplus/Packet.h"
+#include "pcapplusplus/EthLayer.h"
+#include "pcapplusplus/IPv4Layer.h"
+#include "pcapplusplus/IgmpLayer.h"
+#include "pcapplusplus/SystemUtils.h"
 
 PTF_TEST_CASE(IgmpParsingTest)
 {
diff --git a/Tests/Packet++Test/Tests/LLCTests.cpp b/Tests/Packet++Test/Tests/LLCTests.cpp
index 0d62a5c518..b22e1497d5 100644
--- a/Tests/Packet++Test/Tests/LLCTests.cpp
+++ b/Tests/Packet++Test/Tests/LLCTests.cpp
@@ -1,9 +1,9 @@
 #include "../TestDefinition.h"
 #include "../Utils/TestUtils.h"
-#include "GeneralUtils.h"
-#include "SystemUtils.h"
-#include "Packet.h"
-#include "LLCLayer.h"
+#include "pcapplusplus/GeneralUtils.h"
+#include "pcapplusplus/SystemUtils.h"
+#include "pcapplusplus/Packet.h"
+#include "pcapplusplus/LLCLayer.h"
 
 #include <cstring>
 
diff --git a/Tests/Packet++Test/Tests/LdapTests.cpp b/Tests/Packet++Test/Tests/LdapTests.cpp
index 75545c6996..258521110a 100644
--- a/Tests/Packet++Test/Tests/LdapTests.cpp
+++ b/Tests/Packet++Test/Tests/LdapTests.cpp
@@ -1,8 +1,8 @@
 #include "../TestDefinition.h"
 #include "../Utils/TestUtils.h"
-#include "Packet.h"
-#include "SystemUtils.h"
-#include "LdapLayer.h"
+#include "pcapplusplus/Packet.h"
+#include "pcapplusplus/SystemUtils.h"
+#include "pcapplusplus/LdapLayer.h"
 #include <sstream>
 #include <cstring>
 
diff --git a/Tests/Packet++Test/Tests/NflogTests.cpp b/Tests/Packet++Test/Tests/NflogTests.cpp
index 646697b479..2837c9be21 100644
--- a/Tests/Packet++Test/Tests/NflogTests.cpp
+++ b/Tests/Packet++Test/Tests/NflogTests.cpp
@@ -1,12 +1,12 @@
 #include "../TestDefinition.h"
 #include "../Utils/TestUtils.h"
 #include "EndianPortable.h"
-#include "MacAddress.h"
-#include "Packet.h"
-#include "NflogLayer.h"
-#include "IPv4Layer.h"
-#include "SystemUtils.h"
-#include "GeneralUtils.h"
+#include "pcapplusplus/MacAddress.h"
+#include "pcapplusplus/Packet.h"
+#include "pcapplusplus/NflogLayer.h"
+#include "pcapplusplus/IPv4Layer.h"
+#include "pcapplusplus/SystemUtils.h"
+#include "pcapplusplus/GeneralUtils.h"
 
 PTF_TEST_CASE(NflogPacketParsingTest)
 {
diff --git a/Tests/Packet++Test/Tests/NtpTests.cpp b/Tests/Packet++Test/Tests/NtpTests.cpp
index 3373968e3c..ec11fde423 100644
--- a/Tests/Packet++Test/Tests/NtpTests.cpp
+++ b/Tests/Packet++Test/Tests/NtpTests.cpp
@@ -1,13 +1,13 @@
 #include "../TestDefinition.h"
 #include "../Utils/TestUtils.h"
-#include "Logger.h"
 #include "EndianPortable.h"
-#include "Packet.h"
-#include "EthLayer.h"
-#include "IPv4Layer.h"
-#include "UdpLayer.h"
-#include "NtpLayer.h"
-#include "SystemUtils.h"
+#include "pcapplusplus/Logger.h"
+#include "pcapplusplus/Packet.h"
+#include "pcapplusplus/EthLayer.h"
+#include "pcapplusplus/IPv4Layer.h"
+#include "pcapplusplus/UdpLayer.h"
+#include "pcapplusplus/NtpLayer.h"
+#include "pcapplusplus/SystemUtils.h"
 
 #include <math.h>
 
diff --git a/Tests/Packet++Test/Tests/PPPoETests.cpp b/Tests/Packet++Test/Tests/PPPoETests.cpp
index ef805ca193..0d4c8c0a9f 100644
--- a/Tests/Packet++Test/Tests/PPPoETests.cpp
+++ b/Tests/Packet++Test/Tests/PPPoETests.cpp
@@ -1,14 +1,14 @@
 #include "../TestDefinition.h"
 #include "../Utils/TestUtils.h"
 #include "EndianPortable.h"
-#include "Logger.h"
-#include "Packet.h"
-#include "EthLayer.h"
-#include "IPv6Layer.h"
-#include "UdpLayer.h"
-#include "PPPoELayer.h"
-#include "DhcpV6Layer.h"
-#include "SystemUtils.h"
+#include "pcapplusplus/Logger.h"
+#include "pcapplusplus/Packet.h"
+#include "pcapplusplus/EthLayer.h"
+#include "pcapplusplus/IPv6Layer.h"
+#include "pcapplusplus/UdpLayer.h"
+#include "pcapplusplus/PPPoELayer.h"
+#include "pcapplusplus/DhcpV6Layer.h"
+#include "pcapplusplus/SystemUtils.h"
 
 PTF_TEST_CASE(PPPoESessionLayerParsingTest)
 {
diff --git a/Tests/Packet++Test/Tests/PacketTests.cpp b/Tests/Packet++Test/Tests/PacketTests.cpp
index 12bce597fd..60b3b2c276 100644
--- a/Tests/Packet++Test/Tests/PacketTests.cpp
+++ b/Tests/Packet++Test/Tests/PacketTests.cpp
@@ -1,25 +1,25 @@
 #include "../TestDefinition.h"
 #include "../Utils/TestUtils.h"
 #include "EndianPortable.h"
-#include "Logger.h"
-#include "Packet.h"
-#include "EthLayer.h"
-#include "IPv4Layer.h"
-#include "IPv6Layer.h"
-#include "PPPoELayer.h"
-#include "VlanLayer.h"
-#include "IcmpLayer.h"
-#include "TcpLayer.h"
-#include "UdpLayer.h"
-#include "IgmpLayer.h"
-#include "DnsLayer.h"
-#include "HttpLayer.h"
-#include "SSLLayer.h"
-#include "RadiusLayer.h"
-#include "PacketTrailerLayer.h"
-#include "PayloadLayer.h"
-#include "GeneralUtils.h"
-#include "SystemUtils.h"
+#include "pcapplusplus/Logger.h"
+#include "pcapplusplus/Packet.h"
+#include "pcapplusplus/EthLayer.h"
+#include "pcapplusplus/IPv4Layer.h"
+#include "pcapplusplus/IPv6Layer.h"
+#include "pcapplusplus/PPPoELayer.h"
+#include "pcapplusplus/VlanLayer.h"
+#include "pcapplusplus/IcmpLayer.h"
+#include "pcapplusplus/TcpLayer.h"
+#include "pcapplusplus/UdpLayer.h"
+#include "pcapplusplus/IgmpLayer.h"
+#include "pcapplusplus/DnsLayer.h"
+#include "pcapplusplus/HttpLayer.h"
+#include "pcapplusplus/SSLLayer.h"
+#include "pcapplusplus/RadiusLayer.h"
+#include "pcapplusplus/PacketTrailerLayer.h"
+#include "pcapplusplus/PayloadLayer.h"
+#include "pcapplusplus/GeneralUtils.h"
+#include "pcapplusplus/SystemUtils.h"
 
 PTF_TEST_CASE(InsertDataToPacket)
 {
diff --git a/Tests/Packet++Test/Tests/PacketUtilsTests.cpp b/Tests/Packet++Test/Tests/PacketUtilsTests.cpp
index 16d1e1bb2e..a6acdce08b 100644
--- a/Tests/Packet++Test/Tests/PacketUtilsTests.cpp
+++ b/Tests/Packet++Test/Tests/PacketUtilsTests.cpp
@@ -1,13 +1,13 @@
 #include "../TestDefinition.h"
 #include "../Utils/TestUtils.h"
 #include "EndianPortable.h"
-#include "Packet.h"
-#include "IPv4Layer.h"
-#include "IPv6Layer.h"
-#include "TcpLayer.h"
-#include "UdpLayer.h"
-#include "SystemUtils.h"
-#include "PacketUtils.h"
+#include "pcapplusplus/Packet.h"
+#include "pcapplusplus/IPv4Layer.h"
+#include "pcapplusplus/IPv6Layer.h"
+#include "pcapplusplus/TcpLayer.h"
+#include "pcapplusplus/UdpLayer.h"
+#include "pcapplusplus/SystemUtils.h"
+#include "pcapplusplus/PacketUtils.h"
 
 PTF_TEST_CASE(PacketUtilsHash5TupleUdp)
 {
diff --git a/Tests/Packet++Test/Tests/RadiusTests.cpp b/Tests/Packet++Test/Tests/RadiusTests.cpp
index c213b2ccb9..9be37a3436 100644
--- a/Tests/Packet++Test/Tests/RadiusTests.cpp
+++ b/Tests/Packet++Test/Tests/RadiusTests.cpp
@@ -1,12 +1,12 @@
 #include "../TestDefinition.h"
 #include "../Utils/TestUtils.h"
 #include "EndianPortable.h"
-#include "Packet.h"
-#include "EthLayer.h"
-#include "IPv4Layer.h"
-#include "UdpLayer.h"
-#include "RadiusLayer.h"
-#include "SystemUtils.h"
+#include "pcapplusplus/Packet.h"
+#include "pcapplusplus/EthLayer.h"
+#include "pcapplusplus/IPv4Layer.h"
+#include "pcapplusplus/UdpLayer.h"
+#include "pcapplusplus/RadiusLayer.h"
+#include "pcapplusplus/SystemUtils.h"
 
 PTF_TEST_CASE(RadiusLayerParsingTest)
 {
diff --git a/Tests/Packet++Test/Tests/S7CommTests.cpp b/Tests/Packet++Test/Tests/S7CommTests.cpp
index e7bc2267a4..dd10492cd6 100644
--- a/Tests/Packet++Test/Tests/S7CommTests.cpp
+++ b/Tests/Packet++Test/Tests/S7CommTests.cpp
@@ -1,9 +1,9 @@
 #include "../TestDefinition.h"
 #include "../Utils/TestUtils.h"
 #include "EndianPortable.h"
-#include "Packet.h"
-#include "S7CommLayer.h"
-#include "SystemUtils.h"
+#include "pcapplusplus/Packet.h"
+#include "pcapplusplus/S7CommLayer.h"
+#include "pcapplusplus/SystemUtils.h"
 
 PTF_TEST_CASE(S7CommLayerParsingTest)
 {
diff --git a/Tests/Packet++Test/Tests/SSHTests.cpp b/Tests/Packet++Test/Tests/SSHTests.cpp
index c048451e76..1501ab542d 100644
--- a/Tests/Packet++Test/Tests/SSHTests.cpp
+++ b/Tests/Packet++Test/Tests/SSHTests.cpp
@@ -1,8 +1,8 @@
 #include "../TestDefinition.h"
 #include "../Utils/TestUtils.h"
-#include "Packet.h"
-#include "SSHLayer.h"
-#include "SystemUtils.h"
+#include "pcapplusplus/Packet.h"
+#include "pcapplusplus/SSHLayer.h"
+#include "pcapplusplus/SystemUtils.h"
 
 PTF_TEST_CASE(SSHParsingTest)
 {
diff --git a/Tests/Packet++Test/Tests/SSLTests.cpp b/Tests/Packet++Test/Tests/SSLTests.cpp
index ea37359363..ab947b07d7 100644
--- a/Tests/Packet++Test/Tests/SSLTests.cpp
+++ b/Tests/Packet++Test/Tests/SSLTests.cpp
@@ -1,9 +1,9 @@
 #include "../TestDefinition.h"
 #include "../Utils/TestUtils.h"
 #include "EndianPortable.h"
-#include "Packet.h"
-#include "SSLLayer.h"
-#include "SystemUtils.h"
+#include "pcapplusplus/Packet.h"
+#include "pcapplusplus/SSLLayer.h"
+#include "pcapplusplus/SystemUtils.h"
 #include <fstream>
 #include <sstream>
 
diff --git a/Tests/Packet++Test/Tests/SipSdpTests.cpp b/Tests/Packet++Test/Tests/SipSdpTests.cpp
index 06256efd6e..47351b5c70 100644
--- a/Tests/Packet++Test/Tests/SipSdpTests.cpp
+++ b/Tests/Packet++Test/Tests/SipSdpTests.cpp
@@ -1,14 +1,14 @@
 #include "../TestDefinition.h"
 #include "../Utils/TestUtils.h"
-#include "Logger.h"
-#include "Packet.h"
-#include "EthLayer.h"
-#include "IPv4Layer.h"
-#include "UdpLayer.h"
-#include "SipLayer.h"
-#include "SdpLayer.h"
-#include "PayloadLayer.h"
-#include "SystemUtils.h"
+#include "pcapplusplus/Logger.h"
+#include "pcapplusplus/Packet.h"
+#include "pcapplusplus/EthLayer.h"
+#include "pcapplusplus/IPv4Layer.h"
+#include "pcapplusplus/UdpLayer.h"
+#include "pcapplusplus/SipLayer.h"
+#include "pcapplusplus/SdpLayer.h"
+#include "pcapplusplus/PayloadLayer.h"
+#include "pcapplusplus/SystemUtils.h"
 
 PTF_TEST_CASE(SipRequestParseMethodTest)
 {
diff --git a/Tests/Packet++Test/Tests/Sll2Tests.cpp b/Tests/Packet++Test/Tests/Sll2Tests.cpp
index 64e6b417b7..22ac67d957 100644
--- a/Tests/Packet++Test/Tests/Sll2Tests.cpp
+++ b/Tests/Packet++Test/Tests/Sll2Tests.cpp
@@ -1,15 +1,15 @@
 #include "../TestDefinition.h"
 #include "../Utils/TestUtils.h"
 #include "EndianPortable.h"
-#include "EthLayer.h"
-#include "IPv4Layer.h"
-#include "MacAddress.h"
-#include "Packet.h"
-#include "Sll2Layer.h"
-#include "TcpLayer.h"
-#include "SystemUtils.h"
-#include "UdpLayer.h"
-#include "Logger.h"
+#include "pcapplusplus/EthLayer.h"
+#include "pcapplusplus/IPv4Layer.h"
+#include "pcapplusplus/MacAddress.h"
+#include "pcapplusplus/Packet.h"
+#include "pcapplusplus/Sll2Layer.h"
+#include "pcapplusplus/TcpLayer.h"
+#include "pcapplusplus/SystemUtils.h"
+#include "pcapplusplus/UdpLayer.h"
+#include "pcapplusplus/Logger.h"
 
 PTF_TEST_CASE(Sll2PacketParsingTest)
 {
diff --git a/Tests/Packet++Test/Tests/SllNullLoopbackTests.cpp b/Tests/Packet++Test/Tests/SllNullLoopbackTests.cpp
index e9f7283d65..8d7971dedc 100644
--- a/Tests/Packet++Test/Tests/SllNullLoopbackTests.cpp
+++ b/Tests/Packet++Test/Tests/SllNullLoopbackTests.cpp
@@ -1,16 +1,16 @@
 #include "../TestDefinition.h"
 #include "../Utils/TestUtils.h"
 #include "EndianPortable.h"
-#include "MacAddress.h"
-#include "Packet.h"
-#include "SllLayer.h"
-#include "NullLoopbackLayer.h"
-#include "EthLayer.h"
-#include "IPv4Layer.h"
-#include "UdpLayer.h"
-#include "TcpLayer.h"
-#include "PayloadLayer.h"
-#include "SystemUtils.h"
+#include "pcapplusplus/MacAddress.h"
+#include "pcapplusplus/Packet.h"
+#include "pcapplusplus/SllLayer.h"
+#include "pcapplusplus/NullLoopbackLayer.h"
+#include "pcapplusplus/EthLayer.h"
+#include "pcapplusplus/IPv4Layer.h"
+#include "pcapplusplus/UdpLayer.h"
+#include "pcapplusplus/TcpLayer.h"
+#include "pcapplusplus/PayloadLayer.h"
+#include "pcapplusplus/SystemUtils.h"
 
 PTF_TEST_CASE(SllPacketParsingTest)
 {
diff --git a/Tests/Packet++Test/Tests/SmtpTests.cpp b/Tests/Packet++Test/Tests/SmtpTests.cpp
index c8e0cfc416..ae95691705 100644
--- a/Tests/Packet++Test/Tests/SmtpTests.cpp
+++ b/Tests/Packet++Test/Tests/SmtpTests.cpp
@@ -1,13 +1,13 @@
 #include "../TestDefinition.h"
 #include "../Utils/TestUtils.h"
 #include "EndianPortable.h"
-#include "EthLayer.h"
-#include "IPv4Layer.h"
-#include "IPv6Layer.h"
-#include "Packet.h"
-#include "SmtpLayer.h"
-#include "SystemUtils.h"
-#include "TcpLayer.h"
+#include "pcapplusplus/EthLayer.h"
+#include "pcapplusplus/IPv4Layer.h"
+#include "pcapplusplus/IPv6Layer.h"
+#include "pcapplusplus/Packet.h"
+#include "pcapplusplus/SmtpLayer.h"
+#include "pcapplusplus/SystemUtils.h"
+#include "pcapplusplus/TcpLayer.h"
 
 PTF_TEST_CASE(SmtpParsingTests)
 {
diff --git a/Tests/Packet++Test/Tests/SomeIpSdTests.cpp b/Tests/Packet++Test/Tests/SomeIpSdTests.cpp
index 8f7227d53c..ea52264500 100644
--- a/Tests/Packet++Test/Tests/SomeIpSdTests.cpp
+++ b/Tests/Packet++Test/Tests/SomeIpSdTests.cpp
@@ -2,10 +2,10 @@
 #include "../Utils/TestUtils.h"
 #include <sstream>
 #include "EndianPortable.h"
-#include "Logger.h"
-#include "Packet.h"
-#include "SomeIpSdLayer.h"
-#include "SystemUtils.h"
+#include "pcapplusplus/Logger.h"
+#include "pcapplusplus/Packet.h"
+#include "pcapplusplus/SomeIpSdLayer.h"
+#include "pcapplusplus/SystemUtils.h"
 
 PTF_TEST_CASE(SomeIpSdParsingTest)
 {
diff --git a/Tests/Packet++Test/Tests/SomeIpTests.cpp b/Tests/Packet++Test/Tests/SomeIpTests.cpp
index 216b9b34b0..4f52f88122 100644
--- a/Tests/Packet++Test/Tests/SomeIpTests.cpp
+++ b/Tests/Packet++Test/Tests/SomeIpTests.cpp
@@ -1,13 +1,13 @@
 #include "../TestDefinition.h"
 #include "../Utils/TestUtils.h"
-#include "EthLayer.h"
-#include "IPv4Layer.h"
-#include "IPv6Layer.h"
-#include "Packet.h"
-#include "SomeIpLayer.h"
-#include "SystemUtils.h"
-#include "UdpLayer.h"
-#include "VlanLayer.h"
+#include "pcapplusplus/EthLayer.h"
+#include "pcapplusplus/IPv4Layer.h"
+#include "pcapplusplus/IPv6Layer.h"
+#include "pcapplusplus/Packet.h"
+#include "pcapplusplus/SomeIpLayer.h"
+#include "pcapplusplus/SystemUtils.h"
+#include "pcapplusplus/UdpLayer.h"
+#include "pcapplusplus/VlanLayer.h"
 #include <array>
 #include <cstring>
 
diff --git a/Tests/Packet++Test/Tests/StpTests.cpp b/Tests/Packet++Test/Tests/StpTests.cpp
index 409d9c43f0..120453f0ca 100644
--- a/Tests/Packet++Test/Tests/StpTests.cpp
+++ b/Tests/Packet++Test/Tests/StpTests.cpp
@@ -1,10 +1,10 @@
 #include "../TestDefinition.h"
 #include "../Utils/TestUtils.h"
 #include "EndianPortable.h"
-#include "GeneralUtils.h"
-#include "SystemUtils.h"
-#include "Packet.h"
-#include "StpLayer.h"
+#include "pcapplusplus/GeneralUtils.h"
+#include "pcapplusplus/SystemUtils.h"
+#include "pcapplusplus/Packet.h"
+#include "pcapplusplus/StpLayer.h"
 
 PTF_TEST_CASE(StpConfigurationParsingTests)
 {
diff --git a/Tests/Packet++Test/Tests/TcpTests.cpp b/Tests/Packet++Test/Tests/TcpTests.cpp
index d95029268a..f7b9ee8142 100644
--- a/Tests/Packet++Test/Tests/TcpTests.cpp
+++ b/Tests/Packet++Test/Tests/TcpTests.cpp
@@ -1,14 +1,14 @@
 #include "../TestDefinition.h"
 #include "../Utils/TestUtils.h"
 #include "EndianPortable.h"
-#include "Packet.h"
-#include "EthLayer.h"
-#include "IPv4Layer.h"
-#include "TcpLayer.h"
-#include "PayloadLayer.h"
-#include "SystemUtils.h"
-#include "PacketUtils.h"
-#include "DeprecationUtils.h"
+#include "pcapplusplus/Packet.h"
+#include "pcapplusplus/EthLayer.h"
+#include "pcapplusplus/IPv4Layer.h"
+#include "pcapplusplus/TcpLayer.h"
+#include "pcapplusplus/PayloadLayer.h"
+#include "pcapplusplus/SystemUtils.h"
+#include "pcapplusplus/PacketUtils.h"
+#include "pcapplusplus/DeprecationUtils.h"
 
 // TODO: remove these macros, when deprecated code is gone
 DISABLE_WARNING_PUSH
diff --git a/Tests/Packet++Test/Tests/TelnetTests.cpp b/Tests/Packet++Test/Tests/TelnetTests.cpp
index b60f16a6ba..8bb59ab7c4 100644
--- a/Tests/Packet++Test/Tests/TelnetTests.cpp
+++ b/Tests/Packet++Test/Tests/TelnetTests.cpp
@@ -1,10 +1,10 @@
 #include "../TestDefinition.h"
 #include "../Utils/TestUtils.h"
-#include "GeneralUtils.h"
-#include "Logger.h"
-#include "Packet.h"
-#include "SystemUtils.h"
-#include "TelnetLayer.h"
+#include "pcapplusplus/GeneralUtils.h"
+#include "pcapplusplus/Logger.h"
+#include "pcapplusplus/Packet.h"
+#include "pcapplusplus/SystemUtils.h"
+#include "pcapplusplus/TelnetLayer.h"
 
 #include <string.h>
 
diff --git a/Tests/Packet++Test/Tests/TpktTests.cpp b/Tests/Packet++Test/Tests/TpktTests.cpp
index ad80dbdeb0..ec2897a086 100644
--- a/Tests/Packet++Test/Tests/TpktTests.cpp
+++ b/Tests/Packet++Test/Tests/TpktTests.cpp
@@ -1,9 +1,9 @@
 #include "../TestDefinition.h"
 #include "../Utils/TestUtils.h"
 #include "EndianPortable.h"
-#include "Packet.h"
-#include "SystemUtils.h"
-#include "TpktLayer.h"
+#include "pcapplusplus/Packet.h"
+#include "pcapplusplus/SystemUtils.h"
+#include "pcapplusplus/TpktLayer.h"
 #include <iostream>
 
 PTF_TEST_CASE(TpktLayerTest)
diff --git a/Tests/Packet++Test/Tests/VlanMplsTests.cpp b/Tests/Packet++Test/Tests/VlanMplsTests.cpp
index 4a1bcc141a..e0975bf608 100644
--- a/Tests/Packet++Test/Tests/VlanMplsTests.cpp
+++ b/Tests/Packet++Test/Tests/VlanMplsTests.cpp
@@ -1,15 +1,15 @@
 #include "../TestDefinition.h"
 #include "../Utils/TestUtils.h"
 #include "EndianPortable.h"
-#include "Logger.h"
-#include "Packet.h"
-#include "ArpLayer.h"
-#include "VlanLayer.h"
-#include "MplsLayer.h"
-#include "VxlanLayer.h"
-#include "PayloadLayer.h"
-#include "UdpLayer.h"
-#include "SystemUtils.h"
+#include "pcapplusplus/Logger.h"
+#include "pcapplusplus/Packet.h"
+#include "pcapplusplus/ArpLayer.h"
+#include "pcapplusplus/VlanLayer.h"
+#include "pcapplusplus/MplsLayer.h"
+#include "pcapplusplus/VxlanLayer.h"
+#include "pcapplusplus/PayloadLayer.h"
+#include "pcapplusplus/UdpLayer.h"
+#include "pcapplusplus/SystemUtils.h"
 
 PTF_TEST_CASE(VlanParseAndCreation)
 {
diff --git a/Tests/Packet++Test/Tests/VrrpTest.cpp b/Tests/Packet++Test/Tests/VrrpTest.cpp
index c38fadbd39..ea8d666f10 100644
--- a/Tests/Packet++Test/Tests/VrrpTest.cpp
+++ b/Tests/Packet++Test/Tests/VrrpTest.cpp
@@ -2,14 +2,14 @@
 
 #include "../TestDefinition.h"
 #include "../Utils/TestUtils.h"
-#include "Logger.h"
-#include "Packet.h"
-#include "EthLayer.h"
-#include "VrrpLayer.h"
-#include "IPv4Layer.h"
-#include "IPv6Layer.h"
-#include "PayloadLayer.h"
-#include "SystemUtils.h"
+#include "pcapplusplus/Logger.h"
+#include "pcapplusplus/Packet.h"
+#include "pcapplusplus/EthLayer.h"
+#include "pcapplusplus/VrrpLayer.h"
+#include "pcapplusplus/IPv4Layer.h"
+#include "pcapplusplus/IPv6Layer.h"
+#include "pcapplusplus/PayloadLayer.h"
+#include "pcapplusplus/SystemUtils.h"
 
 PTF_TEST_CASE(VrrpParsingTest)
 {
diff --git a/Tests/Packet++Test/Tests/WakeOnLanTests.cpp b/Tests/Packet++Test/Tests/WakeOnLanTests.cpp
index aaf233346a..b903f1e5f3 100644
--- a/Tests/Packet++Test/Tests/WakeOnLanTests.cpp
+++ b/Tests/Packet++Test/Tests/WakeOnLanTests.cpp
@@ -1,10 +1,10 @@
 #include "../TestDefinition.h"
 #include "../Utils/TestUtils.h"
-#include "GeneralUtils.h"
-#include "SystemUtils.h"
-#include "Logger.h"
-#include "Packet.h"
-#include "WakeOnLanLayer.h"
+#include "pcapplusplus/GeneralUtils.h"
+#include "pcapplusplus/SystemUtils.h"
+#include "pcapplusplus/Logger.h"
+#include "pcapplusplus/Packet.h"
+#include "pcapplusplus/WakeOnLanLayer.h"
 
 PTF_TEST_CASE(WakeOnLanParsingTests)
 {
diff --git a/Tests/Packet++Test/Tests/WireGuardTests.cpp b/Tests/Packet++Test/Tests/WireGuardTests.cpp
index 480ce74ff0..d45a0ef8ed 100644
--- a/Tests/Packet++Test/Tests/WireGuardTests.cpp
+++ b/Tests/Packet++Test/Tests/WireGuardTests.cpp
@@ -1,8 +1,8 @@
 #include "../TestDefinition.h"
 #include "../Utils/TestUtils.h"
-#include "Packet.h"
-#include "WireGuardLayer.h"
-#include "SystemUtils.h"
+#include "pcapplusplus/Packet.h"
+#include "pcapplusplus/WireGuardLayer.h"
+#include "pcapplusplus/SystemUtils.h"
 #include <cstring>
 #include "EndianPortable.h"
 
diff --git a/Tests/Packet++Test/Utils/TestUtils.cpp b/Tests/Packet++Test/Utils/TestUtils.cpp
index 6d7d3b2230..22249fda7a 100644
--- a/Tests/Packet++Test/Utils/TestUtils.cpp
+++ b/Tests/Packet++Test/Utils/TestUtils.cpp
@@ -1,5 +1,5 @@
 #include "TestUtils.h"
-#include "SomeIpLayer.h"
+#include "pcapplusplus/SomeIpLayer.h"
 #include <iostream>
 #include <iomanip>
 #include <string.h>
@@ -118,7 +118,7 @@ namespace pcpp_tests
 	}
 
 #ifdef PCPP_TESTS_DEBUG
-#	include "pcap.h"
+#	include <pcap.h>
 
 	void savePacketToPcap(pcpp::Packet& packet, const std::string& fileName)
 	{
diff --git a/Tests/Packet++Test/Utils/TestUtils.h b/Tests/Packet++Test/Utils/TestUtils.h
index 89c2691110..5b784a1809 100644
--- a/Tests/Packet++Test/Utils/TestUtils.h
+++ b/Tests/Packet++Test/Utils/TestUtils.h
@@ -2,7 +2,7 @@
 
 // clang-format off
 #ifdef PCPP_TESTS_DEBUG
-#include "Packet.h"
+#include "pcapplusplus/Packet.h"
 #endif
 // clang-format on
 #include <cstdint>
diff --git a/Tests/Packet++Test/main.cpp b/Tests/Packet++Test/main.cpp
index a026968c93..fbffda5f5f 100644
--- a/Tests/Packet++Test/main.cpp
+++ b/Tests/Packet++Test/main.cpp
@@ -1,9 +1,10 @@
 #include <getopt.h>
-#include "PcapPlusPlusVersion.h"
+#include "pcapplusplus/PcapPlusPlusVersion.h"
 #include "PcppTestFrameworkRun.h"
+#include "pcapplusplus/Logger.h"
+
 #include "TestDefinition.h"
-#include "Logger.h"
-#include "../../Tests/Packet++Test/Utils/TestUtils.h"
+#include "Utils/TestUtils.h"
 
 static struct option PacketTestOptions[] = {
 	{ "include-tags",        required_argument, nullptr, 't' },
diff --git a/Tests/Pcap++Test/Common/TestUtils.cpp b/Tests/Pcap++Test/Common/TestUtils.cpp
index 14fd12a841..490cfc5d61 100644
--- a/Tests/Pcap++Test/Common/TestUtils.cpp
+++ b/Tests/Pcap++Test/Common/TestUtils.cpp
@@ -1,14 +1,14 @@
 #include "TestUtils.h"
 #include <fstream>
 #include "GlobalTestArgs.h"
-#include "PcapFileDevice.h"
-#include "PcapLiveDeviceList.h"
+#include "pcapplusplus/PcapFileDevice.h"
+#include "pcapplusplus/PcapLiveDeviceList.h"
 // clang-format off
 #ifdef USE_PF_RING
-#include "PfRingDeviceList.h"
+#include "pcapplusplus/PfRingDeviceList.h"
 #endif
 #ifdef USE_DPDK
-#include "DpdkDeviceList.h"
+#include "pcapplusplus/DpdkDeviceList.h"
 #endif
 // clang-format on
 
diff --git a/Tests/Pcap++Test/Common/TestUtils.h b/Tests/Pcap++Test/Common/TestUtils.h
index 9e90883fe7..73baabdff7 100644
--- a/Tests/Pcap++Test/Common/TestUtils.h
+++ b/Tests/Pcap++Test/Common/TestUtils.h
@@ -3,8 +3,8 @@
 #include <string>
 #include <vector>
 #include <unordered_map>
-#include "RawPacket.h"
-#include "Device.h"
+#include "pcapplusplus/RawPacket.h"
+#include "pcapplusplus/Device.h"
 
 class DeviceTeardown
 {
diff --git a/Tests/Pcap++Test/Tests/DpdkTests.cpp b/Tests/Pcap++Test/Tests/DpdkTests.cpp
index 1a5115e185..813c4f2ea4 100644
--- a/Tests/Pcap++Test/Tests/DpdkTests.cpp
+++ b/Tests/Pcap++Test/Tests/DpdkTests.cpp
@@ -7,14 +7,14 @@
 #ifdef USE_DPDK
 #	include <mutex>
 #	include <thread>
-#	include "Logger.h"
-#	include "PacketUtils.h"
-#	include "IPv4Layer.h"
-#	include "TcpLayer.h"
-#	include "UdpLayer.h"
-#	include "DnsLayer.h"
-#	include "DpdkDeviceList.h"
-#	include "PcapFileDevice.h"
+#	include "pcapplusplus/Logger.h"
+#	include "pcapplusplus/PacketUtils.h"
+#	include "pcapplusplus/IPv4Layer.h"
+#	include "pcapplusplus/TcpLayer.h"
+#	include "pcapplusplus/UdpLayer.h"
+#	include "pcapplusplus/DnsLayer.h"
+#	include "pcapplusplus/DpdkDeviceList.h"
+#	include "pcapplusplus/PcapFileDevice.h"
 #endif
 
 extern PcapTestArgs PcapTestGlobalArgs;
diff --git a/Tests/Pcap++Test/Tests/FileTests.cpp b/Tests/Pcap++Test/Tests/FileTests.cpp
index 5b24885b2b..74d1d4333a 100644
--- a/Tests/Pcap++Test/Tests/FileTests.cpp
+++ b/Tests/Pcap++Test/Tests/FileTests.cpp
@@ -1,7 +1,7 @@
 #include "../TestDefinition.h"
-#include "Logger.h"
-#include "Packet.h"
-#include "PcapFileDevice.h"
+#include "pcapplusplus/Logger.h"
+#include "pcapplusplus/Packet.h"
+#include "pcapplusplus/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 3eeb904725..f2d3a98478 100644
--- a/Tests/Pcap++Test/Tests/FilterTests.cpp
+++ b/Tests/Pcap++Test/Tests/FilterTests.cpp
@@ -1,15 +1,15 @@
 #include "../TestDefinition.h"
 #include "EndianPortable.h"
-#include "SystemUtils.h"
-#include "EthLayer.h"
-#include "VlanLayer.h"
-#include "IPv4Layer.h"
-#include "IPv6Layer.h"
-#include "TcpLayer.h"
-#include "UdpLayer.h"
-#include "Packet.h"
-#include "PcapLiveDeviceList.h"
-#include "PcapFileDevice.h"
+#include "pcapplusplus/SystemUtils.h"
+#include "pcapplusplus/EthLayer.h"
+#include "pcapplusplus/VlanLayer.h"
+#include "pcapplusplus/IPv4Layer.h"
+#include "pcapplusplus/IPv6Layer.h"
+#include "pcapplusplus/TcpLayer.h"
+#include "pcapplusplus/UdpLayer.h"
+#include "pcapplusplus/Packet.h"
+#include "pcapplusplus/PcapLiveDeviceList.h"
+#include "pcapplusplus/PcapFileDevice.h"
 #include "../Common/GlobalTestArgs.h"
 #include "../Common/PcapFileNamesDef.h"
 #include "../Common/TestUtils.h"
diff --git a/Tests/Pcap++Test/Tests/IPFragmentationTests.cpp b/Tests/Pcap++Test/Tests/IPFragmentationTests.cpp
index fcacbb6888..a6be09e0a0 100644
--- a/Tests/Pcap++Test/Tests/IPFragmentationTests.cpp
+++ b/Tests/Pcap++Test/Tests/IPFragmentationTests.cpp
@@ -1,9 +1,9 @@
 #include "../TestDefinition.h"
 #include "../Common/TestUtils.h"
-#include "IPReassembly.h"
-#include "IPv6Layer.h"
-#include "HttpLayer.h"
-#include "PcapFileDevice.h"
+#include "pcapplusplus/IPReassembly.h"
+#include "pcapplusplus/IPv6Layer.h"
+#include "pcapplusplus/HttpLayer.h"
+#include "pcapplusplus/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 84a8c1475f..de58c525df 100644
--- a/Tests/Pcap++Test/Tests/IpMacTests.cpp
+++ b/Tests/Pcap++Test/Tests/IpMacTests.cpp
@@ -6,16 +6,16 @@
 #include <cmath>
 #include <tuple>
 #include "EndianPortable.h"
-#include "Logger.h"
-#include "GeneralUtils.h"
-#include "IpUtils.h"
-#include "IpAddress.h"
-#include "IpAddressUtils.h"
-#include "MacAddress.h"
-#include "LRUList.h"
-#include "NetworkUtils.h"
-#include "PcapLiveDeviceList.h"
-#include "SystemUtils.h"
+#include "pcapplusplus/Logger.h"
+#include "pcapplusplus/GeneralUtils.h"
+#include "pcapplusplus/IpUtils.h"
+#include "pcapplusplus/IpAddress.h"
+#include "pcapplusplus/IpAddressUtils.h"
+#include "pcapplusplus/MacAddress.h"
+#include "pcapplusplus/LRUList.h"
+#include "pcapplusplus/NetworkUtils.h"
+#include "pcapplusplus/PcapLiveDeviceList.h"
+#include "pcapplusplus/SystemUtils.h"
 
 extern PcapTestArgs PcapTestGlobalArgs;
 
diff --git a/Tests/Pcap++Test/Tests/KniTests.cpp b/Tests/Pcap++Test/Tests/KniTests.cpp
index b090767f44..a2ee4248cc 100644
--- a/Tests/Pcap++Test/Tests/KniTests.cpp
+++ b/Tests/Pcap++Test/Tests/KniTests.cpp
@@ -3,10 +3,10 @@
 #include "../Common/PcapFileNamesDef.h"
 
 #ifdef USE_DPDK_KNI
-#	include "KniDeviceList.h"
-#	include "PcapFileDevice.h"
-#	include "RawSocketDevice.h"
-#	include "SystemUtils.h"
+#	include "pcapplusplus/KniDeviceList.h"
+#	include "pcapplusplus/PcapFileDevice.h"
+#	include "pcapplusplus/RawSocketDevice.h"
+#	include "pcapplusplus/SystemUtils.h"
 #	include <thread>
 
 extern PcapTestArgs PcapTestGlobalArgs;
diff --git a/Tests/Pcap++Test/Tests/LiveDeviceTests.cpp b/Tests/Pcap++Test/Tests/LiveDeviceTests.cpp
index 9de5740369..5ead500233 100644
--- a/Tests/Pcap++Test/Tests/LiveDeviceTests.cpp
+++ b/Tests/Pcap++Test/Tests/LiveDeviceTests.cpp
@@ -1,13 +1,13 @@
 #include "../TestDefinition.h"
-#include "Logger.h"
-#include "SystemUtils.h"
-#include "PcapLiveDeviceList.h"
-#include "PcapFileDevice.h"
-#include "EthLayer.h"
-#include "IPv4Layer.h"
-#include "UdpLayer.h"
-#include "PayloadLayer.h"
-#include "Packet.h"
+#include "pcapplusplus/Logger.h"
+#include "pcapplusplus/SystemUtils.h"
+#include "pcapplusplus/PcapLiveDeviceList.h"
+#include "pcapplusplus/PcapFileDevice.h"
+#include "pcapplusplus/EthLayer.h"
+#include "pcapplusplus/IPv4Layer.h"
+#include "pcapplusplus/UdpLayer.h"
+#include "pcapplusplus/PayloadLayer.h"
+#include "pcapplusplus/Packet.h"
 #include "../Common/GlobalTestArgs.h"
 #include "../Common/TestUtils.h"
 #include "../Common/PcapFileNamesDef.h"
@@ -17,9 +17,9 @@
 #include <algorithm>
 #include <cstdio>
 #if defined(_WIN32)
-#	include "PcapRemoteDevice.h"
-#	include "PcapRemoteDeviceList.h"
-#	include "WinPcapLiveDevice.h"
+#	include "pcapplusplus/PcapRemoteDevice.h"
+#	include "pcapplusplus/PcapRemoteDeviceList.h"
+#	include "pcapplusplus/WinPcapLiveDevice.h"
 #	include <windows.h>
 #endif
 
diff --git a/Tests/Pcap++Test/Tests/LoggerTests.cpp b/Tests/Pcap++Test/Tests/LoggerTests.cpp
index 5579c350c5..0e6fe2b8fc 100644
--- a/Tests/Pcap++Test/Tests/LoggerTests.cpp
+++ b/Tests/Pcap++Test/Tests/LoggerTests.cpp
@@ -6,8 +6,8 @@
 #include <string>
 #include <thread>
 
-#include "Logger.h"
-#include "SystemUtils.h"
+#include "pcapplusplus/Logger.h"
+#include "pcapplusplus/SystemUtils.h"
 
 namespace pcpp
 {
diff --git a/Tests/Pcap++Test/Tests/ObjectPoolTests.cpp b/Tests/Pcap++Test/Tests/ObjectPoolTests.cpp
index 3f79e0ef30..214bc55df5 100644
--- a/Tests/Pcap++Test/Tests/ObjectPoolTests.cpp
+++ b/Tests/Pcap++Test/Tests/ObjectPoolTests.cpp
@@ -1,7 +1,7 @@
 
 #include "../TestDefinition.h"
 
-#include "ObjectPool.h"
+#include "pcapplusplus/ObjectPool.h"
 
 PTF_TEST_CASE(TestObjectPool)
 {
diff --git a/Tests/Pcap++Test/Tests/PacketParsingTests.cpp b/Tests/Pcap++Test/Tests/PacketParsingTests.cpp
index a22fbb9437..8a18c7cdf7 100644
--- a/Tests/Pcap++Test/Tests/PacketParsingTests.cpp
+++ b/Tests/Pcap++Test/Tests/PacketParsingTests.cpp
@@ -2,10 +2,10 @@
 #include "../Common/PcapFileNamesDef.h"
 #include <sstream>
 #include <fstream>
-#include "Packet.h"
-#include "HttpLayer.h"
-#include "DnsLayer.h"
-#include "PcapFileDevice.h"
+#include "pcapplusplus/Packet.h"
+#include "pcapplusplus/HttpLayer.h"
+#include "pcapplusplus/DnsLayer.h"
+#include "pcapplusplus/PcapFileDevice.h"
 
 PTF_TEST_CASE(TestHttpRequestParsing)
 {
diff --git a/Tests/Pcap++Test/Tests/PfRingTests.cpp b/Tests/Pcap++Test/Tests/PfRingTests.cpp
index aa97ac748a..dc18eb811f 100644
--- a/Tests/Pcap++Test/Tests/PfRingTests.cpp
+++ b/Tests/Pcap++Test/Tests/PfRingTests.cpp
@@ -4,12 +4,12 @@
 #include "../Common/PcapFileNamesDef.h"
 
 #ifdef USE_PF_RING
-#	include "Logger.h"
-#	include "PacketUtils.h"
-#	include "IPv4Layer.h"
-#	include "PfRingDeviceList.h"
-#	include "PcapFileDevice.h"
-#	include "PcapLiveDeviceList.h"
+#	include "pcapplusplus/Logger.h"
+#	include "pcapplusplus/PacketUtils.h"
+#	include "pcapplusplus/IPv4Layer.h"
+#	include "pcapplusplus/PfRingDeviceList.h"
+#	include "pcapplusplus/PcapFileDevice.h"
+#	include "pcapplusplus/PcapLiveDeviceList.h"
 #	include <thread>
 #endif
 
diff --git a/Tests/Pcap++Test/Tests/RawSocketTests.cpp b/Tests/Pcap++Test/Tests/RawSocketTests.cpp
index 34b8c24f57..28da240b98 100644
--- a/Tests/Pcap++Test/Tests/RawSocketTests.cpp
+++ b/Tests/Pcap++Test/Tests/RawSocketTests.cpp
@@ -1,10 +1,10 @@
 #include "../TestDefinition.h"
 #include "../Common/PcapFileNamesDef.h"
 #include "../Common/GlobalTestArgs.h"
-#include "Logger.h"
-#include "Packet.h"
-#include "RawSocketDevice.h"
-#include "PcapFileDevice.h"
+#include "pcapplusplus/Logger.h"
+#include "pcapplusplus/Packet.h"
+#include "pcapplusplus/RawSocketDevice.h"
+#include "pcapplusplus/PcapFileDevice.h"
 
 extern PcapTestArgs PcapTestGlobalArgs;
 
diff --git a/Tests/Pcap++Test/Tests/SystemUtilsTests.cpp b/Tests/Pcap++Test/Tests/SystemUtilsTests.cpp
index 86f445da85..57120e6aa6 100644
--- a/Tests/Pcap++Test/Tests/SystemUtilsTests.cpp
+++ b/Tests/Pcap++Test/Tests/SystemUtilsTests.cpp
@@ -1,5 +1,5 @@
 #include "../TestDefinition.h"
-#include "SystemUtils.h"
+#include "pcapplusplus/SystemUtils.h"
 #include <bitset>
 
 PTF_TEST_CASE(TestSystemCoreUtils)
diff --git a/Tests/Pcap++Test/Tests/TcpReassemblyTests.cpp b/Tests/Pcap++Test/Tests/TcpReassemblyTests.cpp
index 9b65d9f6a1..8407c025db 100644
--- a/Tests/Pcap++Test/Tests/TcpReassemblyTests.cpp
+++ b/Tests/Pcap++Test/Tests/TcpReassemblyTests.cpp
@@ -6,12 +6,12 @@
 #include <chrono>
 #include <thread>
 #include "EndianPortable.h"
-#include "SystemUtils.h"
-#include "TcpReassembly.h"
-#include "IPv4Layer.h"
-#include "TcpLayer.h"
-#include "PayloadLayer.h"
-#include "PcapFileDevice.h"
+#include "pcapplusplus/SystemUtils.h"
+#include "pcapplusplus/TcpReassembly.h"
+#include "pcapplusplus/IPv4Layer.h"
+#include "pcapplusplus/TcpLayer.h"
+#include "pcapplusplus/PayloadLayer.h"
+#include "pcapplusplus/PcapFileDevice.h"
 
 // ~~~~~~~~~~~~~~~~~~
 // TcpReassemblyStats
diff --git a/Tests/Pcap++Test/Tests/XdpTests.cpp b/Tests/Pcap++Test/Tests/XdpTests.cpp
index 13676c3873..a48ff35e1f 100644
--- a/Tests/Pcap++Test/Tests/XdpTests.cpp
+++ b/Tests/Pcap++Test/Tests/XdpTests.cpp
@@ -1,10 +1,10 @@
 #include "../TestDefinition.h"
 #include "../Common/GlobalTestArgs.h"
-#include "PcapLiveDeviceList.h"
-#include "XdpDevice.h"
-#include "PcapFileDevice.h"
-#include "Packet.h"
-#include "Logger.h"
+#include "pcapplusplus/PcapLiveDeviceList.h"
+#include "pcapplusplus/XdpDevice.h"
+#include "pcapplusplus/PcapFileDevice.h"
+#include "pcapplusplus/Packet.h"
+#include "pcapplusplus/Logger.h"
 
 extern PcapTestArgs PcapTestGlobalArgs;
 
diff --git a/Tests/Pcap++Test/main.cpp b/Tests/Pcap++Test/main.cpp
index 204e34fee7..71c2108f29 100644
--- a/Tests/Pcap++Test/main.cpp
+++ b/Tests/Pcap++Test/main.cpp
@@ -1,5 +1,5 @@
-#include "PcapPlusPlusVersion.h"
-#include "Logger.h"
+#include "pcapplusplus/PcapPlusPlusVersion.h"
+#include "pcapplusplus/Logger.h"
 #include "PcppTestFrameworkRun.h"
 #include "TestDefinition.h"
 #include "Common/GlobalTestArgs.h"
diff --git a/cmake/PcapPlusPlus.pc.in b/cmake/PcapPlusPlus.pc.in
index efb2ff31ea..4a9e30358a 100644
--- a/cmake/PcapPlusPlus.pc.in
+++ b/cmake/PcapPlusPlus.pc.in
@@ -6,5 +6,5 @@ Name: @PROJECT_NAME@
 Description: @CMAKE_PROJECT_DESCRIPTION@
 URL: @CMAKE_PROJECT_HOMEPAGE_URL@
 Version: @PCAPPP_VERSION@
-Cflags: -I${includedir}/pcapplusplus
+Cflags: -I${includedir}
 Libs: @PCAPPP_PKGCONFIG_EXTRA_LIBS@ -L${libdir} -lPcap++ -lPacket++ -lCommon++ -lpcap -lpthread
diff --git a/cmake/PcapPlusPlusConfig.cmake.in b/cmake/PcapPlusPlusConfig.cmake.in
index b5c03a9472..a823673392 100644
--- a/cmake/PcapPlusPlusConfig.cmake.in
+++ b/cmake/PcapPlusPlusConfig.cmake.in
@@ -8,6 +8,21 @@
 
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/modules")
 
+# Default behavior is to enable the old style include by default during the deprecation period.
+if(NOT DEFINED PCAPPP_ENABLE_OLD_STYLE_INCLUDE)
+  set(PCAPPP_ENABLE_OLD_STYLE_INCLUDE ON)
+endif()
+
+if(PCAPPP_ENABLE_OLD_STYLE_INCLUDE)
+  message(
+    DEPRECATION
+    "PcapPlusPlus: Old style include directories are enabled, directly adding the <pcapplusplus> folder to the include directories."
+    "This functionality is deprecated and will be removed in the future."
+    "New include format should follow: \"#include <pcapplusplus/xxx.h>\" "
+    "This behaviour can be disabled by setting \"PCAPPP_ENABLE_OLD_STYLE_INCLUDE\" to OFF"
+  )
+endif()
+
 include(CMakeFindDependencyMacro)
 
 set_and_check(PcapPlusPlus_INCLUDE_DIR
@@ -24,4 +39,17 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}")
 
 include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake")
 
+# Restores target properties for Common++, Packet++ and Pcap++ that are required by generator expressions.
+set_target_properties(PcapPlusPlus::Common++ PROPERTIES
+    PCAPPP_ENABLE_OLD_STYLE_INCLUDE "${PCAPPP_ENABLE_OLD_STYLE_INCLUDE}"
+)
+
+set_target_properties(PcapPlusPlus::Packet++ PROPERTIES
+    PCAPPP_ENABLE_OLD_STYLE_INCLUDE "${PCAPPP_ENABLE_OLD_STYLE_INCLUDE}"
+)
+
+set_target_properties(PcapPlusPlus::Pcap++ PROPERTIES
+    PCAPPP_ENABLE_OLD_STYLE_INCLUDE "${PCAPPP_ENABLE_OLD_STYLE_INCLUDE}"
+)
+
 check_required_components(@PROJECT_NAME@)
diff --git a/cppcheckSuppressions.txt b/cppcheckSuppressions.txt
index 771a24fba0..3c02e77c28 100644
--- a/cppcheckSuppressions.txt
+++ b/cppcheckSuppressions.txt
@@ -7,9 +7,9 @@ unknownMacro:*
 unusedFunction:*
 unusedStructMember:*
 
-noExplicitConstructor:Common++/header/IpAddress.h
-noExplicitConstructor:Common++/header/MacAddress.h
-noExplicitConstructor:Pcap++/header/PcapFileDevice.h
+noExplicitConstructor:Common++/header/pcapplusplus/IpAddress.h
+noExplicitConstructor:Common++/header/pcapplusplus/MacAddress.h
+noExplicitConstructor:Pcap++/header/pcapplusplus/PcapFileDevice.h
 
 missingOverride:Pcap++/*
 missingOverride:Examples/*