diff --git a/SQLite.xcodeproj/project.pbxproj b/SQLite.xcodeproj/project.pbxproj
index 59642fc..21ff9d4 100644
--- a/SQLite.xcodeproj/project.pbxproj
+++ b/SQLite.xcodeproj/project.pbxproj
@@ -140,10 +140,7 @@
 		DCAD429919E2EE50004A51DF /* QueryTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = QueryTests.swift; sourceTree = "<group>"; };
 		DCAE4D151ABE0B3300EFCE7A /* sqlite3.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = sqlite3.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		DCAE4D181ABE0B3300EFCE7A /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		DCAE4D2E1ABE0B6300EFCE7A /* sqlite3.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = sqlite3.xcconfig; sourceTree = "<group>"; };
-		DCAE4D2F1ABE0B8B00EFCE7A /* iphoneos.modulemap */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.module-map"; path = iphoneos.modulemap; sourceTree = "<group>"; };
-		DCAE4D301ABE0B8B00EFCE7A /* iphonesimulator.modulemap */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.module-map"; path = iphonesimulator.modulemap; sourceTree = "<group>"; };
-		DCAE4D311ABE0B8B00EFCE7A /* macosx.modulemap */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.module-map"; path = macosx.modulemap; sourceTree = "<group>"; };
+		DCAE4D2F1ABE0B8B00EFCE7A /* module.modulemap */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.module-map"; path = module.modulemap; sourceTree = "<group>"; };
 		DCAFEAD21AABC818000C21A1 /* FTS.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FTS.swift; sourceTree = "<group>"; };
 		DCAFEAD61AABEFA7000C21A1 /* FTSTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FTSTests.swift; sourceTree = "<group>"; };
 		DCBE28401ABDF18F0042A3FC /* RTree.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RTree.swift; sourceTree = "<group>"; };
@@ -319,10 +316,7 @@
 			children = (
 				DCAE4D181ABE0B3300EFCE7A /* Info.plist */,
 				DC5B12121ABE3298000DA146 /* libsqlite3.dylib */,
-				DCAE4D2E1ABE0B6300EFCE7A /* sqlite3.xcconfig */,
-				DCAE4D2F1ABE0B8B00EFCE7A /* iphoneos.modulemap */,
-				DCAE4D301ABE0B8B00EFCE7A /* iphonesimulator.modulemap */,
-				DCAE4D311ABE0B8B00EFCE7A /* macosx.modulemap */,
+				DCAE4D2F1ABE0B8B00EFCE7A /* module.modulemap */,
 			);
 			name = "Supporting Files";
 			sourceTree = "<group>";
@@ -799,7 +793,7 @@
 		};
 		DCAE4D291ABE0B3400EFCE7A /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = DCAE4D2E1ABE0B6300EFCE7A /* sqlite3.xcconfig */;
+			baseConfigurationReference = DC37742E19C8CE67004FCF85 /* SQLite.xcconfig */;
 			buildSettings = {
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEFINES_MODULE = YES;
@@ -811,6 +805,7 @@
 				INFOPLIST_FILE = sqlite3/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				MODULEMAP_FILE = "$(SRCROOT)/sqlite3/module.modulemap";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 			};
@@ -818,7 +813,7 @@
 		};
 		DCAE4D2A1ABE0B3400EFCE7A /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = DCAE4D2E1ABE0B6300EFCE7A /* sqlite3.xcconfig */;
+			baseConfigurationReference = DC37742E19C8CE67004FCF85 /* SQLite.xcconfig */;
 			buildSettings = {
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
@@ -830,6 +825,7 @@
 				INFOPLIST_FILE = sqlite3/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				MODULEMAP_FILE = "$(SRCROOT)/sqlite3/module.modulemap";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 			};
diff --git a/sqlite3/iphoneos.modulemap b/sqlite3/iphoneos.modulemap
deleted file mode 100644
index e1d16f9..0000000
--- a/sqlite3/iphoneos.modulemap
+++ /dev/null
@@ -1,4 +0,0 @@
-module sqlite3 [system] {
-    header "/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/usr/include/sqlite3.h"
-    export *
-}
diff --git a/sqlite3/iphonesimulator.modulemap b/sqlite3/iphonesimulator.modulemap
deleted file mode 100644
index 2c033c1..0000000
--- a/sqlite3/iphonesimulator.modulemap
+++ /dev/null
@@ -1,4 +0,0 @@
-module sqlite3 [system] {
-    header "/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/usr/include/sqlite3.h"
-    export *
-}
diff --git a/sqlite3/macosx.modulemap b/sqlite3/macosx.modulemap
deleted file mode 100644
index 2442dd6..0000000
--- a/sqlite3/macosx.modulemap
+++ /dev/null
@@ -1,4 +0,0 @@
-module sqlite3 [system] {
-    header "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk/usr/include/sqlite3.h"
-    export *
-}
diff --git a/sqlite3/module.modulemap b/sqlite3/module.modulemap
new file mode 100644
index 0000000..f48e23a
--- /dev/null
+++ b/sqlite3/module.modulemap
@@ -0,0 +1,4 @@
+module sqlite3 [system] {
+    header "/usr/include/sqlite3.h"
+    export *
+}
diff --git a/sqlite3/sqlite3.xcconfig b/sqlite3/sqlite3.xcconfig
deleted file mode 100644
index 4b92f88..0000000
--- a/sqlite3/sqlite3.xcconfig
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "../SQLite/SQLite.xcconfig"
-
-MODULEMAP_FILE[sdk=iphoneos*]        = $(SRCROOT)/sqlite3/iphoneos.modulemap
-MODULEMAP_FILE[sdk=iphonesimulator*] = $(SRCROOT)/sqlite3/iphonesimulator.modulemap
-MODULEMAP_FILE[sdk=macosx*]          = $(SRCROOT)/sqlite3/macosx.modulemap