diff --git a/include/hip/driver_types.h b/include/hip/driver_types.h
index dad0a3d156..49307d4d50 100644
--- a/include/hip/driver_types.h
+++ b/include/hip/driver_types.h
@@ -25,18 +25,17 @@ THE SOFTWARE.
 
 #if !defined(__HIPCC_RTC__)
 #include <hip/hip_common.h>
+#if __cplusplus
+#include <cstdlib>
+#else
+#include <stdlib.h> // size_t
+#endif
 #endif
 
 #if !defined(__HIP_PLATFORM_AMD__) && defined(__HIP_PLATFORM_NVIDIA__)
 #include "driver_types.h"
 #elif defined(__HIP_PLATFORM_AMD__) && !defined(__HIP_PLATFORM_NVIDIA__)
 
-#if !defined(__HIPCC_RTC__)
-#ifndef __cplusplus
-#include <stdbool.h>
-#endif
-#endif // !defined(__HIPCC_RTC__)
-
 /**
  *  @defgroup DriverTypes Driver Types
  *  @{
diff --git a/include/hip/hip_runtime.h b/include/hip/hip_runtime.h
index 20dd9703df..024d912673 100644
--- a/include/hip/hip_runtime.h
+++ b/include/hip/hip_runtime.h
@@ -45,14 +45,13 @@ THE SOFTWARE.
 // Some standard header files, these are included by hc.hpp and so want to make them avail on both
 // paths to provide a consistent include env and avoid "missing symbol" errors that only appears
 // on NVCC path:
+#if __cplusplus
+#include <cstdint>
+#include <cstdlib>
+#else
 #include <stdint.h>
-#include <stdio.h>
 #include <stdlib.h>
-#include <assert.h>
-
-#if __cplusplus > 199711L
-#include <thread>
-#endif
+#endif // __cplusplus
 #endif // !defined(__HIPCC_RTC__)
 
 #include <hip/hip_version.h>
diff --git a/include/hip/hip_runtime_api.h b/include/hip/hip_runtime_api.h
index 5420c45d3b..612fdfb7c1 100644
--- a/include/hip/hip_runtime_api.h
+++ b/include/hip/hip_runtime_api.h
@@ -31,7 +31,16 @@ THE SOFTWARE.
 #ifndef HIP_INCLUDE_HIP_HIP_RUNTIME_API_H
 #define HIP_INCLUDE_HIP_HIP_RUNTIME_API_H
 
-#include <string.h>  // for getDeviceProp
+#if __cplusplus
+#include <climits>
+#include <cstdint>
+#include <cstdlib>
+#else
+#include <limits.h>
+#include <stdint.h>
+#include <stdlib.h>
+#endif
+
 #include <hip/hip_version.h>
 #include <hip/hip_common.h>
 #include <hip/linker_types.h>
@@ -574,8 +583,6 @@ enum hipGPUDirectRDMAWritesOrdering {
 
 #if defined(__HIP_PLATFORM_AMD__) && !defined(__HIP_PLATFORM_NVIDIA__)
 
-#include <stdint.h>
-#include <stddef.h>
 #ifndef GENERIC_GRID_LAUNCH
 #define GENERIC_GRID_LAUNCH 1
 #endif
diff --git a/include/hip/hiprtc.h b/include/hip/hiprtc.h
index f3fba532b5..2810832ba6 100644
--- a/include/hip/hiprtc.h
+++ b/include/hip/hiprtc.h
@@ -28,12 +28,16 @@ THE SOFTWARE.
 #include <hip/nvidia_detail/nvidia_hiprtc.h>
 #elif defined(__HIP_PLATFORM_AMD__) && !defined(__HIP_PLATFORM_NVIDIA__)
 
+#ifdef __cplusplus
+#include <cstdlib>
+#else
+#include <stdlib.h>
+#endif
+
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
 
-#include <stdlib.h>
-
 #if !defined(_WIN32)
 #pragma GCC visibility push(default)
 #endif
diff --git a/include/hip/texture_types.h b/include/hip/texture_types.h
index 3473c81886..cfc6fefd4f 100644
--- a/include/hip/texture_types.h
+++ b/include/hip/texture_types.h
@@ -43,7 +43,6 @@ THE SOFTWARE.
  *                                                                              *
  *******************************************************************************/
 #if !defined(__HIPCC_RTC__)
-#include <limits.h>
 #include <hip/channel_descriptor.h>
 #include <hip/driver_types.h>
 #endif // !defined(__HIPCC_RTC__)