diff --git a/hipamd/include/hip/amd_detail/amd_hip_runtime.h b/hipamd/include/hip/amd_detail/amd_hip_runtime.h
index f3df0473d5..0f953eff18 100644
--- a/hipamd/include/hip/amd_detail/amd_hip_runtime.h
+++ b/hipamd/include/hip/amd_detail/amd_hip_runtime.h
@@ -31,6 +31,14 @@ THE SOFTWARE.
 
 #include <hip/amd_detail/amd_hip_common.h>
 
+#if !defined(__HIPCC_RTC__)
+#ifdef __cplusplus
+#include <cstddef>
+#else
+#include <stddef.h>
+#endif  // __cplusplus
+#endif  // !defined(__HIPCC_RTC__)
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -71,14 +79,13 @@ size_t amd_dbgapi_get_build_id();
 // Top part of file can be compiled with any compiler
 
 #if !defined(__HIPCC_RTC__)
-//#include <cstring>
-#if __cplusplus
+#ifdef __cplusplus
 #include <cmath>
 #include <cstdint>
+#include <tuple>
 #else
 #include <math.h>
-#include <string.h>
-#include <stddef.h>
+#include <stdint.h>
 #endif // __cplusplus
 #else
 typedef unsigned int uint32_t;
diff --git a/hipamd/src/hip_graph.cpp b/hipamd/src/hip_graph.cpp
index dd7a4982f0..62e5642448 100644
--- a/hipamd/src/hip_graph.cpp
+++ b/hipamd/src/hip_graph.cpp
@@ -26,7 +26,6 @@
 #include "hip_event.hpp"
 #include "hip_mempool_impl.hpp"
 
-
 std::vector<hip::Stream*> g_captureStreams;
 amd::Monitor g_captureStreamsLock{"StreamCaptureGlobalList"};
 amd::Monitor g_streamSetLock{"StreamCaptureset"};