diff --git a/samples/api_buffered_tracing/main.cpp b/samples/api_buffered_tracing/main.cpp
index 8accf55ab..5aab3af16 100644
--- a/samples/api_buffered_tracing/main.cpp
+++ b/samples/api_buffered_tracing/main.cpp
@@ -25,6 +25,8 @@
 #include "common/defines.hpp"
 #include "hip/hip_runtime.h"
 
+#include <libgen.h>
+
 #include <chrono>
 #include <cstdio>
 #include <cstdlib>
@@ -33,6 +35,7 @@
 #include <random>
 #include <sstream>
 #include <stdexcept>
+#include <thread>
 
 #define HIP_API_CALL(CALL)                                                                         \
     {                                                                                              \
diff --git a/samples/api_callback_tracing/main.cpp b/samples/api_callback_tracing/main.cpp
index 975146329..23649beef 100644
--- a/samples/api_callback_tracing/main.cpp
+++ b/samples/api_callback_tracing/main.cpp
@@ -32,6 +32,7 @@
 #include <mutex>
 #include <random>
 #include <stdexcept>
+#include <thread>
 
 #define HIP_API_CALL(CALL)                                                                         \
     {                                                                                              \
diff --git a/samples/code_object_isa_decode/main.cpp b/samples/code_object_isa_decode/main.cpp
index f72cf7a14..dcfb58a14 100644
--- a/samples/code_object_isa_decode/main.cpp
+++ b/samples/code_object_isa_decode/main.cpp
@@ -22,10 +22,12 @@
 
 #include "hip/hip_runtime.h"
 
+#include <cassert>
 #include <cstdio>
 #include <cstdlib>
 #include <iomanip>
 #include <iostream>
+#include <memory>
 #include <mutex>
 #include <random>
 #include <stdexcept>
diff --git a/samples/code_object_tracing/main.cpp b/samples/code_object_tracing/main.cpp
index 124ec5c14..5794ed095 100644
--- a/samples/code_object_tracing/main.cpp
+++ b/samples/code_object_tracing/main.cpp
@@ -29,6 +29,7 @@
 #include <mutex>
 #include <random>
 #include <stdexcept>
+#include <thread>
 
 #define HIP_API_CALL(CALL)                                                                         \
     {                                                                                              \
diff --git a/samples/counter_collection/device_counting.cpp b/samples/counter_collection/device_counting.cpp
index 62d5f5f7e..d5ce9a5af 100644
--- a/samples/counter_collection/device_counting.cpp
+++ b/samples/counter_collection/device_counting.cpp
@@ -32,6 +32,7 @@
 #include <shared_mutex>
 #include <sstream>
 #include <stdexcept>
+#include <thread>
 #include <unordered_map>
 #include <vector>
 
diff --git a/samples/counter_collection/main.cpp b/samples/counter_collection/main.cpp
index f6f0b57d4..ba63f54b2 100644
--- a/samples/counter_collection/main.cpp
+++ b/samples/counter_collection/main.cpp
@@ -24,6 +24,8 @@
 
 #include "client.hpp"
 
+#include <libgen.h>
+
 #define HIP_CALL(call)                                                                             \
     do                                                                                             \
     {                                                                                              \
diff --git a/samples/counter_collection/print_functional_counters.cpp b/samples/counter_collection/print_functional_counters.cpp
index 39efb9a4e..d156e0775 100644
--- a/samples/counter_collection/print_functional_counters.cpp
+++ b/samples/counter_collection/print_functional_counters.cpp
@@ -2,6 +2,7 @@
 
 #include <unistd.h>
 #include <map>
+#include <memory>
 #include <mutex>
 #include <optional>
 #include <shared_mutex>
diff --git a/samples/external_correlation_id_request/main.cpp b/samples/external_correlation_id_request/main.cpp
index b8524f3ed..b20c1230b 100644
--- a/samples/external_correlation_id_request/main.cpp
+++ b/samples/external_correlation_id_request/main.cpp
@@ -23,6 +23,8 @@
 #include "common/defines.hpp"
 #include "hip/hip_runtime.h"
 
+#include <libgen.h>
+
 #include <chrono>
 #include <cstdio>
 #include <cstdlib>
@@ -31,6 +33,7 @@
 #include <random>
 #include <sstream>
 #include <stdexcept>
+#include <thread>
 
 #define HIP_API_CALL(CALL)                                                                         \
     {                                                                                              \
diff --git a/samples/intercept_table/main.cpp b/samples/intercept_table/main.cpp
index be8240b98..d990fd02e 100644
--- a/samples/intercept_table/main.cpp
+++ b/samples/intercept_table/main.cpp
@@ -29,6 +29,7 @@
 #include <mutex>
 #include <random>
 #include <stdexcept>
+#include <thread>
 
 #define HIP_API_CALL(CALL)                                                                         \
     {                                                                                              \
diff --git a/samples/pc_sampling/main.cpp b/samples/pc_sampling/main.cpp
index b8524f3ed..b20c1230b 100644
--- a/samples/pc_sampling/main.cpp
+++ b/samples/pc_sampling/main.cpp
@@ -23,6 +23,8 @@
 #include "common/defines.hpp"
 #include "hip/hip_runtime.h"
 
+#include <libgen.h>
+
 #include <chrono>
 #include <cstdio>
 #include <cstdlib>
@@ -31,6 +33,7 @@
 #include <random>
 #include <sstream>
 #include <stdexcept>
+#include <thread>
 
 #define HIP_API_CALL(CALL)                                                                         \
     {                                                                                              \
diff --git a/samples/pc_sampling/pcs.hpp b/samples/pc_sampling/pcs.hpp
index a938c6a3f..291e20444 100644
--- a/samples/pc_sampling/pcs.hpp
+++ b/samples/pc_sampling/pcs.hpp
@@ -25,6 +25,7 @@
 #include <rocprofiler-sdk/fwd.h>
 #include <rocprofiler-sdk/rocprofiler.h>
 
+#include <memory>
 #include <vector>
 
 namespace client
diff --git a/tests/bin/hip-graph/hip-graph.cpp b/tests/bin/hip-graph/hip-graph.cpp
index 2ef22e47f..709bd8a6e 100644
--- a/tests/bin/hip-graph/hip-graph.cpp
+++ b/tests/bin/hip-graph/hip-graph.cpp
@@ -25,6 +25,8 @@ THE SOFTWARE.
 #include <iostream>
 #include <mutex>
 
+#include <libgen.h>
+
 // hip header file
 #include <hip/hip_runtime.h>
 
diff --git a/tests/bin/reproducible-runtime/reproducible-runtime.cpp b/tests/bin/reproducible-runtime/reproducible-runtime.cpp
index ee8641fd8..d694a3327 100644
--- a/tests/bin/reproducible-runtime/reproducible-runtime.cpp
+++ b/tests/bin/reproducible-runtime/reproducible-runtime.cpp
@@ -32,6 +32,7 @@
 #include <mutex>
 #include <random>
 #include <stdexcept>
+#include <thread>
 
 #if defined(USE_MPI)
 #    include <mpi.h>
diff --git a/tests/bin/transpose/transpose.cpp b/tests/bin/transpose/transpose.cpp
index e183d6063..fcb0f48cd 100644
--- a/tests/bin/transpose/transpose.cpp
+++ b/tests/bin/transpose/transpose.cpp
@@ -41,6 +41,7 @@
 #include <random>
 #include <sstream>
 #include <stdexcept>
+#include <thread>
 
 #define HIP_API_CALL(CALL)                                                                         \
     {                                                                                              \
diff --git a/tests/lib/transpose/transpose.cpp b/tests/lib/transpose/transpose.cpp
index 9d32e1e90..04995d73a 100644
--- a/tests/lib/transpose/transpose.cpp
+++ b/tests/lib/transpose/transpose.cpp
@@ -30,6 +30,7 @@
 #include <mutex>
 #include <random>
 #include <stdexcept>
+#include <thread>
 
 #if defined(USE_MPI)
 #    include <mpi.h>
diff --git a/tests/lib/vector-operations/vector-ops.cpp b/tests/lib/vector-operations/vector-ops.cpp
index 0e38910ce..9e6be589e 100644
--- a/tests/lib/vector-operations/vector-ops.cpp
+++ b/tests/lib/vector-operations/vector-ops.cpp
@@ -29,6 +29,7 @@
 #include <iostream>
 #include <mutex>
 #include <vector>
+#include <thread>
 
 #include "common/defines.hpp"
 
diff --git a/tests/thread-trace/main.cpp b/tests/thread-trace/main.cpp
index 242bc433d..ef185e8e1 100644
--- a/tests/thread-trace/main.cpp
+++ b/tests/thread-trace/main.cpp
@@ -25,6 +25,7 @@
 #    undef NDEBUG
 #endif
 
+#include <cassert>
 #include <cstdint>
 #include <cstdlib>
 #include <iostream>
diff --git a/tests/tools/c-tool.c b/tests/tools/c-tool.c
index 09e4f7256..a2359e523 100644
--- a/tests/tools/c-tool.c
+++ b/tests/tools/c-tool.c
@@ -31,6 +31,8 @@
  * @brief Example rocprofiler client (tool) written in C
  */
 
+#include <stdio.h>
+
 #include <rocprofiler-sdk/registration.h>
 #include <rocprofiler-sdk/rocprofiler.h>