diff --git a/libgit2/git2 b/libgit2/git2
new file mode 120000
index 0000000..718f4d6
--- /dev/null
+++ b/libgit2/git2
@@ -0,0 +1 @@
+../External/libgit2/include/git2
\ No newline at end of file
diff --git a/libgit2/git2.h b/libgit2/git2.h
new file mode 120000
index 0000000..0c5d695
--- /dev/null
+++ b/libgit2/git2.h
@@ -0,0 +1 @@
+../External/libgit2/include/git2.h
\ No newline at end of file
diff --git a/libgit2/module.modulemap b/libgit2/module.modulemap
index 7c3f656..57824a6 100644
--- a/libgit2/module.modulemap
+++ b/libgit2/module.modulemap
@@ -1,6 +1,21 @@
 module libgit2 {
-	umbrella header "../External/libgit2/include/git2.h"
+	umbrella header "git2.h"
 
-	export *
-	module * { export * }
+	// Exclude headers intended only for Microsoft compilers
+	exclude header "git2/inttypes.h"
+	exclude header "git2/stdint.h"
+
+	// Explicit modules for headers not included in the umbrella header:
+	explicit module cred_helpers {
+		header "git2/cred_helpers.h"
+	}
+
+	explicit module trace {
+		header "git2/trace.h"
+	}
+
+	// Explicit module for the "sys" headers:
+	explicit module sys {
+		umbrella "git2/sys"
+	}
 }