diff --git a/clients/include/utility.h b/clients/include/utility.h
index 40259cebe..ed355c5ad 100644
--- a/clients/include/utility.h
+++ b/clients/include/utility.h
@@ -142,10 +142,10 @@ template <typename T>
 static constexpr bool is_complex = false;
 
 template <>
-constexpr bool is_complex<hipblasComplex> = true;
+HIPBLAS_CLANG_STATIC constexpr bool is_complex<hipblasComplex> = true;
 
 template <>
-constexpr bool is_complex<hipblasDoubleComplex> = true;
+HIPBLAS_CLANG_STATIC constexpr bool is_complex<hipblasDoubleComplex> = true;
 
 // Get base types from complex types.
 template <typename T, typename = void>
diff --git a/library/include/hipblas.h b/library/include/hipblas.h
index 16e10452f..c83efaea6 100644
--- a/library/include/hipblas.h
+++ b/library/include/hipblas.h
@@ -18,6 +18,12 @@
 #include <hip/hip_runtime_api.h>
 #include <stdint.h>
 
+#if __clang__
+#define HIPBLAS_CLANG_STATIC static
+#else
+#define HIPBLAS_CLANG_STATIC
+#endif
+
 typedef void* hipblasHandle_t;
 
 typedef uint16_t hipblasHalf;