diff --git a/projects/hip/include/hip/hip_bfloat16.h b/projects/hip/include/hip/hip_bfloat16.h
index b4d4f641c2..dcd8c61442 100644
--- a/projects/hip/include/hip/hip_bfloat16.h
+++ b/projects/hip/include/hip/hip_bfloat16.h
@@ -29,12 +29,18 @@
 #ifndef _HIP_BFLOAT16_H_
 #define _HIP_BFLOAT16_H_
 
-#if (defined(__HIP_PLATFORM_HCC__) || defined(__HIP_PLATFORM_AMD__)) && !(defined(__HIP_PLATFORM_NVCC__) || defined(__HIP_PLATFORM_NVIDIA__))
+#if !defined(__HIPCC_RTC__)
+#include <hip/hip_common.h>
+#endif
+
+#if (defined(__HIP_PLATFORM_HCC__) || defined(__HIP_PLATFORM_AMD__)) &&                            \
+    !(defined(__HIP_PLATFORM_NVCC__) || defined(__HIP_PLATFORM_NVIDIA__))
 #include <hip/amd_detail/amd_hip_bfloat16.h>
-#elif !(defined(__HIP_PLATFORM_HCC__) || defined(__HIP_PLATFORM_AMD__)) && (defined(__HIP_PLATFORM_NVCC__) || defined(__HIP_PLATFORM_NVIDIA__))
+#elif !(defined(__HIP_PLATFORM_HCC__) || defined(__HIP_PLATFORM_AMD__)) &&                         \
+    (defined(__HIP_PLATFORM_NVCC__) || defined(__HIP_PLATFORM_NVIDIA__))
 #warning "hip_bfloat16.h is not supported on nvidia platform"
 #else
 #error("Must define exactly one of __HIP_PLATFORM_AMD__ or __HIP_PLATFORM_NVIDIA__");
 #endif
 
-#endif // _HIP_BFLOAT16_H_
+#endif  // _HIP_BFLOAT16_H_
diff --git a/projects/hip/include/hip/hip_math_constants.h b/projects/hip/include/hip/hip_math_constants.h
index faafaa72ca..97684b8786 100644
--- a/projects/hip/include/hip/hip_math_constants.h
+++ b/projects/hip/include/hip/hip_math_constants.h
@@ -21,9 +21,14 @@ THE SOFTWARE.
 */
 #ifndef HIP_MATH_CONSTANTS_H
 #define HIP_MATH_CONSTANTS_H
-#if(defined(__HIP_PLATFORM_HCC__) || defined(__HIP_PLATFORM_AMD__))
+
+#if !defined(__HIPCC_RTC__)
+#include <hip/hip_common.h>
+#endif
+
+#if (defined(__HIP_PLATFORM_HCC__) || defined(__HIP_PLATFORM_AMD__))
 #include "hip/amd_detail/amd_hip_math_constants.h"
-#elif(defined(__HIP_PLATFORM_NVCC__) || defined(__HIP_PLATFORM_NVIDIA__))
+#elif (defined(__HIP_PLATFORM_NVCC__) || defined(__HIP_PLATFORM_NVIDIA__))
 #include "hip/nvidia_detail/nvidia_hip_math_constants.h"
 #else
 #error("Must define exactly one of __HIP_PLATFORM_AMD__ or __HIP_PLATFORM_NVIDIA__");