diff --git a/library/include/hipblaslt.h b/library/include/hipblaslt.h
index 41ff517f22..aa636ce486 100644
--- a/library/include/hipblaslt.h
+++ b/library/include/hipblaslt.h
@@ -69,7 +69,7 @@
 #undef ROCM_USE_FLOAT8
 #endif
 
-#if defined(__HIPCC__)
+#if defined(__HIPCC__) && defined(HIP_FP8_TYPE_OCP)
 #include <hip/hip_fp8.h>
 #endif
 
diff --git a/tensilelite/Tensile/Source/lib/include/Tensile/DataTypes_Float8_BFloat8.hpp b/tensilelite/Tensile/Source/lib/include/Tensile/DataTypes_Float8_BFloat8.hpp
index b1a3320a28..c248b6d164 100644
--- a/tensilelite/Tensile/Source/lib/include/Tensile/DataTypes_Float8_BFloat8.hpp
+++ b/tensilelite/Tensile/Source/lib/include/Tensile/DataTypes_Float8_BFloat8.hpp
@@ -37,7 +37,9 @@
 #define HIP_HOST __host__
 #define HIP_DEVICE __device__
 
+#if defined(HIP_FP8_TYPE_OCP)
 #include <hip/hip_fp8.h>
+#endif
 
 namespace tensile_hip_f8_impl
 {
diff --git a/tensilelite/Tensile/Source/lib/include/Tensile/hip_f8_impl.h b/tensilelite/Tensile/Source/lib/include/Tensile/hip_f8_impl.h
index c5c0ea9b1b..f45720e06e 100644
--- a/tensilelite/Tensile/Source/lib/include/Tensile/hip_f8_impl.h
+++ b/tensilelite/Tensile/Source/lib/include/Tensile/hip_f8_impl.h
@@ -32,7 +32,9 @@
     && HIP_VERSION_PATCH > 42130 //tmp before gfx94 use hip f8 header
 #define HIP_FP8_TYPE_OCP 1
 #endif
+#if defined(HIP_FP8_TYPE_OCP)
 #include <hip/hip_fp8.h>
+#endif
 
 namespace tensile_hip_f8_impl
 {