diff --git a/build.sh b/build.sh
index cc63e33b..5ee7d9dd 100755
--- a/build.sh
+++ b/build.sh
@@ -14,8 +14,8 @@ libtool -static -o Build/lib/libOpenMesh.a Build/lib/libOpenMeshCore.a Build/lib
 cd ..
 
 rm -rf build-headers
-rsync -av --include='*/' --include='*.hh' --exclude='*' src/OpenMesh/Core build-headers/
-rsync -av --include='*/' --include='*.hh' --exclude='*' src/OpenMesh/Tools build-headers/
+rsync -av --include='*/' --include='*.hh' --include='*.h' --exclude='*' src/OpenMesh build-headers
+cp module.modulemap build-headers
 
 rm -rf build-xcframework
 mkdir build-xcframework
@@ -24,4 +24,4 @@ mkdir build-xcframework
 xcodebuild -create-xcframework \
   -library build-macos/Build/lib/libOpenMesh.a -headers build-headers \
   -library build-ios/Build/lib/libOpenMesh.a -headers build-headers \
-  -output build-xcframework/OpenMesh.xcframework
\ No newline at end of file
+  -output build-xcframework/openmesh.xcframework
\ No newline at end of file
diff --git a/module.modulemap b/module.modulemap
new file mode 100644
index 00000000..2c2b7c9d
--- /dev/null
+++ b/module.modulemap
@@ -0,0 +1,5 @@
+module OpenMesh {
+    umbrella "."
+    export *
+    module * { export * }
+}
\ No newline at end of file