diff --git a/hipamd/include/hip/amd_detail/amd_device_functions.h b/hipamd/include/hip/amd_detail/amd_device_functions.h
index 4569f2e2a4..bcf01a2994 100644
--- a/hipamd/include/hip/amd_detail/amd_device_functions.h
+++ b/hipamd/include/hip/amd_detail/amd_device_functions.h
@@ -38,7 +38,7 @@ extern "C" __device__ int printf(const char *fmt, ...);
 #else
 template <typename... All>
 static inline __device__ void printf(const char* format, All... all) {}
-#endif // __HIP_CLANG_ONLY__
+#endif
 
 extern "C" __device__ unsigned long long __ockl_steadyctr_u64();
 
diff --git a/hipamd/include/hip/amd_detail/amd_math_functions.h b/hipamd/include/hip/amd_detail/amd_math_functions.h
index fca4d7e408..294dbf4305 100644
--- a/hipamd/include/hip/amd_detail/amd_math_functions.h
+++ b/hipamd/include/hip/amd_detail/amd_math_functions.h
@@ -61,7 +61,7 @@ struct __numeric_type<_Float16>
 #define __RETURN_TYPE bool
 
 // DOT FUNCTIONS
-#if __HIP_CLANG_ONLY__
+#if defined(__clang__) && defined(__HIP__)
 __DEVICE__
 inline
 int amd_mixed_dot(short2 a, short2 b, int c, bool saturate) {