diff --git a/Inc/DirectXCollision.h b/Inc/DirectXCollision.h
index 989c469..a0ee195 100644
--- a/Inc/DirectXCollision.h
+++ b/Inc/DirectXCollision.h
@@ -340,14 +340,25 @@ namespace DirectX
      // C4365: Off by default noise
      // C6001: False positives
 #endif
+
 #ifdef _PREFAST_
 #pragma prefast(push)
 #pragma prefast(disable : 25000, "FXMVECTOR is 16 bytes")
 #pragma prefast(disable : 26495, "Union initialization confuses /analyze")
 #endif
 
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wfloat-equal"
+#pragma clang diagnostic ignored "-Wunknown-warning-option"
+#pragma clang diagnostic ignored "-Wunsafe-buffer-usage"
+#endif
+
 #include "DirectXCollision.inl"
 
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
 #ifdef _PREFAST_
 #pragma prefast(pop)
 #endif
diff --git a/Inc/DirectXMath.h b/Inc/DirectXMath.h
index 593aead..6549d76 100644
--- a/Inc/DirectXMath.h
+++ b/Inc/DirectXMath.h
@@ -819,6 +819,8 @@ namespace DirectX
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wgnu-anonymous-struct"
 #pragma clang diagnostic ignored "-Wnested-anon-types"
+#pragma clang diagnostic ignored "-Wunknown-warning-option"
+#pragma clang diagnostic ignored "-Wunsafe-buffer-usage"
 #endif
 
     //------------------------------------------------------------------------------
@@ -2167,7 +2169,10 @@ namespace DirectX
 
 #ifdef __clang__
 #pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wfloat-equal"
 #pragma clang diagnostic ignored "-Wundefined-reinterpret-cast"
+#pragma clang diagnostic ignored "-Wunknown-warning-option"
+#pragma clang diagnostic ignored "-Wunsafe-buffer-usage"
 #endif
 
 //------------------------------------------------------------------------------
diff --git a/Inc/DirectXPackedVector.h b/Inc/DirectXPackedVector.h
index 1484b47..9a73cb4 100644
--- a/Inc/DirectXPackedVector.h
+++ b/Inc/DirectXPackedVector.h
@@ -1210,8 +1210,17 @@ namespace DirectX
 #pragma prefast(disable : 26495, "Union initialization confuses /analyze")
 #endif
 
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunknown-warning-option"
+#pragma clang diagnostic ignored "-Wunsafe-buffer-usage"
+#endif
+
 #include "DirectXPackedVector.inl"
 
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
 #ifdef _PREFAST_
 #pragma prefast(pop)
 #endif
diff --git a/SHMath/DirectXSH.cpp b/SHMath/DirectXSH.cpp
index a2c504b..be0dc4a 100644
--- a/SHMath/DirectXSH.cpp
+++ b/SHMath/DirectXSH.cpp
@@ -19,6 +19,8 @@
 #pragma clang diagnostic ignored "-Wshadow"
 #pragma clang diagnostic ignored "-Wunused-const-variable"
 #pragma clang diagnostic ignored "-Wunused-function"
+#pragma clang diagnostic ignored "-Wunknown-warning-option"
+#pragma clang diagnostic ignored "-Wunsafe-buffer-usage"
 #endif
 
 #include "DirectXSH.h"
diff --git a/SHMath/DirectXSHD3D11.cpp b/SHMath/DirectXSHD3D11.cpp
index a2e4e0b..6dd4b62 100644
--- a/SHMath/DirectXSHD3D11.cpp
+++ b/SHMath/DirectXSHD3D11.cpp
@@ -36,6 +36,8 @@
 #ifdef __clang__
 #pragma clang diagnostic ignored "-Wcovered-switch-default"
 #pragma clang diagnostic ignored "-Wswitch-enum"
+#pragma clang diagnostic ignored "-Wunknown-warning-option"
+#pragma clang diagnostic ignored "-Wunsafe-buffer-usage"
 #endif
 
 using namespace DirectX;
diff --git a/SHMath/DirectXSHD3D12.cpp b/SHMath/DirectXSHD3D12.cpp
index 5ef9352..3190282 100644
--- a/SHMath/DirectXSHD3D12.cpp
+++ b/SHMath/DirectXSHD3D12.cpp
@@ -31,6 +31,8 @@
 #ifdef __clang__
 #pragma clang diagnostic ignored "-Wcovered-switch-default"
 #pragma clang diagnostic ignored "-Wswitch-enum"
+#pragma clang diagnostic ignored "-Wunknown-warning-option"
+#pragma clang diagnostic ignored "-Wunsafe-buffer-usage"
 #endif
 
 using namespace DirectX;
diff --git a/XDSP/XDSP.h b/XDSP/XDSP.h
index eabd64a..55ec0b5 100644
--- a/XDSP/XDSP.h
+++ b/XDSP/XDSP.h
@@ -27,6 +27,12 @@
 #pragma warning(disable: 6001 6262)
 #endif
 
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunknown-warning-option"
+#pragma clang diagnostic ignored "-Wunsafe-buffer-usage"
+#endif
+
 namespace XDSP
 {
     using XMVECTOR = DirectX::XMVECTOR;
@@ -866,6 +872,9 @@ namespace XDSP
 
 } // namespace XDSP
 
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
 #ifdef _MSC_VER
 #pragma warning(pop)
 #endif