diff --git a/hipamd/include/hip/amd_detail/amd_hip_fp16.h b/hipamd/include/hip/amd_detail/amd_hip_fp16.h
index edac461eb0..f81cbecf41 100644
--- a/hipamd/include/hip/amd_detail/amd_hip_fp16.h
+++ b/hipamd/include/hip/amd_detail/amd_hip_fp16.h
@@ -24,6 +24,18 @@ THE SOFTWARE.
 #ifndef HIP_INCLUDE_HIP_AMD_DETAIL_HIP_FP16_H
 #define HIP_INCLUDE_HIP_AMD_DETAIL_HIP_FP16_H
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wreserved-identifier"
+#pragma clang diagnostic ignored "-Wreserved-macro-identifier"
+#pragma clang diagnostic ignored "-Wc++98-compat"
+#pragma clang diagnostic ignored "-Wc++98-compat-pedantic"
+#pragma clang diagnostic ignored "-Wsign-conversion"
+#pragma clang diagnostic ignored "-Wfloat-conversion"
+#pragma clang diagnostic ignored "-Wdouble-promotion"
+#pragma clang diagnostic ignored "-Wnested-anon-types"
+#pragma clang diagnostic ignored "-Wgnu-anonymous-struct"
+#pragma clang diagnostic ignored "-Wfloat-equal"
+
 #if defined(__HIPCC_RTC__)
   #define __HOST_DEVICE__ __device__
 #else
@@ -1775,4 +1787,5 @@ THE SOFTWARE.
     #endif
 #endif // !defined(__clang__) && defined(__GNUC__)
 
+#pragma clang diagnostic pop
 #endif // HIP_INCLUDE_HIP_AMD_DETAIL_HIP_FP16_H
diff --git a/hipamd/include/hip/amd_detail/hip_fp16_math_fwd.h b/hipamd/include/hip/amd_detail/hip_fp16_math_fwd.h
index a4ae27ca6f..9b2efefe6b 100644
--- a/hipamd/include/hip/amd_detail/hip_fp16_math_fwd.h
+++ b/hipamd/include/hip/amd_detail/hip_fp16_math_fwd.h
@@ -28,7 +28,7 @@ THE SOFTWARE.
 #if !defined(__HIPCC_RTC__)
 #include "host_defines.h"
 #endif
-#if !__CLANG_HIP_RUNTIME_WRAPPER_INCLUDED__
+#ifndef __CLANG_HIP_RUNTIME_WRAPPER_INCLUDED__
 extern "C"
 {
     __device__ __attribute__((const)) _Float16 __ocml_ceil_f16(_Float16);