diff --git a/Package.swift b/Package.swift
index 2b3b2681a8..f8c1fb7f99 100644
--- a/Package.swift
+++ b/Package.swift
@@ -41,17 +41,8 @@ let package = Package(
             name: "SpineC",
             path: "spine-ios/Sources/SpineC",
             sources: [
-                "spine-c/src/extensions.cpp",
-                "spine-c/src/generated",
-                "spine-cpp/src/spine",
-            ],
-            publicHeadersPath: "spine-c/include",
-            cxxSettings: [
-                .headerSearchPath("spine-c/include"),
-                .headerSearchPath("spine-c/src"),
-                .headerSearchPath("spine-c/src/generated"),
-                .headerSearchPath("spine-cpp/include"),
-                .headerSearchPath("spine-cpp/src"),
+                "src",
+                "spine"
             ],
             linkerSettings: [
                 .linkedLibrary("c++")
diff --git a/spine-c/include/module.modulemap b/spine-c/include/module.modulemap
index 784cd0cf62..756240ff7b 100644
--- a/spine-c/include/module.modulemap
+++ b/spine-c/include/module.modulemap
@@ -1,4 +1,13 @@
 module SpineC {
-    header "spine-c.h"
-    export *
-}
\ No newline at end of file
+    use c
+    export c
+    explicit module cpp {
+        umbrella header "spine/spine.h"
+        requires cplusplus11
+        export *
+    }
+    explicit module c {
+        header "spine-c.h"
+        export *
+    }
+}
diff --git a/spine-ios/Sources/SpineC/include/module.modulemap b/spine-ios/Sources/SpineC/include/module.modulemap
new file mode 120000
index 0000000000..7191fa398a
--- /dev/null
+++ b/spine-ios/Sources/SpineC/include/module.modulemap
@@ -0,0 +1 @@
+../../../../spine-c/include/module.modulemap
\ No newline at end of file
diff --git a/spine-ios/Sources/SpineC/include/spine b/spine-ios/Sources/SpineC/include/spine
new file mode 120000
index 0000000000..d52e514f8c
--- /dev/null
+++ b/spine-ios/Sources/SpineC/include/spine
@@ -0,0 +1 @@
+../../../../spine-cpp/include/spine
\ No newline at end of file
diff --git a/spine-ios/Sources/SpineC/include/spine-c.h b/spine-ios/Sources/SpineC/include/spine-c.h
new file mode 120000
index 0000000000..e5efea6755
--- /dev/null
+++ b/spine-ios/Sources/SpineC/include/spine-c.h
@@ -0,0 +1 @@
+../../../../spine-c/include/spine-c.h
\ No newline at end of file
diff --git a/spine-ios/Sources/SpineC/spine b/spine-ios/Sources/SpineC/spine
new file mode 120000
index 0000000000..7a470989e9
--- /dev/null
+++ b/spine-ios/Sources/SpineC/spine
@@ -0,0 +1 @@
+../../../spine-cpp/src/spine
\ No newline at end of file
diff --git a/spine-ios/Sources/SpineC/spine-c b/spine-ios/Sources/SpineC/spine-c
deleted file mode 120000
index 07a831f66a..0000000000
--- a/spine-ios/Sources/SpineC/spine-c
+++ /dev/null
@@ -1 +0,0 @@
-../../../spine-c
\ No newline at end of file
diff --git a/spine-ios/Sources/SpineC/spine-cpp b/spine-ios/Sources/SpineC/spine-cpp
deleted file mode 120000
index e1d8623796..0000000000
--- a/spine-ios/Sources/SpineC/spine-cpp
+++ /dev/null
@@ -1 +0,0 @@
-../../../spine-cpp
\ No newline at end of file
diff --git a/spine-ios/Sources/SpineC/src b/spine-ios/Sources/SpineC/src
new file mode 120000
index 0000000000..99e247ad45
--- /dev/null
+++ b/spine-ios/Sources/SpineC/src
@@ -0,0 +1 @@
+../../../spine-c/src
\ No newline at end of file