diff --git a/CMakeLists.txt b/CMakeLists.txt
index a2c704b0..b47fc716 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -403,12 +403,18 @@ endif()
 
 if(ENABLE_METAL AND APPLE)
     set(RENDERER_MTL_INCLUDE_FILES include/renderer_mtl/renderer_mtl.hpp
+        include/renderer_mtl/mtl_depth_stencil_cache.hpp
+        include/renderer_mtl/mtl_pipeline_cache.hpp
+        include/renderer_mtl/mtl_render_target.hpp
+        include/renderer_mtl/mtl_texture.hpp
+        include/renderer_mtl/mtl_vertex_buffer_cache.hpp
+        include/renderer_mtl/pica_to_mtl.hpp
     )
 
     set(RENDERER_MTL_SOURCE_FILES src/core/renderer_mtl/metal_cpp_impl.cpp
         src/core/renderer_mtl/renderer_mtl.cpp
-        src/core/renderer_mtl/texture.cpp
-        src/core/renderer_mtl/etc1.cpp
+        src/core/renderer_mtl/mtl_texture.cpp
+        src/core/renderer_mtl/mtl_etc1.cpp
         src/host_shaders/metal_shaders.metal
     )
 
diff --git a/include/renderer_mtl/render_target.hpp b/include/renderer_mtl/mtl_render_target.hpp
similarity index 100%
rename from include/renderer_mtl/render_target.hpp
rename to include/renderer_mtl/mtl_render_target.hpp
diff --git a/include/renderer_mtl/texture.hpp b/include/renderer_mtl/mtl_texture.hpp
similarity index 100%
rename from include/renderer_mtl/texture.hpp
rename to include/renderer_mtl/mtl_texture.hpp
diff --git a/include/renderer_mtl/renderer_mtl.hpp b/include/renderer_mtl/renderer_mtl.hpp
index 531d6e90..d332f539 100644
--- a/include/renderer_mtl/renderer_mtl.hpp
+++ b/include/renderer_mtl/renderer_mtl.hpp
@@ -2,8 +2,8 @@
 #include <QuartzCore/QuartzCore.hpp>
 
 #include "renderer.hpp"
-#include "texture.hpp"
-#include "render_target.hpp"
+#include "mtl_texture.hpp"
+#include "mtl_render_target.hpp"
 #include "mtl_pipeline_cache.hpp"
 #include "mtl_depth_stencil_cache.hpp"
 #include "mtl_vertex_buffer_cache.hpp"
diff --git a/src/core/renderer_mtl/etc1.cpp b/src/core/renderer_mtl/mtl_etc1.cpp
similarity index 98%
rename from src/core/renderer_mtl/etc1.cpp
rename to src/core/renderer_mtl/mtl_etc1.cpp
index 8018c2dc..a414df3c 100644
--- a/src/core/renderer_mtl/etc1.cpp
+++ b/src/core/renderer_mtl/mtl_etc1.cpp
@@ -1,7 +1,7 @@
 #include <algorithm>
 #include "colour.hpp"
 #include "renderer_mtl/renderer_mtl.hpp"
-#include "renderer_mtl/texture.hpp"
+#include "renderer_mtl/mtl_texture.hpp"
 
 using namespace Helpers;
 
diff --git a/src/core/renderer_mtl/texture.cpp b/src/core/renderer_mtl/mtl_texture.cpp
similarity index 99%
rename from src/core/renderer_mtl/texture.cpp
rename to src/core/renderer_mtl/mtl_texture.cpp
index f50fdca7..8fb255dd 100644
--- a/src/core/renderer_mtl/texture.cpp
+++ b/src/core/renderer_mtl/mtl_texture.cpp
@@ -1,4 +1,4 @@
-#include "renderer_mtl/texture.hpp"
+#include "renderer_mtl/mtl_texture.hpp"
 #include "colour.hpp"
 #include <array>
 
diff --git a/src/core/renderer_mtl/renderer_mtl.cpp b/src/core/renderer_mtl/renderer_mtl.cpp
index 9d20224a..b5efe9e2 100644
--- a/src/core/renderer_mtl/renderer_mtl.cpp
+++ b/src/core/renderer_mtl/renderer_mtl.cpp
@@ -404,7 +404,6 @@ void RendererMTL::drawVertices(PICA::PrimType primType, std::span<const PICA::Ve
 	renderCommandEncoder->setVertexBytes(&regs[0x48], 0x200 - 0x48, 0);
 	renderCommandEncoder->setFragmentBytes(&regs[0x48], 0x200 - 0x48, 0);
 
-	// TODO: respect primitive type
 	renderCommandEncoder->drawPrimitives(toMTLPrimitiveType(primType), NS::UInteger(0), NS::UInteger(vertices.size()));
 }