diff --git a/Sodium.podspec b/Sodium.podspec
index 75c9685..7ff8618 100644
--- a/Sodium.podspec
+++ b/Sodium.podspec
@@ -15,7 +15,8 @@ s.osx.deployment_target = '10.10'
 s.ios.vendored_library    = 'Sodium/libsodium/libsodium-ios.a'
 s.osx.vendored_library    = 'Sodium/libsodium/libsodium-osx.a'
 
-s.source_files = 'Sodium/*.{swift,h}', 'Sodium/libsodium/*.{swift,h}'
+s.source_files = 'Sodium/**/*.{swift,h}'
+s.private_header_files = 'Sodium/libsodium/*.h'
 
 s.preserve_paths = 'Sodium/libsodium/module.modulemap'
 s.pod_target_xcconfig = {
diff --git a/Sodium.xcodeproj/project.pbxproj b/Sodium.xcodeproj/project.pbxproj
index 970b17f..00bc838 100644
--- a/Sodium.xcodeproj/project.pbxproj
+++ b/Sodium.xcodeproj/project.pbxproj
@@ -129,7 +129,6 @@
 		09A944221A4EB91F00C8A04F /* runtime.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = runtime.h; sourceTree = "<group>"; };
 		09A944231A4EB91F00C8A04F /* utils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = utils.h; sourceTree = "<group>"; };
 		09A944241A4EB91F00C8A04F /* version.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = version.h; sourceTree = "<group>"; };
-		09A944591A4EB97800C8A04F /* sodium_lib.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sodium_lib.h; sourceTree = "<group>"; };
 		09BB142A1E75CA6F00659F17 /* crypto_aead_xchacha20poly1305.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_aead_xchacha20poly1305.h; sourceTree = "<group>"; };
 		09BB142B1E75CA6F00659F17 /* crypto_box_curve25519xchacha20poly1305.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_box_curve25519xchacha20poly1305.h; sourceTree = "<group>"; };
 		09BB142C1E75CA6F00659F17 /* crypto_kdf_blake2b.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_kdf_blake2b.h; sourceTree = "<group>"; };
@@ -158,6 +157,7 @@
 		90C75EAD1AE357CB00F1E749 /* libsodium-osx.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libsodium-osx.a"; sourceTree = "<group>"; };
 		A0918C751E92487A00C1DC33 /* AuthTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AuthTest.swift; sourceTree = "<group>"; };
 		A0918C771E92489100C1DC33 /* Auth.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Auth.swift; sourceTree = "<group>"; };
+		D208E6BD1ECC7A69006D2137 /* sodium_lib.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = sodium_lib.h; sourceTree = "<group>"; };
 		D85101031E22EF5B003DB2E8 /* ReadmeTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ReadmeTests.swift; sourceTree = "<group>"; };
 		D85101051E22F77E003DB2E8 /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
 /* End PBXFileReference section */
@@ -293,7 +293,6 @@
 				0917824D1CA164970022765D /* crypto_core_hchacha20.h */,
 				0917824E1CA164970022765D /* crypto_pwhash_argon2i.h */,
 				0917824F1CA164970022765D /* crypto_pwhash.h */,
-				09A944591A4EB97800C8A04F /* sodium_lib.h */,
 				09A943F11A4EB91F00C8A04F /* core.h */,
 				094E493F1BE6C7760053AC01 /* crypto_aead_aes256gcm.h */,
 				09A943F21A4EB91F00C8A04F /* crypto_aead_chacha20poly1305.h */,
@@ -315,6 +314,7 @@
 				09A944041A4EB91F00C8A04F /* crypto_onetimeauth_poly1305.h */,
 				09A944051A4EB91F00C8A04F /* crypto_onetimeauth.h */,
 				09A944061A4EB91F00C8A04F /* crypto_pwhash_scryptsalsa208sha256.h */,
+				D208E6BD1ECC7A69006D2137 /* sodium_lib.h */,
 				09A944071A4EB91F00C8A04F /* crypto_scalarmult_curve25519.h */,
 				09A944081A4EB91F00C8A04F /* crypto_scalarmult.h */,
 				09A944091A4EB91F00C8A04F /* crypto_secretbox_xsalsa20poly1305.h */,
diff --git a/Sodium/libsodium/module.modulemap b/Sodium/libsodium/module.modulemap
index ab9d9ff..cf27dd6 100644
--- a/Sodium/libsodium/module.modulemap
+++ b/Sodium/libsodium/module.modulemap
@@ -1,4 +1,4 @@
 module libsodium {
-	header "sodium.h"
+	header "sodium_lib.h"
 	export *
 }
diff --git a/Sodium/libsodium/sodium.h b/Sodium/libsodium/sodium_lib.h
similarity index 100%
rename from Sodium/libsodium/sodium.h
rename to Sodium/libsodium/sodium_lib.h