diff --git a/Package.swift b/Package.swift
index 1aced0c3..a58c3a21 100644
--- a/Package.swift
+++ b/Package.swift
@@ -630,6 +630,7 @@ let package = Package(
         .target(name: "OpenColorIO"),
         .target(name: "OpenImageIO"),
         .target(name: "OpenTimelineIO"),
+        .target(name: "MaterialX"),
         Arch.OS.python(),
       ],
       swiftSettings: [
diff --git a/Sources/MaterialX/include/MaterialX/MaterialX.h b/Sources/MaterialX/include/MaterialX/MaterialX.h
index 93087390..3b68471a 100644
--- a/Sources/MaterialX/include/MaterialX/MaterialX.h
+++ b/Sources/MaterialX/include/MaterialX/MaterialX.h
@@ -65,10 +65,7 @@
 #include <MaterialX/MXRenderMslMaterial.h>
 #include <MaterialX/MXRenderMslMetalFramebuffer.h>
 #include <MaterialX/MXRenderMslMetalState.h>
-#include <MaterialX/MXRenderMslMetalTextureHandler.h>
 #include <MaterialX/MXRenderMslPipelineStateObject.h>
-#include <MaterialX/MXRenderMslRenderer.h>
-#include <MaterialX/MXRenderMslTextureBaker.h>
 #include <MaterialX/MXRenderOiioImageLoader.h>
 #include <MaterialX/MXRenderShaderMaterial.h>
 #include <MaterialX/MXRenderShaderRenderer.h>
@@ -187,12 +184,20 @@
 #include <MaterialX/MXRenderGlslGLCocoaWrappers.h>
 #include <MaterialX/MXRenderGlslGLContext.h>
 #include <MaterialX/MXRenderGlslGLFramebuffer.h>
-#include <MaterialX/MXRenderGlslGLTextureHandler.h>
 #include <MaterialX/MXRenderGlslGLUtil.h>
 #include <MaterialX/MXRenderGlslGlslMaterial.h>
 #include <MaterialX/MXRenderGlslGlslProgram.h>
-#include <MaterialX/MXRenderGlslGlslRenderer.h>
-#include <MaterialX/MXRenderGlslTextureBaker.h>
+
+#if defined(__APPLE__)
+# include <MaterialX/MXRenderMslMetalTextureHandler.h>
+# include <MaterialX/MXRenderMslRenderer.h>
+# include <MaterialX/MXRenderMslTextureBaker.h>
+#else /* defined(__APPLE__) */
+# include <MaterialX/MXRenderGlslGLTextureHandler.h>
+# include <MaterialX/MXRenderGlslGlslRenderer.h>
+# include <MaterialX/MXRenderGlslTextureBaker.h>
+#endif /* !defined(__APPLE__) */
+
 #include <MaterialX/MXRenderOslExport.h>
 #include <MaterialX/MXRenderOslRenderer.h>
 
diff --git a/Sources/MetaversalDemo/Creator.swift b/Sources/MetaversalDemo/Creator.swift
index c1cd2bf7..d0456b15 100644
--- a/Sources/MetaversalDemo/Creator.swift
+++ b/Sources/MetaversalDemo/Creator.swift
@@ -30,6 +30,7 @@
 
 import Imath
 import ImGui
+import MaterialX
 import OCIOBundle
 import OpenColorIO
 import OpenEXR