diff --git a/Extensions/DirectXMathAVX.h b/Extensions/DirectXMathAVX.h
index d4ae467..789d21d 100644
--- a/Extensions/DirectXMathAVX.h
+++ b/Extensions/DirectXMathAVX.h
@@ -34,11 +34,6 @@
 
 namespace DirectX
 {
-#if (DIRECTXMATH_VERSION < 305) && !defined(XM_CALLCONV)
-#define XM_CALLCONV __fastcall
-typedef const DirectX::XMVECTOR& HXMVECTOR;
-typedef const DirectX::XMMATRIX& FXMMATRIX;
-#endif
 
 namespace AVX
 {
@@ -284,6 +279,6 @@ template<uint32_t Elements>
     return AVX::XMVectorSwizzle<(4 - Elements) & 3, (5 - Elements) & 3, (6 - Elements) & 3, (7 - Elements) & 3>(V);
 }
 
-}; // namespace AVX
+} // namespace AVX
 
-}; // namespace DirectX;
+} // namespace DirectX;
diff --git a/Extensions/DirectXMathAVX2.h b/Extensions/DirectXMathAVX2.h
index c3cdae2..2dd485a 100644
--- a/Extensions/DirectXMathAVX2.h
+++ b/Extensions/DirectXMathAVX2.h
@@ -35,11 +35,6 @@
 
 namespace DirectX
 {
-#if (DIRECTXMATH_VERSION < 305) && !defined(XM_CALLCONV)
-#define XM_CALLCONV __fastcall
-typedef const DirectX::XMVECTOR& HXMVECTOR;
-typedef const DirectX::XMMATRIX& FXMMATRIX;
-#endif
 
 namespace AVX2
 {
@@ -967,6 +962,6 @@ inline void XM_CALLCONV XMStoreHalf4( _Out_ PackedVector::XMHALF4* pDestination,
     _mm_storel_epi64( reinterpret_cast<__m128i*>(pDestination), V1 );
 }
 
-}; // namespace AVX2
+} // namespace AVX2
 
-}; // namespace DirectX;
+} // namespace DirectX;
diff --git a/Extensions/DirectXMathBE.h b/Extensions/DirectXMathBE.h
index 3b8e4aa..23d1880 100644
--- a/Extensions/DirectXMathBE.h
+++ b/Extensions/DirectXMathBE.h
@@ -28,11 +28,6 @@
 
 namespace DirectX
 {
-#if (DIRECTXMATH_VERSION < 305) && !defined(XM_CALLCONV)
-#define XM_CALLCONV __fastcall
-typedef const DirectX::XMVECTOR& HXMVECTOR;
-typedef const DirectX::XMMATRIX& FXMMATRIX;
-#endif
 
 inline XMVECTOR XM_CALLCONV XMVectorEndian
 (
@@ -100,4 +95,4 @@ inline XMVECTOR XM_CALLCONV XMVectorEndian
 }; // namespace SSSE3
 #endif // !_M_ARM
 
-}; // namespace DirectX;
\ No newline at end of file
+} // namespace DirectX;
\ No newline at end of file
diff --git a/Extensions/DirectXMathF16C.h b/Extensions/DirectXMathF16C.h
index 902f661..c119ace 100644
--- a/Extensions/DirectXMathF16C.h
+++ b/Extensions/DirectXMathF16C.h
@@ -35,11 +35,6 @@
 
 namespace DirectX
 {
-#if (DIRECTXMATH_VERSION < 305) && !defined(XM_CALLCONV)
-#define XM_CALLCONV __fastcall
-typedef const DirectX::XMVECTOR& HXMVECTOR;
-typedef const DirectX::XMMATRIX& FXMMATRIX;
-#endif
 
 namespace F16C
 {
@@ -405,6 +400,6 @@ inline void XM_CALLCONV XMStoreHalf4( _Out_ PackedVector::XMHALF4* pDestination,
     _mm_storel_epi64( reinterpret_cast<__m128i*>(pDestination), V1 );
 }
 
-}; // namespace F16C
+} // namespace F16C
 
-}; // namespace DirectX;
\ No newline at end of file
+} // namespace DirectX;
\ No newline at end of file
diff --git a/Extensions/DirectXMathFMA3.h b/Extensions/DirectXMathFMA3.h
index 5874014..b0bc615 100644
--- a/Extensions/DirectXMathFMA3.h
+++ b/Extensions/DirectXMathFMA3.h
@@ -34,11 +34,6 @@
 
 namespace DirectX
 {
-#if (DIRECTXMATH_VERSION < 305) && !defined(XM_CALLCONV)
-#define XM_CALLCONV __fastcall
-typedef const DirectX::XMVECTOR& HXMVECTOR;
-typedef const DirectX::XMMATRIX& FXMMATRIX;
-#endif
 
 namespace FMA3
 {
@@ -400,6 +395,6 @@ inline XMMATRIX XM_CALLCONV XMMatrixMultiplyTranspose
     return mResult;
 }
 
-}; // namespace FMA3
+} // namespace FMA3
 
-}; // namespace DirectX;
+} // namespace DirectX;
diff --git a/Extensions/DirectXMathFMA4.h b/Extensions/DirectXMathFMA4.h
index 2a3e1d0..35606f4 100644
--- a/Extensions/DirectXMathFMA4.h
+++ b/Extensions/DirectXMathFMA4.h
@@ -34,11 +34,6 @@
 
 namespace DirectX
 {
-#if (DIRECTXMATH_VERSION < 305) && !defined(XM_CALLCONV)
-#define XM_CALLCONV __fastcall
-typedef const DirectX::XMVECTOR& HXMVECTOR;
-typedef const DirectX::XMMATRIX& FXMMATRIX;
-#endif
 
 namespace FMA4
 {
@@ -409,6 +404,6 @@ inline XMMATRIX XM_CALLCONV XMMatrixMultiplyTranspose
     return mResult;
 }
 
-}; // namespace FMA4
+} // namespace FMA4
 
-}; // namespace DirectX;
+} // namespace DirectX;
diff --git a/Extensions/DirectXMathSSE3.h b/Extensions/DirectXMathSSE3.h
index 9d3911b..4b6dd54 100644
--- a/Extensions/DirectXMathSSE3.h
+++ b/Extensions/DirectXMathSSE3.h
@@ -30,11 +30,6 @@
 
 namespace DirectX
 {
-#if (DIRECTXMATH_VERSION < 305) && !defined(XM_CALLCONV)
-#define XM_CALLCONV __fastcall
-typedef const DirectX::XMVECTOR& HXMVECTOR;
-typedef const DirectX::XMMATRIX& FXMMATRIX;
-#endif
 
 namespace SSE3
 {
@@ -115,6 +110,6 @@ inline XMVECTOR XM_CALLCONV XMVectorSwizzle_1133( FXMVECTOR V )
     return _mm_movehdup_ps(V);
 }
 
-}; // namespace SSE3
+} // namespace SSE3
 
-}; // namespace DirectX;
\ No newline at end of file
+} // namespace DirectX;
\ No newline at end of file
diff --git a/Extensions/DirectXMathSSE4.h b/Extensions/DirectXMathSSE4.h
index 6f10dc1..04a83c5 100644
--- a/Extensions/DirectXMathSSE4.h
+++ b/Extensions/DirectXMathSSE4.h
@@ -30,11 +30,6 @@
 
 namespace DirectX
 {
-#if (DIRECTXMATH_VERSION < 305) && !defined(XM_CALLCONV)
-#define XM_CALLCONV __fastcall
-typedef const DirectX::XMVECTOR& HXMVECTOR;
-typedef const DirectX::XMMATRIX& FXMMATRIX;
-#endif
 
 namespace SSE4
 {
@@ -417,6 +412,6 @@ inline XMVECTOR XM_CALLCONV XMPlaneNormalize( FXMVECTOR P )
     return vResult;
 }
 
-}; // namespace SSE4
+} // namespace SSE4
 
-}; // namespace DirectX;
\ No newline at end of file
+} // namespace DirectX;
\ No newline at end of file
diff --git a/SHMath/DirectXSH.h b/SHMath/DirectXSH.h
index 7a68309..94bf216 100644
--- a/SHMath/DirectXSH.h
+++ b/SHMath/DirectXSH.h
@@ -13,7 +13,7 @@
 
 #pragma once
 
-#define DIRECTX_SHMATH_VERSION 103
+#define DIRECTX_SHMATH_VERSION 104
 
 #include <DirectXMath.h>
 
@@ -24,12 +24,6 @@ struct ID3D11Texture2D;
 
 namespace DirectX
 {
-#if (DIRECTXMATH_VERSION < 305) && !defined(XM_CALLCONV)
-#define XM_CALLCONV __fastcall
-typedef const DirectX::XMVECTOR& HXMVECTOR;
-typedef const DirectX::XMMATRIX& FXMMATRIX;
-#endif
-
 const size_t XM_SH_MINORDER = 2;
 const size_t XM_SH_MAXORDER = 6;
 
@@ -72,4 +66,4 @@ bool XM_CALLCONV XMSHEvalHemisphereLight( _In_ size_t order, _In_ FXMVECTOR dir,
 HRESULT SHProjectCubeMap( _In_ ID3D11DeviceContext *context, _In_ size_t order, _In_ ID3D11Texture2D *cubeMap,
                           _Out_writes_opt_(order*order) float *resultR, _Out_writes_opt_(order*order) float *resultG, _Out_writes_opt_(order*order) float *resultB );
 
-}; // namespace DirectX
+} // namespace DirectX
diff --git a/SHMath/DirectXSHD3D11.cpp b/SHMath/DirectXSHD3D11.cpp
index c4cdc9e..61a19ca 100644
--- a/SHMath/DirectXSHD3D11.cpp
+++ b/SHMath/DirectXSHD3D11.cpp
@@ -162,7 +162,7 @@ namespace
     }
 #pragma warning(pop)
 
-}; // namespace anonymous
+} // namespace anonymous
 
 //-------------------------------------------------------------------------------------
 // Projects a function represented in a cube map into spherical harmonics.
diff --git a/XDSP/XDSP.h b/XDSP/XDSP.h
index 29a0f63..d238e34 100644
--- a/XDSP/XDSP.h
+++ b/XDSP/XDSP.h
@@ -33,12 +33,6 @@
 
 namespace XDSP
 {
-    #if (DIRECTXMATH_VERSION < 305) && !defined(XM_CALLCONV)
-    #define XM_CALLCONV __fastcall
-    typedef const DirectX::XMVECTOR& HXMVECTOR;
-    typedef const DirectX::XMMATRIX& FXMMATRIX;
-    #endif
-
     typedef DirectX::XMVECTOR XMVECTOR;
     typedef DirectX::FXMVECTOR FXMVECTOR;
     typedef DirectX::GXMVECTOR GXMVECTOR;
@@ -802,6 +796,6 @@ namespace XDSP
         }
     }
 
-}; // namespace XDSP
+} // namespace XDSP
 
 #pragma warning(pop)