diff --git a/common/tests/threadpool_int/CMakeLists.txt b/common/tests/threadpool_int/CMakeLists.txt
index a8faa6d3..75b24883 100644
--- a/common/tests/threadpool_int/CMakeLists.txt
+++ b/common/tests/threadpool_int/CMakeLists.txt
@@ -12,4 +12,4 @@ set(${theseTestsName}_c_files
 set(${theseTestsName}_h_files
 )
 
-build_test_artifacts(${theseTestsName} "tests/c_pal" ADDITIONAL_LIBS real_process_watchdog c_pal_ll_reals pal_interfaces c_pal)
+build_test_artifacts(${theseTestsName} "tests/c_pal" ADDITIONAL_LIBS pal_interfaces c_pal c_pal_reals)
diff --git a/common/tests/threadpool_int/threadpool_int.c b/common/tests/threadpool_int/threadpool_int.c
index 49465633..8e3d2b91 100644
--- a/common/tests/threadpool_int/threadpool_int.c
+++ b/common/tests/threadpool_int/threadpool_int.c
@@ -13,6 +13,8 @@
 
 #include "testrunnerswitcher.h"
 
+#include "c_pal/timed_test_suite.h"
+
 #include "umock_c/umock_c.h" // IWYU pragma: keep
 
 #include "c_pal/timer.h"
diff --git a/interfaces/tests/srw_lock_int/CMakeLists.txt b/interfaces/tests/srw_lock_int/CMakeLists.txt
index 90495208..cd5e10f3 100644
--- a/interfaces/tests/srw_lock_int/CMakeLists.txt
+++ b/interfaces/tests/srw_lock_int/CMakeLists.txt
@@ -12,5 +12,5 @@ set(${theseTestsName}_c_files
 set(${theseTestsName}_h_files
 )
 
-build_test_artifacts(${theseTestsName} "tests/c_pal/int" ADDITIONAL_LIBS real_process_watchdog c_pal_ll_reals c_pal)
+build_test_artifacts(${theseTestsName} "tests/c_pal/int" ADDITIONAL_LIBS c_pal)
 
diff --git a/interfaces/tests/srw_lock_int/srw_lock_int.c b/interfaces/tests/srw_lock_int/srw_lock_int.c
index 67b347f8..bcd702cd 100644
--- a/interfaces/tests/srw_lock_int/srw_lock_int.c
+++ b/interfaces/tests/srw_lock_int/srw_lock_int.c
@@ -6,8 +6,6 @@
 
 #include "testrunnerswitcher.h"
 
-#include "umock_c/umock_c.h" // IWYU pragma: keep
-
 #include "c_pal/srw_lock.h"
 #include "c_pal/timed_test_suite.h"
 
diff --git a/interfaces/tests/srw_lock_ll_int/CMakeLists.txt b/interfaces/tests/srw_lock_ll_int/CMakeLists.txt
index 372e890c..7a657778 100644
--- a/interfaces/tests/srw_lock_ll_int/CMakeLists.txt
+++ b/interfaces/tests/srw_lock_ll_int/CMakeLists.txt
@@ -12,5 +12,5 @@ set(${theseTestsName}_c_files
 set(${theseTestsName}_h_files
 )
 
-build_test_artifacts(${theseTestsName} "tests/c_pal/int" ADDITIONAL_LIBS real_process_watchdog c_pal_ll_reals c_pal)
+build_test_artifacts(${theseTestsName} "tests/c_pal/int" ADDITIONAL_LIBS c_pal)
 
diff --git a/interfaces/tests/srw_lock_ll_int/srw_lock_ll_int.c b/interfaces/tests/srw_lock_ll_int/srw_lock_ll_int.c
index 1abdc5ac..ed3e68de 100644
--- a/interfaces/tests/srw_lock_ll_int/srw_lock_ll_int.c
+++ b/interfaces/tests/srw_lock_ll_int/srw_lock_ll_int.c
@@ -5,8 +5,6 @@
 
 #include "testrunnerswitcher.h"
 
-#include "umock_c/umock_c.h" // IWYU pragma: keep
-
 #include "c_pal/srw_lock_ll.h"
 #include "c_pal/timed_test_suite.h"
 
diff --git a/linux/linux_reals/real_process_watchdog.c b/linux/linux_reals/real_process_watchdog.c
index 4c0f37e6..8e86954d 100644
--- a/linux/linux_reals/real_process_watchdog.c
+++ b/linux/linux_reals/real_process_watchdog.c
@@ -2,6 +2,7 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 #include "real_interlocked_renames.h" // IWYU pragma: keep
+#include "real_ps_util_renames.h" // IWYU pragma: keep
 
 #include "real_process_watchdog_renames.h" // IWYU pragma: keep
 
diff --git a/win32/reals/real_process_watchdog.c b/win32/reals/real_process_watchdog.c
index 000343c5..4d2035a3 100644
--- a/win32/reals/real_process_watchdog.c
+++ b/win32/reals/real_process_watchdog.c
@@ -2,6 +2,7 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 #include "real_interlocked_renames.h" // IWYU pragma: keep
+#include "real_ps_util_renames.h" // IWYU pragma: keep
 
 #include "real_process_watchdog_renames.h" // IWYU pragma: keep
 
diff --git a/win32/tests/gballoc_ll_passthrough_ut/gballoc_ll_passthrough_ut_pch.h b/win32/tests/gballoc_ll_passthrough_ut/gballoc_ll_passthrough_ut_pch.h
index 371df0b0..8a8b9f91 100644
--- a/win32/tests/gballoc_ll_passthrough_ut/gballoc_ll_passthrough_ut_pch.h
+++ b/win32/tests/gballoc_ll_passthrough_ut/gballoc_ll_passthrough_ut_pch.h
@@ -10,6 +10,9 @@
 
 #include "macro_utils/macro_utils.h"
 #include "testrunnerswitcher.h"
+
+#include "umock_c/umock_c.h"
+
 #include "c_pal/timed_test_suite.h"
 
 #endif // GBALLOC_LL_PASSTHROUGH_UT_PCH_H