diff --git a/deps/SPIRV-Cross/spirv_msl.cpp b/deps/SPIRV-Cross/spirv_msl.cpp
index 4f9e631329..da5656ab77 100644
--- a/deps/SPIRV-Cross/spirv_msl.cpp
+++ b/deps/SPIRV-Cross/spirv_msl.cpp
@@ -28,10 +28,6 @@
 #include <assert.h>
 #include <numeric>
 
-#ifdef RARCH_INTERNAL
-#include <retro_miscellaneous.h>
-#endif
-
 using namespace spv;
 using namespace SPIRV_CROSS_NAMESPACE;
 using namespace std;
@@ -4519,11 +4515,7 @@ void CompilerMSL::mark_scalar_layout_structs(const SPIRType &type)
 				for (uint32_t dim = 0; dim < dimensions; dim++)
 				{
 					uint32_t array_size = to_array_size_literal(mbr_type, dim);
-#ifdef RARCH_INTERNAL
-					array_stride /= MAX(array_size, 1u);
-#else
-					array_stride /= max(array_size, 1u);
-#endif
+					array_stride /= max<uint32_t>(array_size, 1u);
 				}
 
 				// Set expected struct size based on ArrayStride.
@@ -4730,11 +4722,7 @@ void CompilerMSL::ensure_member_packing_rules_msl(SPIRType &ib_type, uint32_t in
 		// Hack off array-of-arrays until we find the array stride per element we must have to make it work.
 		uint32_t dimensions = uint32_t(mbr_type.array.size() - 1);
 		for (uint32_t dim = 0; dim < dimensions; dim++)
-#if RARCH_INTERNAL
-			array_stride /= MAX(to_array_size_literal(mbr_type, dim), 1u);
-#else
-			array_stride /= max(to_array_size_literal(mbr_type, dim), 1u);
-#endif
+			array_stride /= max<uint32_t>(to_array_size_literal(mbr_type, dim), 1u);
 
 		// Pointers are 8 bytes
 		uint32_t mbr_width_in_bytes = is_buff_ptr ? 8 : (mbr_type.width / 8);
@@ -15932,11 +15920,7 @@ uint32_t CompilerMSL::get_declared_type_array_stride_msl(const SPIRType &type, b
 	for (uint32_t dim = 0; dim < dimensions; dim++)
 	{
 		uint32_t array_size = to_array_size_literal(type, dim);
-#if RARCH_INTERNAL
-		value_size *= MAX(array_size, 1u);
-#else
-		value_size *= max(array_size, 1u);
-#endif
+		value_size *= max<uint32_t>(array_size, 1u);
 	}
 
 	return value_size;
@@ -16047,11 +16031,7 @@ uint32_t CompilerMSL::get_declared_type_size_msl(const SPIRType &type, bool is_p
 		if (!type.array.empty())
 		{
 			uint32_t array_size = to_array_size_literal(type);
-#ifdef RARCH_INTERNAL
-			return get_declared_type_array_stride_msl(type, is_packed, row_major) * MAX(array_size, 1u);
-#else
-			return get_declared_type_array_stride_msl(type, is_packed, row_major) * max(array_size, 1u);
-#endif
+			return get_declared_type_array_stride_msl(type, is_packed, row_major) * max<uint32_t>(array_size, 1u);
 		}
 
 		if (type.basetype == SPIRType::Struct)