diff --git a/test/system/async.cpp b/test/system/async.cpp
index 49afac61..e9097032 100644
--- a/test/system/async.cpp
+++ b/test/system/async.cpp
@@ -21,16 +21,16 @@
 #include "test-options.h"
 
 #include <array>
-#include <assert.h>
+#include <cassert>
 #include <cstdint>
 #include <cstddef>
+#include <cstring>
 #include <fcntl.h>
 #include <gtest/gtest.h>
 #include <hip/hip_runtime_api.h>
 #include <memory>
 #include <sstream>
 #include <string>
-#include <string.h>
 #include <sys/types.h>
 #include <tuple>
 #include <variant>
@@ -98,7 +98,7 @@ assertMemoryRegionsMatch(void *mem1, hoff_t mem1_offset, void *mem2, hoff_t mem2
         mem2_v = copyGpuMemory(mem2, mem2_offset, region_size);
         mem2   = mem2_v.data();
     }
-    assert(memcmp(mem1, mem2, region_size) == 0);
+    assert(std::memcmp(mem1, mem2, region_size) == 0);
 }
 
 static void
diff --git a/test/system/config.cpp b/test/system/config.cpp
index e7612f79..31cf8d2e 100644
--- a/test/system/config.cpp
+++ b/test/system/config.cpp
@@ -7,8 +7,8 @@
 #include "hipfile.h"
 #include "test-common.h"
 
+#include <cstddef>
 #include <gtest/gtest.h>
-#include <stddef.h>
 #include <string>
 #include <vector>
 
diff --git a/test/system/driver.cpp b/test/system/driver.cpp
index d46b1e23..f9330b4a 100644
--- a/test/system/driver.cpp
+++ b/test/system/driver.cpp
@@ -9,13 +9,13 @@
 #include "test-options.h"
 #include "test-shared-fixtures.h"
 
-#include <errno.h>
+#include <cerrno>
+#include <climits>
+#include <cstdint>
 #include <gtest/gtest.h>
 #include <hip/hip_runtime_api.h>
-#include <limits.h>
-#include <stdint.h>
 #include <thread>
-#include <time.h>
+#include <time.h> // Do NOT convert to <ctime> as that is not guaranteed to have `struct timespec`
 #include <vector>
 
 #ifdef __HIP_PLATFORM_NVIDIA__