diff --git a/hipamd/include/hip/amd_detail/amd_device_functions.h b/hipamd/include/hip/amd_detail/amd_device_functions.h
index 6f230bfc21..5c2945a1f2 100644
--- a/hipamd/include/hip/amd_detail/amd_device_functions.h
+++ b/hipamd/include/hip/amd_detail/amd_device_functions.h
@@ -40,6 +40,7 @@ THE SOFTWARE.
 #endif
 
 #if !defined(__HIPCC_RTC__)
+#include <hip/amd_detail/amd_hip_common.h>
 #include "host_defines.h"
 #include "math_fwd.h"
 #include <hip/hip_runtime_api.h>
diff --git a/hipamd/include/hip/amd_detail/amd_hip_bf16.h b/hipamd/include/hip/amd_detail/amd_hip_bf16.h
index 3fb9b2d907..757cb7adaa 100644
--- a/hipamd/include/hip/amd_detail/amd_hip_bf16.h
+++ b/hipamd/include/hip/amd_detail/amd_hip_bf16.h
@@ -85,6 +85,10 @@
 #ifndef _HIP_INCLUDE_HIP_AMD_DETAIL_HIP_BF16_H_
 #define _HIP_INCLUDE_HIP_AMD_DETAIL_HIP_BF16_H_
 
+#if !defined(__HIPCC_RTC__)
+#include <hip/amd_detail/amd_hip_common.h>
+#endif // !defined(__HIPCC_RTC__)
+
 #include "amd_hip_vector_types.h"  // float2 etc
 #include "device_library_decls.h"  // ocml conversion functions
 #include "math_fwd.h"              // ocml device functions
diff --git a/hipamd/include/hip/amd_detail/hip_cooperative_groups_helper.h b/hipamd/include/hip/amd_detail/hip_cooperative_groups_helper.h
index 391c6b9201..a451b144ea 100644
--- a/hipamd/include/hip/amd_detail/hip_cooperative_groups_helper.h
+++ b/hipamd/include/hip/amd_detail/hip_cooperative_groups_helper.h
@@ -33,6 +33,7 @@ THE SOFTWARE.
 
 #if __cplusplus
 #if !defined(__HIPCC_RTC__)
+#include <hip/amd_detail/amd_hip_runtime.h> // threadId, blockId
 #include <hip/amd_detail/amd_device_functions.h>
 #endif
 #if !defined(__align__)
diff --git a/hipamd/include/hip/amd_detail/math_fwd.h b/hipamd/include/hip/amd_detail/math_fwd.h
index 6c471c5fa1..dbfd6e061a 100644
--- a/hipamd/include/hip/amd_detail/math_fwd.h
+++ b/hipamd/include/hip/amd_detail/math_fwd.h
@@ -30,6 +30,7 @@ THE SOFTWARE.
 
 #if !defined(__HIPCC_RTC__)
 #include "host_defines.h"
+#include "amd_hip_vector_types.h"  // For Native_vec_
 #endif
 
 #if defined(__cplusplus)