diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a78449b362..f3dc50ce6a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -86,6 +86,27 @@ jobs:
         with:
           path: ./
 
+  verify-manifest:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          submodules: true
+          fetch-depth: 0
+
+      # At time of writing the gitmodules are set not to pull
+      # Even when using fetch submodules. Need to run this command
+      # To force it to grab them.
+      - name: Perform Recursive Clone
+        shell: bash
+        run: git submodule update --checkout --init --recursive
+
+      - name: Run manifest verifier
+        uses: FreeRTOS/CI-CD-GitHub-Actions/manifest-verifier@v2
+        with:
+          path: ./
+          fail-on-incorrect-version: true
+
   build-checks:
     runs-on: ubuntu-latest
     steps:
@@ -192,6 +213,7 @@ jobs:
         run: |
           git-secrets --register-aws
           git-secrets --scan
+
   proof_ci:
     runs-on: cbmc_ubuntu-latest_16-core
     steps:
diff --git a/lexicon.txt b/lexicon.txt
index 8b11100a2a..fc96db439e 100644
--- a/lexicon.txt
+++ b/lexicon.txt
@@ -134,6 +134,7 @@ chextochar
 cli
 clk
 cmd
+cmock
 co
 col
 com
@@ -2073,6 +2074,7 @@ xtaskcreate
 xtaskcreatestatic
 xtaskgenericnotify
 xtaskgetcurrenttaskhandle
+xtaskgetmpusettings
 xtaskgettickcount
 xtaskhandle
 xtasknotifygive
diff --git a/manifest.yml b/manifest.yml
index 245184d1e9..d7574e4ef3 100644
--- a/manifest.yml
+++ b/manifest.yml
@@ -1,6 +1,8 @@
-name : "FreeRTOS-Plus-TCP"
+name: "FreeRTOS-Plus-TCP"
 version: "V4.0.0"
-description: "Thread safe FreeRTOS TCP/IP stack working on top of the FreeRTOS-Kernel to implement the TCP/IP protocol. Suitable for microcontrollers."
+description:
+  "Thread safe FreeRTOS TCP/IP stack working on top of the FreeRTOS-Kernel to
+  implement the TCP/IP protocol. Suitable for microcontrollers."
 license: "MIT"
 dependencies:
   - name: "FreeRTOS-Kernel"
@@ -11,3 +13,10 @@ dependencies:
       url: "https://github.com/FreeRTOS/FreeRTOS-Kernel.git"
       path: "test/FreeRTOS-Kernel"
       branch: "main"
+
+  - name: "CMock"
+    version: "afa2949"
+    repository:
+        type: "git"
+        url: " https://github.com/ThrowTheSwitch/CMock.git"
+        path: "tools/CMock"
diff --git a/test/FreeRTOS-Kernel b/test/FreeRTOS-Kernel
index 260a37c082..fe005419f0 160000
--- a/test/FreeRTOS-Kernel
+++ b/test/FreeRTOS-Kernel
@@ -1 +1 @@
-Subproject commit 260a37c082f4b70f9c6f361eadb0b29f1a448e3a
+Subproject commit fe005419f0d31264059c61a2f043a0b4e0f24076
diff --git a/test/unit-test/ConfigFiles/portmacro.h b/test/unit-test/ConfigFiles/portmacro.h
index a766fe1525..25dae85e8f 100644
--- a/test/unit-test/ConfigFiles/portmacro.h
+++ b/test/unit-test/ConfigFiles/portmacro.h
@@ -113,6 +113,16 @@
     #define portTASK_FUNCTION( vFunction, pvParameters )               void vFunction( void * pvParameters )
 /*-----------------------------------------------------------*/
 
+/** We need to define it here because CMock does not recognize the
+ * #if ( portUSING_MPU_WRAPPERS == 1 ) guard around xTaskGetMPUSettings
+ * and then complains about the missing xMPU_SETTINGS type in the
+ * generated mocks. */
+    typedef struct MPU_SETTINGS
+    {
+        uint32_t ulDummy;
+    } xMPU_SETTINGS;
+
+
 /*
  * Tasks run in their own pthreads and context switches between them
  * are always a full memory barrier. ISRs are emulated as signals
diff --git a/test/unit-test/FreeRTOS_ARP/ut.cmake b/test/unit-test/FreeRTOS_ARP/ut.cmake
index 86e5569855..27c492a05a 100644
--- a/test/unit-test/FreeRTOS_ARP/ut.cmake
+++ b/test/unit-test/FreeRTOS_ARP/ut.cmake
@@ -27,8 +27,8 @@ list(APPEND mock_include_list
             .
             ${TCP_INCLUDE_DIRS}
             ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/include
-            ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix
             ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles
+            ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix
         )
 
 #list the definitions of your mocks to control what to be included
@@ -58,6 +58,7 @@ list(APPEND real_include_directories
 list(APPEND test_include_directories
             .
             ${CMOCK_DIR}/vendor/unity/src
+            ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles
             ${TCP_INCLUDE_DIRS}
         )
 
diff --git a/test/unit-test/FreeRTOS_BitConfig/ut.cmake b/test/unit-test/FreeRTOS_BitConfig/ut.cmake
index 01be0b3e73..7d3084ff69 100644
--- a/test/unit-test/FreeRTOS_BitConfig/ut.cmake
+++ b/test/unit-test/FreeRTOS_BitConfig/ut.cmake
@@ -23,8 +23,8 @@ list(APPEND mock_include_list
             .
             ${TCP_INCLUDE_DIRS}
             ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/include
-            ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix
             ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles
+            ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix
             ${MODULE_ROOT_DIR}/test/unit-test/${project_name}
         )
 
@@ -61,6 +61,7 @@ set(test_include_directories "")
 list(APPEND test_include_directories
             .
             ${CMOCK_DIR}/vendor/unity/src
+            ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles
             ${TCP_INCLUDE_DIRS}
             ${MODULE_ROOT_DIR}/test/unit-test/${project_name}
             ${CMAKE_BINARY_DIR}/Annexed_TCP_Sources
diff --git a/test/unit-test/FreeRTOS_DHCP/ut.cmake b/test/unit-test/FreeRTOS_DHCP/ut.cmake
index 1d08984f0a..8639e4a60a 100644
--- a/test/unit-test/FreeRTOS_DHCP/ut.cmake
+++ b/test/unit-test/FreeRTOS_DHCP/ut.cmake
@@ -55,6 +55,7 @@ list(APPEND real_include_directories
 list(APPEND test_include_directories
             .
             ${CMOCK_DIR}/vendor/unity/src
+            ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles
             ${TCP_INCLUDE_DIRS}
             ${MODULE_ROOT_DIR}/test/unit-test/${project_name}
         )
diff --git a/test/unit-test/FreeRTOS_DNS_Cache/ut.cmake b/test/unit-test/FreeRTOS_DNS_Cache/ut.cmake
index ba26da63c6..09522e1ab3 100755
--- a/test/unit-test/FreeRTOS_DNS_Cache/ut.cmake
+++ b/test/unit-test/FreeRTOS_DNS_Cache/ut.cmake
@@ -64,6 +64,7 @@ set (test_include_directories "")
 list(APPEND test_include_directories
             .
             ${CMOCK_DIR}/vendor/unity/src
+            ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles
             ${TCP_INCLUDE_DIRS}
             ${MODULE_ROOT_DIR}/test/unit-test/${project_name}
             ${MODULE_ROOT_DIR}/source/include
diff --git a/test/unit-test/FreeRTOS_DNS_Callback/ut.cmake b/test/unit-test/FreeRTOS_DNS_Callback/ut.cmake
index f1f1483dce..8973b535bb 100644
--- a/test/unit-test/FreeRTOS_DNS_Callback/ut.cmake
+++ b/test/unit-test/FreeRTOS_DNS_Callback/ut.cmake
@@ -65,6 +65,7 @@ set(test_include_directories "")
 list(APPEND test_include_directories
             .
             ${CMOCK_DIR}/vendor/unity/src
+            ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles
             ${TCP_INCLUDE_DIRS}
             ${MODULE_ROOT_DIR}/test/unit-test/${project_name}
             ${MODULE_ROOT_DIR}/source/include/
diff --git a/test/unit-test/FreeRTOS_DNS_ConfigNoCallback/ut.cmake b/test/unit-test/FreeRTOS_DNS_ConfigNoCallback/ut.cmake
index 9e63fd66e7..ef479c081b 100644
--- a/test/unit-test/FreeRTOS_DNS_ConfigNoCallback/ut.cmake
+++ b/test/unit-test/FreeRTOS_DNS_ConfigNoCallback/ut.cmake
@@ -65,6 +65,7 @@ set(test_include_directories "")
 list(APPEND test_include_directories
             .
             ${CMOCK_DIR}/vendor/unity/src
+            ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles
             ${TCP_INCLUDE_DIRS}
             ${MODULE_ROOT_DIR}/test/unit-test/${project_name}
             ${MODULE_ROOT_DIR}/source/include
diff --git a/test/unit-test/FreeRTOS_DNS_Networking/ut.cmake b/test/unit-test/FreeRTOS_DNS_Networking/ut.cmake
index 780f6301a6..98c37b9931 100644
--- a/test/unit-test/FreeRTOS_DNS_Networking/ut.cmake
+++ b/test/unit-test/FreeRTOS_DNS_Networking/ut.cmake
@@ -59,6 +59,7 @@ list(APPEND real_include_directories
 list(APPEND test_include_directories
             .
             ${CMOCK_DIR}/vendor/unity/src
+            ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles
             ${TCP_INCLUDE_DIRS}
             ${MODULE_ROOT_DIR}/test/unit-test/${project_name}
             ${MODULE_ROOT_DIR}/include
diff --git a/test/unit-test/FreeRTOS_ICMP/FreeRTOS_ICMP_utest.c b/test/unit-test/FreeRTOS_ICMP/FreeRTOS_ICMP_utest.c
index c1b8131250..1ef67d245b 100644
--- a/test/unit-test/FreeRTOS_ICMP/FreeRTOS_ICMP_utest.c
+++ b/test/unit-test/FreeRTOS_ICMP/FreeRTOS_ICMP_utest.c
@@ -34,6 +34,8 @@
 #include <string.h>
 #include <stdint.h>
 
+#include "portmacro.h"
+
 #include "mock_task.h"
 #include "mock_list.h"
 
diff --git a/test/unit-test/FreeRTOS_ICMP/ut.cmake b/test/unit-test/FreeRTOS_ICMP/ut.cmake
index 63f0650333..fcab0de705 100644
--- a/test/unit-test/FreeRTOS_ICMP/ut.cmake
+++ b/test/unit-test/FreeRTOS_ICMP/ut.cmake
@@ -37,8 +37,8 @@ list(APPEND mock_include_list
             .
             ${TCP_INCLUDE_DIRS}
             ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/include
-            ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix
             ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles
+            ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix
             ${MODULE_ROOT_DIR}/test/unit-test/${project_name}
         )
 
@@ -75,6 +75,7 @@ set(test_include_directories "")
 list(APPEND test_include_directories
             .
             ${CMOCK_DIR}/vendor/unity/src
+            ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles
             ${TCP_INCLUDE_DIRS}
             ${MODULE_ROOT_DIR}/test/unit-test/${project_name}
             ${CMAKE_BINARY_DIR}/Annexed_TCP_Sources
diff --git a/test/unit-test/FreeRTOS_ICMP_wo_assert/FreeRTOS_ICMP_wo_assert_utest.c b/test/unit-test/FreeRTOS_ICMP_wo_assert/FreeRTOS_ICMP_wo_assert_utest.c
index abe55e10c7..bfc6f54deb 100644
--- a/test/unit-test/FreeRTOS_ICMP_wo_assert/FreeRTOS_ICMP_wo_assert_utest.c
+++ b/test/unit-test/FreeRTOS_ICMP_wo_assert/FreeRTOS_ICMP_wo_assert_utest.c
@@ -34,6 +34,8 @@
 #include <string.h>
 #include <stdint.h>
 
+#include "portmacro.h"
+
 #include "mock_task.h"
 #include "mock_list.h"
 #include "mock_queue.h"
diff --git a/test/unit-test/FreeRTOS_ICMP_wo_assert/ut.cmake b/test/unit-test/FreeRTOS_ICMP_wo_assert/ut.cmake
index 289299fe33..4ad6c60810 100644
--- a/test/unit-test/FreeRTOS_ICMP_wo_assert/ut.cmake
+++ b/test/unit-test/FreeRTOS_ICMP_wo_assert/ut.cmake
@@ -36,8 +36,8 @@ list(APPEND mock_include_list
             .
             ${TCP_INCLUDE_DIRS}
             ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/include
-            ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix
             ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles
+            ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix
             ${MODULE_ROOT_DIR}/test/unit-test/${project_name}
         )
 
diff --git a/test/unit-test/FreeRTOS_IP/FreeRTOS_IP_utest.c b/test/unit-test/FreeRTOS_IP/FreeRTOS_IP_utest.c
index 374c69f63b..eb3a817c32 100644
--- a/test/unit-test/FreeRTOS_IP/FreeRTOS_IP_utest.c
+++ b/test/unit-test/FreeRTOS_IP/FreeRTOS_IP_utest.c
@@ -34,6 +34,8 @@
 #include <string.h>
 #include <stdint.h>
 
+#include "portmacro.h"
+
 #include "mock_task.h"
 #include "mock_list.h"
 
diff --git a/test/unit-test/FreeRTOS_IP/ut.cmake b/test/unit-test/FreeRTOS_IP/ut.cmake
index 8e66699df8..ec55f1058d 100644
--- a/test/unit-test/FreeRTOS_IP/ut.cmake
+++ b/test/unit-test/FreeRTOS_IP/ut.cmake
@@ -44,8 +44,8 @@ list(APPEND mock_include_list
             ${TCP_INCLUDE_DIRS}
             ${MODULE_ROOT_DIR}/test/unit-test/${project_name}
             ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/include
-            ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix
             ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles
+            ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix
         )
 
 set(mock_define_list "")
@@ -81,6 +81,7 @@ set(test_include_directories "")
 list(APPEND test_include_directories
             .
             ${CMOCK_DIR}/vendor/unity/src
+            ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles
             ${TCP_INCLUDE_DIRS}
             ${MODULE_ROOT_DIR}/test/unit-test/${project_name}
             ${CMAKE_BINARY_DIR}/Annexed_TCP_Sources
diff --git a/test/unit-test/FreeRTOS_IP_DiffConfig/FreeRTOS_IP_DiffConfig_utest.c b/test/unit-test/FreeRTOS_IP_DiffConfig/FreeRTOS_IP_DiffConfig_utest.c
index 60b42ee010..b59df58d54 100644
--- a/test/unit-test/FreeRTOS_IP_DiffConfig/FreeRTOS_IP_DiffConfig_utest.c
+++ b/test/unit-test/FreeRTOS_IP_DiffConfig/FreeRTOS_IP_DiffConfig_utest.c
@@ -34,6 +34,8 @@
 #include <string.h>
 #include <stdint.h>
 
+#include "portmacro.h"
+
 #include "mock_task.h"
 #include "mock_list.h"
 
diff --git a/test/unit-test/FreeRTOS_IP_DiffConfig/ut.cmake b/test/unit-test/FreeRTOS_IP_DiffConfig/ut.cmake
index 4227474c1f..1ed3959891 100644
--- a/test/unit-test/FreeRTOS_IP_DiffConfig/ut.cmake
+++ b/test/unit-test/FreeRTOS_IP_DiffConfig/ut.cmake
@@ -40,8 +40,8 @@ list(APPEND mock_include_list
             .
             ${TCP_INCLUDE_DIRS}
             ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/include
-            ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix
             ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles
+            ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix
             ${MODULE_ROOT_DIR}/test/unit-test/${project_name}
         )
 
diff --git a/test/unit-test/FreeRTOS_IP_DiffConfig2/FreeRTOS_IP_DiffConfig2_utest.c b/test/unit-test/FreeRTOS_IP_DiffConfig2/FreeRTOS_IP_DiffConfig2_utest.c
index 991d4d8846..1c6b9f7368 100644
--- a/test/unit-test/FreeRTOS_IP_DiffConfig2/FreeRTOS_IP_DiffConfig2_utest.c
+++ b/test/unit-test/FreeRTOS_IP_DiffConfig2/FreeRTOS_IP_DiffConfig2_utest.c
@@ -34,6 +34,8 @@
 #include <string.h>
 #include <stdint.h>
 
+#include "portmacro.h"
+
 #include "mock_task.h"
 #include "mock_list.h"
 
diff --git a/test/unit-test/FreeRTOS_IP_DiffConfig2/ut.cmake b/test/unit-test/FreeRTOS_IP_DiffConfig2/ut.cmake
index 7d98901433..2ef4a847f8 100644
--- a/test/unit-test/FreeRTOS_IP_DiffConfig2/ut.cmake
+++ b/test/unit-test/FreeRTOS_IP_DiffConfig2/ut.cmake
@@ -41,8 +41,8 @@ list(APPEND mock_include_list
             .
             ${TCP_INCLUDE_DIRS}
             ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/include
-            ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix
             ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles
+            ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix
             ${MODULE_ROOT_DIR}/test/unit-test/${project_name}
         )
 
diff --git a/test/unit-test/FreeRTOS_IP_DiffConfig3/FreeRTOS_IP_DiffConfig3_utest.c b/test/unit-test/FreeRTOS_IP_DiffConfig3/FreeRTOS_IP_DiffConfig3_utest.c
index 8fac597cf6..52e45c0d80 100644
--- a/test/unit-test/FreeRTOS_IP_DiffConfig3/FreeRTOS_IP_DiffConfig3_utest.c
+++ b/test/unit-test/FreeRTOS_IP_DiffConfig3/FreeRTOS_IP_DiffConfig3_utest.c
@@ -34,6 +34,8 @@
 #include <string.h>
 #include <stdint.h>
 
+#include "portmacro.h"
+
 #include "mock_task.h"
 #include "mock_list.h"
 
diff --git a/test/unit-test/FreeRTOS_IP_DiffConfig3/ut.cmake b/test/unit-test/FreeRTOS_IP_DiffConfig3/ut.cmake
index 9b003e9d7b..2d832de4c8 100644
--- a/test/unit-test/FreeRTOS_IP_DiffConfig3/ut.cmake
+++ b/test/unit-test/FreeRTOS_IP_DiffConfig3/ut.cmake
@@ -41,8 +41,8 @@ list(APPEND mock_include_list
             .
             ${TCP_INCLUDE_DIRS}
             ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/include
-            ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix
             ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles
+            ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix
             ${MODULE_ROOT_DIR}/test/unit-test/${project_name}
         )
 
diff --git a/test/unit-test/FreeRTOS_IP_Timers/FreeRTOS_IP_Timers_utest.c b/test/unit-test/FreeRTOS_IP_Timers/FreeRTOS_IP_Timers_utest.c
index 08d46e4c8d..976ea9cc05 100644
--- a/test/unit-test/FreeRTOS_IP_Timers/FreeRTOS_IP_Timers_utest.c
+++ b/test/unit-test/FreeRTOS_IP_Timers/FreeRTOS_IP_Timers_utest.c
@@ -34,6 +34,8 @@
 #include <string.h>
 #include <stdint.h>
 
+#include "portmacro.h"
+
 #include "mock_task.h"
 #include "mock_list.h"
 
diff --git a/test/unit-test/FreeRTOS_IP_Timers/ut.cmake b/test/unit-test/FreeRTOS_IP_Timers/ut.cmake
index 4ae5678e8b..a572129af8 100644
--- a/test/unit-test/FreeRTOS_IP_Timers/ut.cmake
+++ b/test/unit-test/FreeRTOS_IP_Timers/ut.cmake
@@ -30,8 +30,8 @@ list(APPEND mock_include_list
             .
             ${TCP_INCLUDE_DIRS}
             ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/include
-            ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix
             ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles
+            ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix
             ${MODULE_ROOT_DIR}/test/unit-test/${project_name}
         )
 
@@ -68,6 +68,7 @@ set(test_include_directories "")
 list(APPEND test_include_directories
             .
             ${CMOCK_DIR}/vendor/unity/src
+            ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles
             ${TCP_INCLUDE_DIRS}
             ${MODULE_ROOT_DIR}/test/unit-test/${project_name}
             ${CMAKE_BINARY_DIR}/Annexed_TCP_Sources
diff --git a/test/unit-test/FreeRTOS_IP_Utils/FreeRTOS_IP_Utils_utest.c b/test/unit-test/FreeRTOS_IP_Utils/FreeRTOS_IP_Utils_utest.c
index af09192c64..be5269b617 100644
--- a/test/unit-test/FreeRTOS_IP_Utils/FreeRTOS_IP_Utils_utest.c
+++ b/test/unit-test/FreeRTOS_IP_Utils/FreeRTOS_IP_Utils_utest.c
@@ -34,6 +34,8 @@
 #include <string.h>
 #include <stdint.h>
 
+#include "portmacro.h"
+
 #include "mock_task.h"
 #include "mock_list.h"
 
diff --git a/test/unit-test/FreeRTOS_IP_Utils/ut.cmake b/test/unit-test/FreeRTOS_IP_Utils/ut.cmake
index 04ed351957..7dbb128e38 100644
--- a/test/unit-test/FreeRTOS_IP_Utils/ut.cmake
+++ b/test/unit-test/FreeRTOS_IP_Utils/ut.cmake
@@ -34,8 +34,8 @@ list(APPEND mock_include_list
             ${MODULE_ROOT_DIR}/test/unit-test/${project_name}
             ${TCP_INCLUDE_DIRS}
             ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/include
-            ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix
             ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles
+            ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix
         )
 
 set(mock_define_list "")
@@ -71,6 +71,7 @@ set(test_include_directories "")
 list(APPEND test_include_directories
             .
             ${CMOCK_DIR}/vendor/unity/src
+            ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles
             ${MODULE_ROOT_DIR}/test/unit-test/${project_name}
             ${TCP_INCLUDE_DIRS}
             ${CMAKE_BINARY_DIR}/Annexed_TCP_Sources
diff --git a/test/unit-test/FreeRTOS_IP_Utils_DiffConfig/FreeRTOS_IP_Utils_DiffConfig_utest.c b/test/unit-test/FreeRTOS_IP_Utils_DiffConfig/FreeRTOS_IP_Utils_DiffConfig_utest.c
index bf39c69aeb..b51a9e08d8 100644
--- a/test/unit-test/FreeRTOS_IP_Utils_DiffConfig/FreeRTOS_IP_Utils_DiffConfig_utest.c
+++ b/test/unit-test/FreeRTOS_IP_Utils_DiffConfig/FreeRTOS_IP_Utils_DiffConfig_utest.c
@@ -34,6 +34,8 @@
 #include <string.h>
 #include <stdint.h>
 
+#include "portmacro.h"
+
 #include "mock_task.h"
 #include "mock_list.h"
 
diff --git a/test/unit-test/FreeRTOS_IP_Utils_DiffConfig/ut.cmake b/test/unit-test/FreeRTOS_IP_Utils_DiffConfig/ut.cmake
index f065b2a580..790d608110 100644
--- a/test/unit-test/FreeRTOS_IP_Utils_DiffConfig/ut.cmake
+++ b/test/unit-test/FreeRTOS_IP_Utils_DiffConfig/ut.cmake
@@ -33,8 +33,8 @@ list(APPEND mock_include_list
             .
             ${TCP_INCLUDE_DIRS}
             ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/include
-            ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix
             ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles
+            ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix
         )
 
 set(mock_define_list "")
diff --git a/test/unit-test/FreeRTOS_IPv4/FreeRTOS_IPv4_utest.c b/test/unit-test/FreeRTOS_IPv4/FreeRTOS_IPv4_utest.c
index 0665b3dc4c..2ea74d2cd5 100644
--- a/test/unit-test/FreeRTOS_IPv4/FreeRTOS_IPv4_utest.c
+++ b/test/unit-test/FreeRTOS_IPv4/FreeRTOS_IPv4_utest.c
@@ -34,6 +34,8 @@
 #include <string.h>
 #include <stdint.h>
 
+#include "portmacro.h"
+
 #include "mock_task.h"
 #include "mock_list.h"
 
diff --git a/test/unit-test/FreeRTOS_IPv4/ut.cmake b/test/unit-test/FreeRTOS_IPv4/ut.cmake
index c2ca691c58..e2f9e78d1f 100644
--- a/test/unit-test/FreeRTOS_IPv4/ut.cmake
+++ b/test/unit-test/FreeRTOS_IPv4/ut.cmake
@@ -30,8 +30,8 @@ list(APPEND mock_include_list
             ${TCP_INCLUDE_DIRS}
             ${MODULE_ROOT_DIR}/test/unit-test/${project_name}
             ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/include
-            ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix
             ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles
+            ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix
         )
 
 set(mock_define_list "")
@@ -66,8 +66,9 @@ set(test_include_directories "")
 # list the directories your test needs to include
 list(APPEND test_include_directories
             .
-            ${MODULE_ROOT_DIR}/test/unit-test/${project_name}
             ${CMOCK_DIR}/vendor/unity/src
+            ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles
+            ${MODULE_ROOT_DIR}/test/unit-test/${project_name}
             ${TCP_INCLUDE_DIRS}
             ${CMAKE_BINARY_DIR}/Annexed_TCP_Sources
         )
diff --git a/test/unit-test/FreeRTOS_IPv4_DiffConfig/FreeRTOS_IPv4_DiffConfig_utest.c b/test/unit-test/FreeRTOS_IPv4_DiffConfig/FreeRTOS_IPv4_DiffConfig_utest.c
index 4712491b44..e01e06504f 100644
--- a/test/unit-test/FreeRTOS_IPv4_DiffConfig/FreeRTOS_IPv4_DiffConfig_utest.c
+++ b/test/unit-test/FreeRTOS_IPv4_DiffConfig/FreeRTOS_IPv4_DiffConfig_utest.c
@@ -34,6 +34,8 @@
 #include <string.h>
 #include <stdint.h>
 
+#include "portmacro.h"
+
 #include "mock_task.h"
 #include "mock_list.h"
 
diff --git a/test/unit-test/FreeRTOS_IPv4_DiffConfig/ut.cmake b/test/unit-test/FreeRTOS_IPv4_DiffConfig/ut.cmake
index 826cd5984c..a0614a58f6 100644
--- a/test/unit-test/FreeRTOS_IPv4_DiffConfig/ut.cmake
+++ b/test/unit-test/FreeRTOS_IPv4_DiffConfig/ut.cmake
@@ -41,8 +41,8 @@ list(APPEND mock_include_list
             ${TCP_INCLUDE_DIRS}
             ${MODULE_ROOT_DIR}/test/unit-test/${project_name}
             ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/include
-            ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix
             ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles
+            ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix
         )
 
 set(mock_define_list "")
diff --git a/test/unit-test/FreeRTOS_IPv4_DiffConfig1/FreeRTOS_IPv4_DiffConfig1_utest.c b/test/unit-test/FreeRTOS_IPv4_DiffConfig1/FreeRTOS_IPv4_DiffConfig1_utest.c
index 0ba0b019a7..9817f7cc7b 100644
--- a/test/unit-test/FreeRTOS_IPv4_DiffConfig1/FreeRTOS_IPv4_DiffConfig1_utest.c
+++ b/test/unit-test/FreeRTOS_IPv4_DiffConfig1/FreeRTOS_IPv4_DiffConfig1_utest.c
@@ -34,6 +34,8 @@
 #include <string.h>
 #include <stdint.h>
 
+#include "portmacro.h"
+
 #include "mock_task.h"
 #include "mock_list.h"
 
diff --git a/test/unit-test/FreeRTOS_IPv4_DiffConfig1/ut.cmake b/test/unit-test/FreeRTOS_IPv4_DiffConfig1/ut.cmake
index bb4fdb9d6a..a72d11f80f 100644
--- a/test/unit-test/FreeRTOS_IPv4_DiffConfig1/ut.cmake
+++ b/test/unit-test/FreeRTOS_IPv4_DiffConfig1/ut.cmake
@@ -41,8 +41,8 @@ list(APPEND mock_include_list
             .
             ${TCP_INCLUDE_DIRS}
             ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/include
-            ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix
             ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles
+            ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix
             ${MODULE_ROOT_DIR}/test/unit-test/${project_name}
         )
 
diff --git a/test/unit-test/FreeRTOS_IPv4_Sockets/ut.cmake b/test/unit-test/FreeRTOS_IPv4_Sockets/ut.cmake
index 3e60caaf52..fad506c429 100644
--- a/test/unit-test/FreeRTOS_IPv4_Sockets/ut.cmake
+++ b/test/unit-test/FreeRTOS_IPv4_Sockets/ut.cmake
@@ -19,9 +19,9 @@ list(APPEND mock_include_list
             .
             ${TCP_INCLUDE_DIRS}
             ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/include
+            ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles
             ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix
             ${MODULE_ROOT_DIR}/test/unit-test/${project_name}
-            ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles
         )
 
 set(mock_define_list "")
@@ -57,6 +57,7 @@ set(test_include_directories "")
 list(APPEND test_include_directories
             .
             ${CMOCK_DIR}/vendor/unity/src
+            ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles
             ${TCP_INCLUDE_DIRS}
             ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/include
             ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix
diff --git a/test/unit-test/FreeRTOS_IPv4_Utils/ut.cmake b/test/unit-test/FreeRTOS_IPv4_Utils/ut.cmake
index b76df9b150..9fda556518 100644
--- a/test/unit-test/FreeRTOS_IPv4_Utils/ut.cmake
+++ b/test/unit-test/FreeRTOS_IPv4_Utils/ut.cmake
@@ -22,8 +22,8 @@ list(APPEND mock_include_list
             .
             ${TCP_INCLUDE_DIRS}
             ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/include
-            ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix
             ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles
+            ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix
             ${MODULE_ROOT_DIR}/test/unit-test/${project_name}
         )
 
@@ -60,6 +60,7 @@ set(test_include_directories "")
 list(APPEND test_include_directories
             .
             ${CMOCK_DIR}/vendor/unity/src
+            ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles
             ${MODULE_ROOT_DIR}/test/unit-test/${project_name}
             ${TCP_INCLUDE_DIRS}
             ${CMAKE_BINARY_DIR}/Annexed_TCP_Sources
diff --git a/test/unit-test/FreeRTOS_IPv6/ut.cmake b/test/unit-test/FreeRTOS_IPv6/ut.cmake
index b2d9ed3b89..f695563625 100644
--- a/test/unit-test/FreeRTOS_IPv6/ut.cmake
+++ b/test/unit-test/FreeRTOS_IPv6/ut.cmake
@@ -24,8 +24,8 @@ list(APPEND mock_include_list
             .
             ${TCP_INCLUDE_DIRS}
             ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/include
-            ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix
             ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles
+            ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix
             ${MODULE_ROOT_DIR}/test/unit-test/${project_name}
         )
 
@@ -62,6 +62,7 @@ set(test_include_directories "")
 list(APPEND test_include_directories
             .
             ${CMOCK_DIR}/vendor/unity/src
+            ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles
             ${TCP_INCLUDE_DIRS}
             ${MODULE_ROOT_DIR}/test/unit-test/${project_name}
             ${CMAKE_BINARY_DIR}/Annexed_TCP_Sources
diff --git a/test/unit-test/FreeRTOS_IPv6_ConfigDriverCheckChecksum/ut.cmake b/test/unit-test/FreeRTOS_IPv6_ConfigDriverCheckChecksum/ut.cmake
index 87b970b017..d8c0f34fc2 100644
--- a/test/unit-test/FreeRTOS_IPv6_ConfigDriverCheckChecksum/ut.cmake
+++ b/test/unit-test/FreeRTOS_IPv6_ConfigDriverCheckChecksum/ut.cmake
@@ -24,9 +24,9 @@ list(APPEND mock_include_list
             .
             ${TCP_INCLUDE_DIRS}
             ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/include
+            ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles
             ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix
             ${MODULE_ROOT_DIR}/test/unit-test/${project_name}
-            ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles
         )
 
 set(mock_define_list "")
@@ -62,6 +62,7 @@ set(test_include_directories "")
 list(APPEND test_include_directories
             .
             ${CMOCK_DIR}/vendor/unity/src
+            ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles
             ${TCP_INCLUDE_DIRS}
             ${MODULE_ROOT_DIR}/test/unit-test/${project_name}
             ${CMAKE_BINARY_DIR}/Annexed_TCP_Sources
diff --git a/test/unit-test/FreeRTOS_IPv6_Utils/FreeRTOS_IPv6_Utils_utest.c b/test/unit-test/FreeRTOS_IPv6_Utils/FreeRTOS_IPv6_Utils_utest.c
index 0e2762536f..aad8b62182 100644
--- a/test/unit-test/FreeRTOS_IPv6_Utils/FreeRTOS_IPv6_Utils_utest.c
+++ b/test/unit-test/FreeRTOS_IPv6_Utils/FreeRTOS_IPv6_Utils_utest.c
@@ -34,6 +34,8 @@
 #include <string.h>
 #include <stdint.h>
 
+#include "portmacro.h"
+
 #include "mock_task.h"
 #include "mock_list.h"
 
diff --git a/test/unit-test/FreeRTOS_IPv6_Utils/ut.cmake b/test/unit-test/FreeRTOS_IPv6_Utils/ut.cmake
index 48d05a6784..1a2df0fe7d 100644
--- a/test/unit-test/FreeRTOS_IPv6_Utils/ut.cmake
+++ b/test/unit-test/FreeRTOS_IPv6_Utils/ut.cmake
@@ -27,8 +27,8 @@ list(APPEND mock_include_list
             .
             ${TCP_INCLUDE_DIRS}
             ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/include
-            ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix
             ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles
+            ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix
             ${MODULE_ROOT_DIR}/test/unit-test/${project_name}
         )
 
@@ -65,6 +65,7 @@ set(test_include_directories "")
 list(APPEND test_include_directories
             .
             ${CMOCK_DIR}/vendor/unity/src
+            ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles
             ${TCP_INCLUDE_DIRS}
             ${MODULE_ROOT_DIR}/test/unit-test/${project_name}
             ${CMAKE_BINARY_DIR}/Annexed_TCP_Sources
diff --git a/test/unit-test/FreeRTOS_ND/ut.cmake b/test/unit-test/FreeRTOS_ND/ut.cmake
index e0e7055fca..bc002c9aca 100644
--- a/test/unit-test/FreeRTOS_ND/ut.cmake
+++ b/test/unit-test/FreeRTOS_ND/ut.cmake
@@ -33,8 +33,8 @@ list(APPEND mock_include_list
             .
             ${TCP_INCLUDE_DIRS}
             ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/include
-            ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix
             ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles
+            ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix
             ${MODULE_ROOT_DIR}/test/unit-test/${project_name}
         )
 
@@ -71,6 +71,7 @@ set(test_include_directories "")
 list(APPEND test_include_directories
             .
             ${CMOCK_DIR}/vendor/unity/src
+            ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles
             ${TCP_INCLUDE_DIRS}
             ${MODULE_ROOT_DIR}/test/unit-test/${project_name}
             ${CMAKE_BINARY_DIR}/Annexed_TCP_Sources
diff --git a/test/unit-test/FreeRTOS_RA/FreeRTOS_RA_utest.c b/test/unit-test/FreeRTOS_RA/FreeRTOS_RA_utest.c
index 0d77637d70..ae525e8092 100644
--- a/test/unit-test/FreeRTOS_RA/FreeRTOS_RA_utest.c
+++ b/test/unit-test/FreeRTOS_RA/FreeRTOS_RA_utest.c
@@ -34,6 +34,8 @@
 #include <string.h>
 #include <stdint.h>
 
+#include "portmacro.h"
+
 #include "mock_task.h"
 #include "mock_list.h"
 
diff --git a/test/unit-test/FreeRTOS_RA/ut.cmake b/test/unit-test/FreeRTOS_RA/ut.cmake
index c36c51c017..b06b9c84a3 100644
--- a/test/unit-test/FreeRTOS_RA/ut.cmake
+++ b/test/unit-test/FreeRTOS_RA/ut.cmake
@@ -28,8 +28,8 @@ list(APPEND mock_include_list
             .
             ${TCP_INCLUDE_DIRS}
             ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/include
-            ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix
             ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles
+            ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix
             ${MODULE_ROOT_DIR}/test/unit-test/${project_name}
         )
 
@@ -66,6 +66,7 @@ set(test_include_directories "")
 list(APPEND test_include_directories
             .
             ${CMOCK_DIR}/vendor/unity/src
+            ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles
             ${TCP_INCLUDE_DIRS}
             ${MODULE_ROOT_DIR}/test/unit-test/${project_name}
             ${CMAKE_BINARY_DIR}/Annexed_TCP_Sources
diff --git a/test/unit-test/FreeRTOS_Routing/FreeRTOS_Routing_utest.c b/test/unit-test/FreeRTOS_Routing/FreeRTOS_Routing_utest.c
index 64f06e7541..05f4a6297f 100644
--- a/test/unit-test/FreeRTOS_Routing/FreeRTOS_Routing_utest.c
+++ b/test/unit-test/FreeRTOS_Routing/FreeRTOS_Routing_utest.c
@@ -34,6 +34,8 @@
 #include <string.h>
 #include <stdint.h>
 
+#include "portmacro.h"
+
 #include "mock_task.h"
 #include "mock_list.h"
 
diff --git a/test/unit-test/FreeRTOS_Routing/ut.cmake b/test/unit-test/FreeRTOS_Routing/ut.cmake
index 403cb6c115..42ceaa88de 100644
--- a/test/unit-test/FreeRTOS_Routing/ut.cmake
+++ b/test/unit-test/FreeRTOS_Routing/ut.cmake
@@ -31,8 +31,8 @@ list(APPEND mock_include_list
             .
             ${TCP_INCLUDE_DIRS}
             ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/include
-            ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix
             ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles
+            ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix
             ${MODULE_ROOT_DIR}/test/unit-test/${project_name}
         )
 
@@ -69,6 +69,7 @@ set(test_include_directories "")
 list(APPEND test_include_directories
             .
             ${CMOCK_DIR}/vendor/unity/src
+            ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles
             ${TCP_INCLUDE_DIRS}
             ${MODULE_ROOT_DIR}/test/unit-test/${project_name}
             ${CMAKE_BINARY_DIR}/Annexed_TCP_Sources
diff --git a/test/unit-test/FreeRTOS_Routing_ConfigCompatibleWithSingle/FreeRTOS_Routing_ConfigCompatibleWithSingle_utest.c b/test/unit-test/FreeRTOS_Routing_ConfigCompatibleWithSingle/FreeRTOS_Routing_ConfigCompatibleWithSingle_utest.c
index 45383af9e7..75ad1093c8 100644
--- a/test/unit-test/FreeRTOS_Routing_ConfigCompatibleWithSingle/FreeRTOS_Routing_ConfigCompatibleWithSingle_utest.c
+++ b/test/unit-test/FreeRTOS_Routing_ConfigCompatibleWithSingle/FreeRTOS_Routing_ConfigCompatibleWithSingle_utest.c
@@ -34,6 +34,8 @@
 #include <string.h>
 #include <stdint.h>
 
+#include "portmacro.h"
+
 #include "mock_task.h"
 #include "mock_list.h"
 
diff --git a/test/unit-test/FreeRTOS_Routing_ConfigCompatibleWithSingle/ut.cmake b/test/unit-test/FreeRTOS_Routing_ConfigCompatibleWithSingle/ut.cmake
index 4cb74b6cf2..1b29684b30 100644
--- a/test/unit-test/FreeRTOS_Routing_ConfigCompatibleWithSingle/ut.cmake
+++ b/test/unit-test/FreeRTOS_Routing_ConfigCompatibleWithSingle/ut.cmake
@@ -33,8 +33,8 @@ list(APPEND mock_include_list
             ${MODULE_ROOT_DIR}/test/unit-test/${project_name}
             ${TCP_INCLUDE_DIRS}
             ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/include
-            ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix
             ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles
+            ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix
         )
 
 set(mock_define_list "")
@@ -70,6 +70,7 @@ set(test_include_directories "")
 list(APPEND test_include_directories
             .
             ${CMOCK_DIR}/vendor/unity/src
+            ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles
             ${MODULE_ROOT_DIR}/test/unit-test/${project_name}
             ${TCP_INCLUDE_DIRS}
             ${CMAKE_BINARY_DIR}/Annexed_TCP_Sources
diff --git a/test/unit-test/FreeRTOS_Sockets/FreeRTOS_Sockets_GenericAPI_utest.c b/test/unit-test/FreeRTOS_Sockets/FreeRTOS_Sockets_GenericAPI_utest.c
index fa56b1d59e..4cfa0becdc 100644
--- a/test/unit-test/FreeRTOS_Sockets/FreeRTOS_Sockets_GenericAPI_utest.c
+++ b/test/unit-test/FreeRTOS_Sockets/FreeRTOS_Sockets_GenericAPI_utest.c
@@ -34,6 +34,8 @@
 #include <string.h>
 #include <stdint.h>
 
+#include "portmacro.h"
+
 #include "mock_task.h"
 #include "mock_list.h"
 
diff --git a/test/unit-test/FreeRTOS_Sockets/FreeRTOS_Sockets_TCP_API_utest.c b/test/unit-test/FreeRTOS_Sockets/FreeRTOS_Sockets_TCP_API_utest.c
index f10c454972..9db98c345a 100644
--- a/test/unit-test/FreeRTOS_Sockets/FreeRTOS_Sockets_TCP_API_utest.c
+++ b/test/unit-test/FreeRTOS_Sockets/FreeRTOS_Sockets_TCP_API_utest.c
@@ -34,6 +34,8 @@
 #include <string.h>
 #include <stdint.h>
 
+#include "portmacro.h"
+
 #include "mock_task.h"
 #include "mock_list.h"
 
diff --git a/test/unit-test/FreeRTOS_Sockets/FreeRTOS_Sockets_UDP_API_utest.c b/test/unit-test/FreeRTOS_Sockets/FreeRTOS_Sockets_UDP_API_utest.c
index 6f6ac2779a..32d5109364 100644
--- a/test/unit-test/FreeRTOS_Sockets/FreeRTOS_Sockets_UDP_API_utest.c
+++ b/test/unit-test/FreeRTOS_Sockets/FreeRTOS_Sockets_UDP_API_utest.c
@@ -34,6 +34,8 @@
 #include <string.h>
 #include <stdint.h>
 
+#include "portmacro.h"
+
 #include "mock_task.h"
 #include "mock_list.h"
 
diff --git a/test/unit-test/FreeRTOS_Sockets/FreeRTOS_Sockets_privates_utest.c b/test/unit-test/FreeRTOS_Sockets/FreeRTOS_Sockets_privates_utest.c
index 3b73fb5f3d..3b73aa1c5b 100644
--- a/test/unit-test/FreeRTOS_Sockets/FreeRTOS_Sockets_privates_utest.c
+++ b/test/unit-test/FreeRTOS_Sockets/FreeRTOS_Sockets_privates_utest.c
@@ -34,6 +34,8 @@
 #include <string.h>
 #include <stdint.h>
 
+#include "portmacro.h"
+
 #include "mock_task.h"
 #include "mock_list.h"
 
diff --git a/test/unit-test/FreeRTOS_Sockets/ut.cmake b/test/unit-test/FreeRTOS_Sockets/ut.cmake
index f9b856adb0..4308738602 100644
--- a/test/unit-test/FreeRTOS_Sockets/ut.cmake
+++ b/test/unit-test/FreeRTOS_Sockets/ut.cmake
@@ -32,8 +32,8 @@ list(APPEND mock_include_list
             .
             ${TCP_INCLUDE_DIRS}
             ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/include
-            ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix
             ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles
+            ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix
             ${MODULE_ROOT_DIR}/test/unit-test/${project_name}
         )
 
@@ -70,9 +70,8 @@ set(test_include_directories "")
 list(APPEND test_include_directories
             .
             ${CMOCK_DIR}/vendor/unity/src
+            ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles
             ${TCP_INCLUDE_DIRS}
-            ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/include
-            ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix
             ${MODULE_ROOT_DIR}/test/unit-test/${project_name}
         )
 
diff --git a/test/unit-test/FreeRTOS_Sockets_DiffConfig/FreeRTOS_Sockets_DiffConfig_privates_utest.c b/test/unit-test/FreeRTOS_Sockets_DiffConfig/FreeRTOS_Sockets_DiffConfig_privates_utest.c
index 3b612ec210..954730b984 100644
--- a/test/unit-test/FreeRTOS_Sockets_DiffConfig/FreeRTOS_Sockets_DiffConfig_privates_utest.c
+++ b/test/unit-test/FreeRTOS_Sockets_DiffConfig/FreeRTOS_Sockets_DiffConfig_privates_utest.c
@@ -34,6 +34,8 @@
 #include <string.h>
 #include <stdint.h>
 
+#include "portmacro.h"
+
 #include "mock_task.h"
 #include "mock_list.h"
 
diff --git a/test/unit-test/FreeRTOS_Sockets_DiffConfig/ut.cmake b/test/unit-test/FreeRTOS_Sockets_DiffConfig/ut.cmake
index 63fbe314d0..2635b02555 100644
--- a/test/unit-test/FreeRTOS_Sockets_DiffConfig/ut.cmake
+++ b/test/unit-test/FreeRTOS_Sockets_DiffConfig/ut.cmake
@@ -32,8 +32,8 @@ list(APPEND mock_include_list
             .
             ${TCP_INCLUDE_DIRS}
             ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/include
-            ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix
             ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles
+            ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix
         )
 
 set(mock_define_list "")
@@ -73,8 +73,6 @@ list(APPEND test_include_directories
             .
             ${CMOCK_DIR}/vendor/unity/src
             ${TCP_INCLUDE_DIRS}
-            ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/include
-            ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix
         )
 
 # =============================  (end edit)  ===================================
diff --git a/test/unit-test/FreeRTOS_Sockets_DiffConfig1/FreeRTOS_Sockets_DiffConfig1_GenericAPI_utest.c b/test/unit-test/FreeRTOS_Sockets_DiffConfig1/FreeRTOS_Sockets_DiffConfig1_GenericAPI_utest.c
index e4f60cc2ae..3bc010b10f 100644
--- a/test/unit-test/FreeRTOS_Sockets_DiffConfig1/FreeRTOS_Sockets_DiffConfig1_GenericAPI_utest.c
+++ b/test/unit-test/FreeRTOS_Sockets_DiffConfig1/FreeRTOS_Sockets_DiffConfig1_GenericAPI_utest.c
@@ -34,6 +34,8 @@
 #include <string.h>
 #include <stdint.h>
 
+#include "portmacro.h"
+
 #include "mock_task.h"
 #include "mock_list.h"
 
diff --git a/test/unit-test/FreeRTOS_Sockets_DiffConfig1/FreeRTOS_Sockets_DiffConfig1_privates_utest.c b/test/unit-test/FreeRTOS_Sockets_DiffConfig1/FreeRTOS_Sockets_DiffConfig1_privates_utest.c
index b53ff0e857..2861fdf50a 100644
--- a/test/unit-test/FreeRTOS_Sockets_DiffConfig1/FreeRTOS_Sockets_DiffConfig1_privates_utest.c
+++ b/test/unit-test/FreeRTOS_Sockets_DiffConfig1/FreeRTOS_Sockets_DiffConfig1_privates_utest.c
@@ -34,6 +34,8 @@
 #include <string.h>
 #include <stdint.h>
 
+#include "portmacro.h"
+
 #include "mock_task.h"
 #include "mock_list.h"
 
diff --git a/test/unit-test/FreeRTOS_Sockets_DiffConfig1/ut.cmake b/test/unit-test/FreeRTOS_Sockets_DiffConfig1/ut.cmake
index a07ac85b5c..423b145b95 100644
--- a/test/unit-test/FreeRTOS_Sockets_DiffConfig1/ut.cmake
+++ b/test/unit-test/FreeRTOS_Sockets_DiffConfig1/ut.cmake
@@ -26,8 +26,8 @@ list(APPEND mock_include_list
             .
             ${TCP_INCLUDE_DIRS}
             ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/include
-            ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix
             ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles
+            ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix
         )
 
 set(mock_define_list "")
@@ -66,8 +66,6 @@ list(APPEND test_include_directories
             .
             ${CMOCK_DIR}/vendor/unity/src
             ${TCP_INCLUDE_DIRS}
-            ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/include
-            ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix
         )
 
 # =============================  (end edit)  ===================================
diff --git a/test/unit-test/FreeRTOS_Sockets_DiffConfig2/FreeRTOS_Sockets_DiffConfig2_GenericAPI_utest.c b/test/unit-test/FreeRTOS_Sockets_DiffConfig2/FreeRTOS_Sockets_DiffConfig2_GenericAPI_utest.c
index 15d359a558..930dd60d03 100644
--- a/test/unit-test/FreeRTOS_Sockets_DiffConfig2/FreeRTOS_Sockets_DiffConfig2_GenericAPI_utest.c
+++ b/test/unit-test/FreeRTOS_Sockets_DiffConfig2/FreeRTOS_Sockets_DiffConfig2_GenericAPI_utest.c
@@ -34,6 +34,8 @@
 #include <string.h>
 #include <stdint.h>
 
+#include "portmacro.h"
+
 #include "mock_task.h"
 #include "mock_list.h"
 
diff --git a/test/unit-test/FreeRTOS_Sockets_DiffConfig2/FreeRTOS_Sockets_DiffConfig2_TCP_API_utest.c b/test/unit-test/FreeRTOS_Sockets_DiffConfig2/FreeRTOS_Sockets_DiffConfig2_TCP_API_utest.c
index 95a3688a24..eed601b355 100644
--- a/test/unit-test/FreeRTOS_Sockets_DiffConfig2/FreeRTOS_Sockets_DiffConfig2_TCP_API_utest.c
+++ b/test/unit-test/FreeRTOS_Sockets_DiffConfig2/FreeRTOS_Sockets_DiffConfig2_TCP_API_utest.c
@@ -34,6 +34,8 @@
 #include <string.h>
 #include <stdint.h>
 
+#include "portmacro.h"
+
 #include "mock_task.h"
 #include "mock_list.h"
 
diff --git a/test/unit-test/FreeRTOS_Sockets_DiffConfig2/ut.cmake b/test/unit-test/FreeRTOS_Sockets_DiffConfig2/ut.cmake
index 3889fb1059..279648b4b8 100644
--- a/test/unit-test/FreeRTOS_Sockets_DiffConfig2/ut.cmake
+++ b/test/unit-test/FreeRTOS_Sockets_DiffConfig2/ut.cmake
@@ -24,9 +24,9 @@ list(APPEND mock_include_list
             .
             ${TCP_INCLUDE_DIRS}
             ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/include
+            ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles
             ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix
             ${MODULE_ROOT_DIR}/test/unit-test/${project_name}
-            ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles
         )
 
 set(mock_define_list "")
@@ -53,6 +53,7 @@ list(APPEND real_include_directories
             ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles
             ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/include
             ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix
+            ${MODULE_ROOT_DIR}/test/unit-test/FreeRTOS_Sockets
             ${CMOCK_DIR}/vendor/unity/src
 	)
 
@@ -62,9 +63,8 @@ set(test_include_directories "")
 list(APPEND test_include_directories
             .
             ${CMOCK_DIR}/vendor/unity/src
+            ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles
             ${TCP_INCLUDE_DIRS}
-            ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/include
-            ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix
             ${MODULE_ROOT_DIR}/test/unit-test/${project_name}
         )
 
diff --git a/test/unit-test/FreeRTOS_Sockets_IPv6/FreeRTOS_Sockets_IPv6_utest.c b/test/unit-test/FreeRTOS_Sockets_IPv6/FreeRTOS_Sockets_IPv6_utest.c
index 77c6de2f6d..a9dfef83b5 100644
--- a/test/unit-test/FreeRTOS_Sockets_IPv6/FreeRTOS_Sockets_IPv6_utest.c
+++ b/test/unit-test/FreeRTOS_Sockets_IPv6/FreeRTOS_Sockets_IPv6_utest.c
@@ -34,6 +34,8 @@
 #include <string.h>
 #include <stdint.h>
 
+#include "portmacro.h"
+
 #include "mock_task.h"
 #include "mock_list.h"
 
diff --git a/test/unit-test/FreeRTOS_Sockets_IPv6/ut.cmake b/test/unit-test/FreeRTOS_Sockets_IPv6/ut.cmake
index e46ba2cd3c..7cb90263db 100644
--- a/test/unit-test/FreeRTOS_Sockets_IPv6/ut.cmake
+++ b/test/unit-test/FreeRTOS_Sockets_IPv6/ut.cmake
@@ -34,8 +34,8 @@ list(APPEND mock_include_list
             .
             ${TCP_INCLUDE_DIRS}
             ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/include
-            ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix
             ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles
+            ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix
             ${MODULE_ROOT_DIR}/test/unit-test/${project_name}
         )
 
@@ -72,9 +72,8 @@ set(test_include_directories "")
 list(APPEND test_include_directories
             .
             ${CMOCK_DIR}/vendor/unity/src
+            ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles
             ${TCP_INCLUDE_DIRS}
-            ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/include
-            ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix
             ${MODULE_ROOT_DIR}/test/unit-test/${project_name}
         )
 
diff --git a/test/unit-test/FreeRTOS_Stream_Buffer/FreeRTOS_Stream_Buffer_utest.c b/test/unit-test/FreeRTOS_Stream_Buffer/FreeRTOS_Stream_Buffer_utest.c
index 52e2761c3f..709a329b77 100644
--- a/test/unit-test/FreeRTOS_Stream_Buffer/FreeRTOS_Stream_Buffer_utest.c
+++ b/test/unit-test/FreeRTOS_Stream_Buffer/FreeRTOS_Stream_Buffer_utest.c
@@ -34,6 +34,8 @@
 #include <string.h>
 #include <stdint.h>
 
+#include "portmacro.h"
+
 #include "mock_task.h"
 #include "mock_semphr.h"
 
diff --git a/test/unit-test/FreeRTOS_Stream_Buffer/ut.cmake b/test/unit-test/FreeRTOS_Stream_Buffer/ut.cmake
index ae9fc9ce56..ea01aeeebc 100644
--- a/test/unit-test/FreeRTOS_Stream_Buffer/ut.cmake
+++ b/test/unit-test/FreeRTOS_Stream_Buffer/ut.cmake
@@ -26,8 +26,8 @@ list(APPEND mock_include_list
             .
             ${TCP_INCLUDE_DIRS}
             ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/include
-            ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix
             ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles
+            ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix
             ${MODULE_ROOT_DIR}/test/unit-test/${project_name}
         )
 
@@ -65,6 +65,7 @@ set(test_include_directories "")
 list(APPEND test_include_directories
             .
             ${CMOCK_DIR}/vendor/unity/src
+            ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles
             ${TCP_INCLUDE_DIRS}
             ${MODULE_ROOT_DIR}/test/unit-test/${project_name}
         )
diff --git a/test/unit-test/FreeRTOS_TCP_IP/ut.cmake b/test/unit-test/FreeRTOS_TCP_IP/ut.cmake
index f0509f4a5e..0af8437e73 100644
--- a/test/unit-test/FreeRTOS_TCP_IP/ut.cmake
+++ b/test/unit-test/FreeRTOS_TCP_IP/ut.cmake
@@ -34,8 +34,8 @@ list(APPEND mock_include_list
             .
             ${TCP_INCLUDE_DIRS}
             ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/include
-            ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix
             ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles
+            ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix
             ${MODULE_ROOT_DIR}/test/unit-test/${project_name}
         )
 
@@ -73,6 +73,7 @@ set(test_include_directories "")
 list(APPEND test_include_directories
             .
             ${CMOCK_DIR}/vendor/unity/src
+            ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles
             ${TCP_INCLUDE_DIRS}
             ${MODULE_ROOT_DIR}/test/unit-test/${project_name}
             ${CMAKE_BINARY_DIR}/Annexed_TCP_Sources
diff --git a/test/unit-test/FreeRTOS_TCP_IP_DiffConfig/ut.cmake b/test/unit-test/FreeRTOS_TCP_IP_DiffConfig/ut.cmake
index 55de3dba00..2504cb5838 100644
--- a/test/unit-test/FreeRTOS_TCP_IP_DiffConfig/ut.cmake
+++ b/test/unit-test/FreeRTOS_TCP_IP_DiffConfig/ut.cmake
@@ -34,8 +34,8 @@ list(APPEND mock_include_list
             .
             ${TCP_INCLUDE_DIRS}
             ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/include
-            ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix
             ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles
+            ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix
             ${MODULE_ROOT_DIR}/test/unit-test/${project_name}
         )
 
diff --git a/test/unit-test/FreeRTOS_TCP_Reception/ut.cmake b/test/unit-test/FreeRTOS_TCP_Reception/ut.cmake
index 1ada473b9e..28499cef85 100644
--- a/test/unit-test/FreeRTOS_TCP_Reception/ut.cmake
+++ b/test/unit-test/FreeRTOS_TCP_Reception/ut.cmake
@@ -28,8 +28,8 @@ list(APPEND mock_include_list
             .
             ${TCP_INCLUDE_DIRS}
             ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/include
-            ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix
             ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles
+            ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix
             ${MODULE_ROOT_DIR}/test/unit-test/${project_name}
         )
 
@@ -66,6 +66,7 @@ set(test_include_directories "")
 list(APPEND test_include_directories
             .
             ${CMOCK_DIR}/vendor/unity/src
+            ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles
             ${TCP_INCLUDE_DIRS}
             ${MODULE_ROOT_DIR}/test/unit-test/${project_name}
             ${CMAKE_BINARY_DIR}/Annexed_TCP_Sources
diff --git a/test/unit-test/FreeRTOS_TCP_State_Handling/FreeRTOS_TCP_State_Handling_utest.c b/test/unit-test/FreeRTOS_TCP_State_Handling/FreeRTOS_TCP_State_Handling_utest.c
index ea726378f1..69871eb0c0 100644
--- a/test/unit-test/FreeRTOS_TCP_State_Handling/FreeRTOS_TCP_State_Handling_utest.c
+++ b/test/unit-test/FreeRTOS_TCP_State_Handling/FreeRTOS_TCP_State_Handling_utest.c
@@ -34,6 +34,8 @@
 #include <string.h>
 #include <stdint.h>
 
+#include "portmacro.h"
+
 #include "mock_task.h"
 
 #include "mock_FreeRTOS_IP_Private.h"
diff --git a/test/unit-test/FreeRTOS_TCP_State_Handling/ut.cmake b/test/unit-test/FreeRTOS_TCP_State_Handling/ut.cmake
index ce6f672ce5..3cf1e00a8b 100644
--- a/test/unit-test/FreeRTOS_TCP_State_Handling/ut.cmake
+++ b/test/unit-test/FreeRTOS_TCP_State_Handling/ut.cmake
@@ -29,8 +29,8 @@ list(APPEND mock_include_list
             .
             ${TCP_INCLUDE_DIRS}
             ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/include
-            ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix
             ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles
+            ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix
             ${MODULE_ROOT_DIR}/test/unit-test/${project_name}
         )
 
@@ -67,6 +67,7 @@ set(test_include_directories "")
 list(APPEND test_include_directories
             .
             ${CMOCK_DIR}/vendor/unity/src
+            ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles
             ${TCP_INCLUDE_DIRS}
             ${MODULE_ROOT_DIR}/test/unit-test/${project_name}
             ${CMAKE_BINARY_DIR}/Annexed_TCP_Sources
diff --git a/test/unit-test/FreeRTOS_TCP_State_Handling_IPv4/ut.cmake b/test/unit-test/FreeRTOS_TCP_State_Handling_IPv4/ut.cmake
index 4bb8a8f911..1b0277a672 100644
--- a/test/unit-test/FreeRTOS_TCP_State_Handling_IPv4/ut.cmake
+++ b/test/unit-test/FreeRTOS_TCP_State_Handling_IPv4/ut.cmake
@@ -29,9 +29,9 @@ list(APPEND mock_include_list
             .
             ${TCP_INCLUDE_DIRS}
             ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/include
+            ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles
             ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix
             ${MODULE_ROOT_DIR}/test/unit-test/${project_name}
-            ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles
         )
 
 set(mock_define_list "")
@@ -67,6 +67,7 @@ set(test_include_directories "")
 list(APPEND test_include_directories
             .
             ${CMOCK_DIR}/vendor/unity/src
+            ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles
             ${TCP_INCLUDE_DIRS}
             ${MODULE_ROOT_DIR}/test/unit-test/${project_name}
             ${CMAKE_BINARY_DIR}/Annexed_TCP_Sources
diff --git a/test/unit-test/FreeRTOS_TCP_State_Handling_IPv6/ut.cmake b/test/unit-test/FreeRTOS_TCP_State_Handling_IPv6/ut.cmake
index ac1d362a25..1e97a3416f 100644
--- a/test/unit-test/FreeRTOS_TCP_State_Handling_IPv6/ut.cmake
+++ b/test/unit-test/FreeRTOS_TCP_State_Handling_IPv6/ut.cmake
@@ -28,9 +28,9 @@ list(APPEND mock_include_list
             .
             ${TCP_INCLUDE_DIRS}
             ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/include
+            ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles
             ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix
             ${MODULE_ROOT_DIR}/test/unit-test/${project_name}
-            ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles
         )
 
 set(mock_define_list "")
@@ -66,6 +66,7 @@ set(test_include_directories "")
 list(APPEND test_include_directories
             .
             ${CMOCK_DIR}/vendor/unity/src
+            ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles
             ${TCP_INCLUDE_DIRS}
             ${MODULE_ROOT_DIR}/test/unit-test/${project_name}
             ${CMAKE_BINARY_DIR}/Annexed_TCP_Sources
diff --git a/test/unit-test/FreeRTOS_TCP_Transmission/ut.cmake b/test/unit-test/FreeRTOS_TCP_Transmission/ut.cmake
index f8dd38385f..fa455dc815 100644
--- a/test/unit-test/FreeRTOS_TCP_Transmission/ut.cmake
+++ b/test/unit-test/FreeRTOS_TCP_Transmission/ut.cmake
@@ -41,8 +41,8 @@ list(APPEND mock_include_list
             .
             ${MODULE_ROOT_DIR}/source/include
             ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/include
-            ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix
             ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles
+            ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix
             ${MODULE_ROOT_DIR}/test/unit-test/${project_name}
         )
 
@@ -80,6 +80,7 @@ set(test_include_directories "")
 list(APPEND test_include_directories
             .
             ${CMOCK_DIR}/vendor/unity/src
+            ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles
             ${CMAKE_BINARY_DIR}/Annexed_TCP/
             ${MODULE_ROOT_DIR}/test/unit-test/${project_name}
             ${CMAKE_BINARY_DIR}/Annexed_TCP_Sources
diff --git a/test/unit-test/FreeRTOS_TCP_Transmission_IPv6/ut.cmake b/test/unit-test/FreeRTOS_TCP_Transmission_IPv6/ut.cmake
index 5b45fa3477..835aedaba8 100644
--- a/test/unit-test/FreeRTOS_TCP_Transmission_IPv6/ut.cmake
+++ b/test/unit-test/FreeRTOS_TCP_Transmission_IPv6/ut.cmake
@@ -28,8 +28,8 @@ list(APPEND mock_include_list
             .
             ${TCP_INCLUDE_DIRS}
             ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/include
-            ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix
             ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles
+            ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix
             ${MODULE_ROOT_DIR}/test/unit-test/${project_name}
         )
 
@@ -66,6 +66,7 @@ set(test_include_directories "")
 list(APPEND test_include_directories
             .
             ${CMOCK_DIR}/vendor/unity/src
+            ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles
             ${TCP_INCLUDE_DIRS}
             ${MODULE_ROOT_DIR}/test/unit-test/${project_name}
             ${CMAKE_BINARY_DIR}/Annexed_TCP_Sources
diff --git a/test/unit-test/FreeRTOS_TCP_Utils/ut.cmake b/test/unit-test/FreeRTOS_TCP_Utils/ut.cmake
index 2c49375829..d0bbe9014d 100644
--- a/test/unit-test/FreeRTOS_TCP_Utils/ut.cmake
+++ b/test/unit-test/FreeRTOS_TCP_Utils/ut.cmake
@@ -22,8 +22,8 @@ list(APPEND mock_include_list
             .
             ${TCP_INCLUDE_DIRS}
             ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/include
-            ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix
             ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles
+            ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix
             ${MODULE_ROOT_DIR}/test/unit-test/${project_name}
         )
 
@@ -61,6 +61,7 @@ set(test_include_directories "")
 list(APPEND test_include_directories
             .
             ${CMOCK_DIR}/vendor/unity/src
+            ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles
             ${TCP_INCLUDE_DIRS}
             ${MODULE_ROOT_DIR}/test/unit-test/${project_name}
             ${CMAKE_BINARY_DIR}/Annexed_TCP_Sources
diff --git a/test/unit-test/FreeRTOS_TCP_Utils_IPv6/ut.cmake b/test/unit-test/FreeRTOS_TCP_Utils_IPv6/ut.cmake
index 21f73d4a1a..7de12cd003 100644
--- a/test/unit-test/FreeRTOS_TCP_Utils_IPv6/ut.cmake
+++ b/test/unit-test/FreeRTOS_TCP_Utils_IPv6/ut.cmake
@@ -21,8 +21,8 @@ list(APPEND mock_include_list
             .
             ${TCP_INCLUDE_DIRS}
             ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/include
-            ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix
             ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles
+            ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix
             ${MODULE_ROOT_DIR}/test/unit-test/${project_name}
         )
 
@@ -59,6 +59,7 @@ set(test_include_directories "")
 list(APPEND test_include_directories
             .
             ${CMOCK_DIR}/vendor/unity/src
+            ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles
             ${TCP_INCLUDE_DIRS}
             ${MODULE_ROOT_DIR}/test/unit-test/${project_name}
             ${CMAKE_BINARY_DIR}/Annexed_TCP_Sources
diff --git a/test/unit-test/FreeRTOS_TCP_Utils_IPv6_ConfigLowTCPMSS/ut.cmake b/test/unit-test/FreeRTOS_TCP_Utils_IPv6_ConfigLowTCPMSS/ut.cmake
index dcf2f17962..6d3761b278 100644
--- a/test/unit-test/FreeRTOS_TCP_Utils_IPv6_ConfigLowTCPMSS/ut.cmake
+++ b/test/unit-test/FreeRTOS_TCP_Utils_IPv6_ConfigLowTCPMSS/ut.cmake
@@ -21,8 +21,8 @@ list(APPEND mock_include_list
             .
             ${TCP_INCLUDE_DIRS}
             ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/include
-            ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix
             ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles
+            ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix
             ${MODULE_ROOT_DIR}/test/unit-test/${project_name}
         )
 
@@ -59,6 +59,7 @@ set(test_include_directories "")
 list(APPEND test_include_directories
             .
             ${CMOCK_DIR}/vendor/unity/src
+            ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles
             ${TCP_INCLUDE_DIRS}
             ${MODULE_ROOT_DIR}/test/unit-test/${project_name}
             ${CMAKE_BINARY_DIR}/Annexed_TCP_Sources
diff --git a/test/unit-test/FreeRTOS_TCP_WIN/ut.cmake b/test/unit-test/FreeRTOS_TCP_WIN/ut.cmake
index b36711c84f..11bb688942 100644
--- a/test/unit-test/FreeRTOS_TCP_WIN/ut.cmake
+++ b/test/unit-test/FreeRTOS_TCP_WIN/ut.cmake
@@ -56,6 +56,7 @@ set(test_include_directories "")
 list(APPEND test_include_directories
             .
             ${CMOCK_DIR}/vendor/unity/src
+            ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles
             ${TCP_INCLUDE_DIRS}
             ${MODULE_ROOT_DIR}/test/unit-test/${project_name}
         )
diff --git a/test/unit-test/FreeRTOS_UDP_IP/FreeRTOS_UDP_IP_utest.c b/test/unit-test/FreeRTOS_UDP_IP/FreeRTOS_UDP_IP_utest.c
index 1a03e51db2..4949360be0 100644
--- a/test/unit-test/FreeRTOS_UDP_IP/FreeRTOS_UDP_IP_utest.c
+++ b/test/unit-test/FreeRTOS_UDP_IP/FreeRTOS_UDP_IP_utest.c
@@ -34,6 +34,8 @@
 #include <string.h>
 #include <stdint.h>
 
+#include "portmacro.h"
+
 #include "mock_task.h"
 #include "mock_list.h"
 
diff --git a/test/unit-test/FreeRTOS_UDP_IP/ut.cmake b/test/unit-test/FreeRTOS_UDP_IP/ut.cmake
index 43b66385ce..dee8308f7f 100644
--- a/test/unit-test/FreeRTOS_UDP_IP/ut.cmake
+++ b/test/unit-test/FreeRTOS_UDP_IP/ut.cmake
@@ -32,8 +32,8 @@ list(APPEND mock_include_list
             .
             ${TCP_INCLUDE_DIRS}
             ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/include
-            ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix
             ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles
+            ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix
             ${MODULE_ROOT_DIR}/test/unit-test/${project_name}
         )
 
@@ -71,6 +71,7 @@ list(APPEND real_include_directories
 list(APPEND test_include_directories
             .
             ${CMOCK_DIR}/vendor/unity/src
+            ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles
             ${TCP_INCLUDE_DIRS}
             ${MODULE_ROOT_DIR}/test/unit-test/${project_name}
         )
diff --git a/test/unit-test/FreeRTOS_UDP_IPv4/ut.cmake b/test/unit-test/FreeRTOS_UDP_IPv4/ut.cmake
index 1db28b9fff..21a5b43f1b 100644
--- a/test/unit-test/FreeRTOS_UDP_IPv4/ut.cmake
+++ b/test/unit-test/FreeRTOS_UDP_IPv4/ut.cmake
@@ -30,8 +30,8 @@ list(APPEND mock_include_list
             .
             ${TCP_INCLUDE_DIRS}
             ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/include
-            ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix
             ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles
+            ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix
         )
 
 set(mock_define_list "")