diff --git a/Sources/OpenSubdiv/include/OpenSubdiv/OSDBoundBilinear.h b/Sources/OpenSubdiv/include/OpenSubdiv/OSDBoundBilinear.h
index 0207ad87..3cc3a1c3 100644
--- a/Sources/OpenSubdiv/include/OpenSubdiv/OSDBoundBilinear.h
+++ b/Sources/OpenSubdiv/include/OpenSubdiv/OSDBoundBilinear.h
@@ -26,7 +26,7 @@
 #define OPENSUBDIV3_HBRBILINEAR_H
 
 /*#define HBR_DEBUG */
-#include "../OpenSubdiv/OSDBoundsubdivision.h"
+#include "../OpenSubdiv/OSDBoundSubdivision.h"
 
 #include "OpenSubdiv/OSDVersion.h"
 
diff --git a/Sources/OpenSubdiv/include/OpenSubdiv/OSDBoundCatmark.h b/Sources/OpenSubdiv/include/OpenSubdiv/OSDBoundCatmark.h
index f70f74a3..eeaaac16 100644
--- a/Sources/OpenSubdiv/include/OpenSubdiv/OSDBoundCatmark.h
+++ b/Sources/OpenSubdiv/include/OpenSubdiv/OSDBoundCatmark.h
@@ -26,7 +26,7 @@
 #define OPENSUBDIV3_HBRCATMARK_H
 
 /*#define HBR_DEBUG */
-#include "../OpenSubdiv/OSDBoundsubdivision.h"
+#include "../OpenSubdiv/OSDBoundSubdivision.h"
 
 #include "OpenSubdiv/OSDVersion.h"
 
diff --git a/Sources/OpenSubdiv/include/OpenSubdiv/OSDBoundLoop.h b/Sources/OpenSubdiv/include/OpenSubdiv/OSDBoundLoop.h
index 323f1524..007c84e9 100644
--- a/Sources/OpenSubdiv/include/OpenSubdiv/OSDBoundLoop.h
+++ b/Sources/OpenSubdiv/include/OpenSubdiv/OSDBoundLoop.h
@@ -29,7 +29,7 @@
 #include <assert.h>
 #include <cmath>
 
-#include "../OpenSubdiv/OSDBoundsubdivision.h"
+#include "../OpenSubdiv/OSDBoundSubdivision.h"
 
 #include "OpenSubdiv/OSDVersion.h"
 
diff --git a/Sources/OpenSubdiv/include/OpenSubdiv/OSDSurfaceGpuShaders.h b/Sources/OpenSubdiv/include/OpenSubdiv/OSDSurfaceGpuShaders.h
new file mode 100644
index 00000000..29ab1e0d
--- /dev/null
+++ b/Sources/OpenSubdiv/include/OpenSubdiv/OSDSurfaceGpuShaders.h
@@ -0,0 +1,35 @@
+//
+//   Copyright 2013 Pixar
+//
+//   Licensed under the Apache License, Version 2.0 (the "Apache License")
+//   with the following modification; you may not use this file except in
+//   compliance with the Apache License and the following modification to it:
+//   Section 6. Trademarks. is deleted and replaced with:
+//
+//   6. Trademarks. This License does not grant permission to use the trade
+//      names, trademarks, service marks, or product names of the Licensor
+//      and its affiliates, except as required to comply with Section 4(c) of
+//      the License and to reproduce the content of the NOTICE file.
+//
+//   You may obtain a copy of the Apache License at
+//
+//       http://www.apache.org/licenses/LICENSE-2.0
+//
+//   Unless required by applicable law or agreed to in writing, software
+//   distributed under the Apache License with the above modification is
+//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+//   KIND, either express or implied. See the Apache License for the specific
+//   language governing permissions and limitations under the Apache License.
+//
+
+#ifndef OPENSUBDIV3_OSD_GPU_SHADERS_H
+#define OPENSUBDIV3_OSD_GPU_SHADERS_H
+
+/* sly workaround, since SwiftPM doesn't yet know how 
+ * to automatically include the autogenerated Swift header. */
+#define GPU_SHADERS_INC <GPU_SHADERS_SWIFT_OSD_H>
+
+/* shaders (HLSL, GLSL, METAL). */
+#include GPU_SHADERS_INC
+
+#endif /* OPENSUBDIV3_OSD_GPU_SHADERS_H */
diff --git a/Sources/OpenSubdiv/include/OpenSubdiv/OpenSubdiv.h b/Sources/OpenSubdiv/include/OpenSubdiv/OpenSubdiv.h
index 87793e8f..6bd780de 100644
--- a/Sources/OpenSubdiv/include/OpenSubdiv/OpenSubdiv.h
+++ b/Sources/OpenSubdiv/include/OpenSubdiv/OpenSubdiv.h
@@ -24,20 +24,6 @@
 #ifndef __OPENSUBDIV_H__
 #define __OPENSUBDIV_H__
 
-#include <Foundation/Foundation.h>
-#include <Metal/Metal.h>
-
-FOUNDATION_EXPORT double OpenSubdivVersionNumber;
-
-FOUNDATION_EXPORT const unsigned char OpenSubdivVersionString[];
-
-/* sly workaround, since SwiftPM doesn't yet know how 
- * to automatically include the autogenerated Swift header. */
-#define GPU_SHADERS_INC <GPU_SHADERS_SWIFT_OSD_H>
-
-/* shaders (HLSL, GLSL, METAL). */
-#include GPU_SHADERS_INC
-
 /* version. */
 #include <OpenSubdiv/OSDVersion.h>
 
@@ -132,6 +118,7 @@ FOUNDATION_EXPORT const unsigned char OpenSubdivVersionString[];
 #include <OpenSubdiv/OSDSurfaceOpenCLGLVertexBuffer.h>
 #include <OpenSubdiv/OSDSurfaceOpenCLPatchTable.h>
 #include <OpenSubdiv/OSDSurfaceOpenCLVertexBuffer.h>
+#include <OpenSubdiv/OSDSurfaceGpuShaders.h>
 #ifdef __CUDA__
 #include <OpenSubdiv/OSDSurfaceCudaGLVertexBuffer.h>
 #include <OpenSubdiv/OSDSurfaceCudaPatchTable.h>
diff --git a/Sources/OpenSubdiv/osd/GLComputeEvaluator.cpp b/Sources/OpenSubdiv/osd/GLComputeEvaluator.cpp
index 6adebfc8..322a1c1b 100644
--- a/Sources/OpenSubdiv/osd/GLComputeEvaluator.cpp
+++ b/Sources/OpenSubdiv/osd/GLComputeEvaluator.cpp
@@ -22,14 +22,11 @@
 //   language governing permissions and limitations under the Apache License.
 //
 
-/* sly workaround, since SwiftPM doesn't yet know how 
- * to automatically include the autogenerated Swift header. */
-#define GPU_SHADERS_INC <GPU_SHADERS_SWIFT_OSD_H>
-
 #include "glLoader.h"
 
 #include "OpenSubdiv/OSDSurfaceGLComputeEvaluator.h"
 #include "OpenSubdiv/OSDSurfaceGLSLPatchShaderSource.h"
+#include "OpenSubdiv/OSDSurfaceGpuShaders.h"
 
 #include "OpenSubdiv/OSDAdaptiveError.h"
 #include "OpenSubdiv/OSDAdaptiveStencilTable.h"
diff --git a/Sources/OpenSubdiv/osd/GLSLPatchShaderSource.cpp b/Sources/OpenSubdiv/osd/GLSLPatchShaderSource.cpp
index 9c0bf83b..c6de8134 100644
--- a/Sources/OpenSubdiv/osd/GLSLPatchShaderSource.cpp
+++ b/Sources/OpenSubdiv/osd/GLSLPatchShaderSource.cpp
@@ -22,11 +22,9 @@
 //   language governing permissions and limitations under the Apache License.
 //
 
-/* sly workaround, since SwiftPM doesn't yet know how 
- * to automatically include the autogenerated Swift header. */
-#define GPU_SHADERS_INC <GPU_SHADERS_SWIFT_OSD_H>
 
 #include "OpenSubdiv/OSDSurfaceGLSLPatchShaderSource.h"
+#include "OpenSubdiv/OSDSurfaceGpuShaders.h"
 #include <sstream>
 #include <string>
 
diff --git a/Sources/OpenSubdiv/osd/GLXFBEvaluator.cpp b/Sources/OpenSubdiv/osd/GLXFBEvaluator.cpp
index 1ec34885..a11985fe 100644
--- a/Sources/OpenSubdiv/osd/GLXFBEvaluator.cpp
+++ b/Sources/OpenSubdiv/osd/GLXFBEvaluator.cpp
@@ -22,14 +22,11 @@
 //   language governing permissions and limitations under the Apache License.
 //
 
-/* sly workaround, since SwiftPM doesn't yet know how 
- * to automatically include the autogenerated Swift header. */
-#define GPU_SHADERS_INC <GPU_SHADERS_SWIFT_OSD_H>
-
 #include "glLoader.h"
 
 #include "OpenSubdiv/OSDSurfaceGLXFBEvaluator.h"
 #include "OpenSubdiv/OSDSurfaceGLSLPatchShaderSource.h"
+#include "OpenSubdiv/OSDSurfaceGpuShaders.h"
 
 #include <cstdio>
 #include <sstream>
diff --git a/Sources/OpenSubdiv/osd/MTLPatchShaderSource.mm b/Sources/OpenSubdiv/osd/MTLPatchShaderSource.mm
index 848ad907..d2f27906 100644
--- a/Sources/OpenSubdiv/osd/MTLPatchShaderSource.mm
+++ b/Sources/OpenSubdiv/osd/MTLPatchShaderSource.mm
@@ -22,12 +22,9 @@
 //   language governing permissions and limitations under the Apache License.
 //
 
-/* sly workaround, since SwiftPM doesn't yet know how 
- * to automatically include the autogenerated Swift header. */
-#define GPU_SHADERS_INC <GPU_SHADERS_SWIFT_OSD_H>
-
 #include "OpenSubdiv/OSDAdaptiveError.h"
 #include "OpenSubdiv/OSDSurfaceMTLPatchShaderSource.h"
+#include "OpenSubdiv/OSDSurfaceGpuShaders.h"
 
 #include <TargetConditionals.h>
 #include <sstream>
diff --git a/Sources/OpenSubdiv/osd/hlslPatchShaderSource.cpp b/Sources/OpenSubdiv/osd/hlslPatchShaderSource.cpp
index f859852d..a2a2a80e 100644
--- a/Sources/OpenSubdiv/osd/hlslPatchShaderSource.cpp
+++ b/Sources/OpenSubdiv/osd/hlslPatchShaderSource.cpp
@@ -22,12 +22,9 @@
 //   language governing permissions and limitations under the Apache License.
 //
 
-/* sly workaround, since SwiftPM doesn't yet know how 
- * to automatically include the autogenerated Swift header. */
-#define GPU_SHADERS_INC <GPU_SHADERS_SWIFT_OSD_H>
-
 #include "OpenSubdiv/OSDAdaptiveError.h"
 #include "OpenSubdiv/OSDSurfaceHLSLPatchShaderSource.h"
+#include "OpenSubdiv/OSDSurfaceGpuShaders.h"
 
 #include <sstream>
 #include <string>