diff --git a/platform-darwin/MasterPassword-iOS.xcodeproj/project.pbxproj b/platform-darwin/MasterPassword-iOS.xcodeproj/project.pbxproj
index 28a1f72b..ce29fd50 100644
--- a/platform-darwin/MasterPassword-iOS.xcodeproj/project.pbxproj
+++ b/platform-darwin/MasterPassword-iOS.xcodeproj/project.pbxproj
@@ -4309,10 +4309,6 @@
 				GCC_WARN_UNUSED_LABEL = YES;
 				GCC_WARN_UNUSED_VALUE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				HEADER_SEARCH_PATHS = (
-					"\"$(BUILD_ROOT)/../IntermediateBuildFilesPath/UninstalledProducts/$(PLATFORM_NAME)/include\"",
-					"$(inherited)",
-				);
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				OTHER_LDFLAGS = "-ObjC";
@@ -4347,7 +4343,6 @@
 				GCC_PREFIX_HEADER = "Source/MasterPassword-Prefix.pch";
 				GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
 				HEADER_SEARCH_PATHS = (
-					"\"$(BUILD_ROOT)/../IntermediateBuildFilesPath/UninstalledProducts/$(PLATFORM_NAME)/include\"",
 					"$(inherited)",
 					"\"$(PROJECT_DIR)/../lib/libsodium/build-ios~/out/include\"",
 					"\"$(PROJECT_DIR)/../lib/libjson-c/build-ios~/out/include\"",
@@ -4528,10 +4523,6 @@
 				GCC_WARN_UNUSED_LABEL = YES;
 				GCC_WARN_UNUSED_VALUE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				HEADER_SEARCH_PATHS = (
-					"\"$(BUILD_ROOT)/../IntermediateBuildFilesPath/UninstalledProducts/$(PLATFORM_NAME)/include\"",
-					"$(inherited)",
-				);
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
@@ -4637,10 +4628,6 @@
 				GCC_WARN_UNUSED_LABEL = YES;
 				GCC_WARN_UNUSED_VALUE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				HEADER_SEARCH_PATHS = (
-					"\"$(BUILD_ROOT)/../IntermediateBuildFilesPath/UninstalledProducts/$(PLATFORM_NAME)/include\"",
-					"$(inherited)",
-				);
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				OTHER_LDFLAGS = "-ObjC";
@@ -4674,7 +4661,6 @@
 				GCC_PREFIX_HEADER = "Source/MasterPassword-Prefix.pch";
 				GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
 				HEADER_SEARCH_PATHS = (
-					"\"$(BUILD_ROOT)/../IntermediateBuildFilesPath/UninstalledProducts/$(PLATFORM_NAME)/include\"",
 					"$(inherited)",
 					"\"$(PROJECT_DIR)/../lib/libsodium/build-ios~/out/include\"",
 					"\"$(PROJECT_DIR)/../lib/libjson-c/build-ios~/out/include\"",
@@ -4719,7 +4705,6 @@
 				GCC_PREFIX_HEADER = "Source/MasterPassword-Prefix.pch";
 				GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
 				HEADER_SEARCH_PATHS = (
-					"\"$(BUILD_ROOT)/../IntermediateBuildFilesPath/UninstalledProducts/$(PLATFORM_NAME)/include\"",
 					"$(inherited)",
 					"\"$(PROJECT_DIR)/../lib/libsodium/build-ios~/out/include\"",
 					"\"$(PROJECT_DIR)/../lib/libjson-c/build-ios~/out/include\"",
diff --git a/platform-darwin/MasterPassword-macOS.xcodeproj/project.pbxproj b/platform-darwin/MasterPassword-macOS.xcodeproj/project.pbxproj
index 0d03f4a5..240fd2a9 100644
--- a/platform-darwin/MasterPassword-macOS.xcodeproj/project.pbxproj
+++ b/platform-darwin/MasterPassword-macOS.xcodeproj/project.pbxproj
@@ -1224,7 +1224,7 @@
 				DA1C7ABC1F1A8F6E009A3551 /* mpw-tests.c */,
 			);
 			name = cli;
-			path = "../../platform-independent/cli-c/cli";
+			path = ../../cli/src;
 			sourceTree = "<group>";
 		};
 		DA2508F819513C1400AC23F1 /* Other Frameworks */ = {
@@ -2992,13 +2992,8 @@
 				GCC_WARN_UNUSED_LABEL = YES;
 				GCC_WARN_UNUSED_VALUE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				HEADER_SEARCH_PATHS = (
-					"\"$(BUILD_ROOT)/../IntermediateBuildFilesPath/UninstalledProducts/$(PLATFORM_NAME)/include\"",
-					"$(inherited)",
-				);
 				LD_DYLIB_INSTALL_NAME = "@rpath/$(EXECUTABLE_PATH)";
 				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks";
-				LIBRARY_SEARCH_PATHS = "$(inherit)";
 				MACOSX_DEPLOYMENT_TARGET = 10.11;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				OTHER_LDFLAGS = "-ObjC";
@@ -3027,17 +3022,16 @@
 				GCC_PREFIX_HEADER = "Source/MasterPassword-Prefix.pch";
 				GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
 				HEADER_SEARCH_PATHS = (
-					"\"$(BUILD_ROOT)/../IntermediateBuildFilesPath/UninstalledProducts/$(PLATFORM_NAME)/include\"",
 					"$(inherited)",
-					"\"$(PROJECT_DIR)/../lib/libsodium/build-ios~/out/include\"",
-					"\"$(PROJECT_DIR)/../lib/libjson-c/build-ios~/out/include\"",
+					"\"$(PROJECT_DIR)/../lib/libsodium/build-macos~/out/include\"",
+					"\"$(PROJECT_DIR)/../lib/libjson-c/build-macos~/out/include\"",
 				);
 				INFOPLIST_FILE = "Source/Mac/MasterPassword-Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
-					"$(PROJECT_DIR)/../lib/libsodium/build-macos~/out/lib",
-					"$(PROJECT_DIR)/../lib/libjson-c/build-macos~/out/lib",
+					"\"$(PROJECT_DIR)/../lib/libsodium/build-macos~/out/lib\"",
+					"\"$(PROJECT_DIR)/../lib/libjson-c/build-macos~/out/lib\"",
 				);
 				OTHER_CFLAGS = (
 					"-DMPW_SODIUM=1",
@@ -3088,13 +3082,15 @@
 			buildSettings = {
 				CLANG_WARN_DOCUMENTATION_COMMENTS = NO;
 				HEADER_SEARCH_PATHS = (
-					"\"$(BUILD_ROOT)/../IntermediateBuildFilesPath/UninstalledProducts/$(PLATFORM_NAME)/include\"",
-					/usr/include/libxml2,
 					"$(inherited)",
+					"\"$(PROJECT_DIR)/../lib/libsodium/build-macos~/out/include\"",
+					"\"$(PROJECT_DIR)/../lib/libjson-c/build-macos~/out/include\"",
+					/usr/include/libxml2,
 				);
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
-					"$(PROJECT_DIR)/../lib/libsodium/build-macos~/out/lib",
+					"\"$(PROJECT_DIR)/../lib/libsodium/build-macos~/out/lib\"",
+					"\"$(PROJECT_DIR)/../lib/libjson-c/build-macos~/out/lib\"",
 				);
 				OTHER_CFLAGS = (
 					"-DMPW_SODIUM=1",
@@ -3107,10 +3103,15 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CLANG_WARN_DOCUMENTATION_COMMENTS = NO;
+				HEADER_SEARCH_PATHS = (
+					"$(inherited)",
+					"\"$(PROJECT_DIR)/../lib/libsodium/build-macos~/out/include\"",
+					"\"$(PROJECT_DIR)/../lib/libjson-c/build-macos~/out/include\"",
+				);
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
-					"$(PROJECT_DIR)/../lib/libsodium/build-macos~/out/lib",
-					"$(PROJECT_DIR)/../lib/libjson-c/build-macos~/out/lib",
+					"\"$(PROJECT_DIR)/../lib/libsodium/build-macos~/out/lib\"",
+					"\"$(PROJECT_DIR)/../lib/libjson-c/build-macos~/out/lib\"",
 				);
 				OTHER_CFLAGS = (
 					"-DMPW_SODIUM=1",
@@ -3126,10 +3127,15 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CLANG_WARN_DOCUMENTATION_COMMENTS = NO;
+				HEADER_SEARCH_PATHS = (
+					"$(inherited)",
+					"\"$(PROJECT_DIR)/../lib/libsodium/build-macos~/out/include\"",
+					"\"$(PROJECT_DIR)/../lib/libjson-c/build-macos~/out/include\"",
+				);
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
-					"$(PROJECT_DIR)/../lib/libsodium/build-macos~/out/lib",
-					"$(PROJECT_DIR)/../lib/libjson-c/build-macos~/out/lib",
+					"\"$(PROJECT_DIR)/../lib/libsodium/build-macos~/out/lib\"",
+					"\"$(PROJECT_DIR)/../lib/libjson-c/build-macos~/out/lib\"",
 				);
 				OTHER_CFLAGS = (
 					"-DMPW_SODIUM=1",
@@ -3145,10 +3151,15 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CLANG_WARN_DOCUMENTATION_COMMENTS = NO;
+				HEADER_SEARCH_PATHS = (
+					"$(inherited)",
+					"\"$(PROJECT_DIR)/../lib/libsodium/build-macos~/out/include\"",
+					"\"$(PROJECT_DIR)/../lib/libjson-c/build-macos~/out/include\"",
+				);
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
-					"$(PROJECT_DIR)/../lib/libsodium/build-macos~/out/lib",
-					"$(PROJECT_DIR)/../lib/libjson-c/build-macos~/out/lib",
+					"\"$(PROJECT_DIR)/../lib/libsodium/build-macos~/out/lib\"",
+					"\"$(PROJECT_DIR)/../lib/libjson-c/build-macos~/out/lib\"",
 				);
 				OTHER_CFLAGS = (
 					"-DMPW_SODIUM=1",
@@ -3164,9 +3175,15 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CLANG_WARN_DOCUMENTATION_COMMENTS = NO;
+				HEADER_SEARCH_PATHS = (
+					"$(inherited)",
+					"\"$(PROJECT_DIR)/../lib/libsodium/build-macos~/out/include\"",
+					"\"$(PROJECT_DIR)/../lib/libjson-c/build-macos~/out/include\"",
+				);
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
-					"$(PROJECT_DIR)/../lib/libsodium/build-macos~/out/lib",
+					"\"$(PROJECT_DIR)/../lib/libsodium/build-macos~/out/lib\"",
+					"\"$(PROJECT_DIR)/../lib/libjson-c/build-macos~/out/lib\"",
 				);
 				OTHER_CFLAGS = (
 					"-DMPW_SODIUM=1",
@@ -3180,9 +3197,15 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CLANG_WARN_DOCUMENTATION_COMMENTS = NO;
+				HEADER_SEARCH_PATHS = (
+					"$(inherited)",
+					"\"$(PROJECT_DIR)/../lib/libsodium/build-macos~/out/include\"",
+					"\"$(PROJECT_DIR)/../lib/libjson-c/build-macos~/out/include\"",
+				);
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
-					"$(PROJECT_DIR)/../lib/libsodium/build-macos~/out/lib",
+					"\"$(PROJECT_DIR)/../lib/libsodium/build-macos~/out/lib\"",
+					"\"$(PROJECT_DIR)/../lib/libjson-c/build-macos~/out/lib\"",
 				);
 				OTHER_CFLAGS = (
 					"-DMPW_SODIUM=1",
@@ -3196,9 +3219,15 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CLANG_WARN_DOCUMENTATION_COMMENTS = NO;
+				HEADER_SEARCH_PATHS = (
+					"$(inherited)",
+					"\"$(PROJECT_DIR)/../lib/libsodium/build-macos~/out/include\"",
+					"\"$(PROJECT_DIR)/../lib/libjson-c/build-macos~/out/include\"",
+				);
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
-					"$(PROJECT_DIR)/../lib/libsodium/build-macos~/out/lib",
+					"\"$(PROJECT_DIR)/../lib/libsodium/build-macos~/out/lib\"",
+					"\"$(PROJECT_DIR)/../lib/libjson-c/build-macos~/out/lib\"",
 				);
 				OTHER_CFLAGS = (
 					"-DMPW_SODIUM=1",
@@ -3352,13 +3381,8 @@
 				GCC_WARN_UNUSED_LABEL = YES;
 				GCC_WARN_UNUSED_VALUE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				HEADER_SEARCH_PATHS = (
-					"\"$(BUILD_ROOT)/../IntermediateBuildFilesPath/UninstalledProducts/$(PLATFORM_NAME)/include\"",
-					"$(inherited)",
-				);
 				LD_DYLIB_INSTALL_NAME = "@rpath/$(EXECUTABLE_PATH)";
 				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks";
-				LIBRARY_SEARCH_PATHS = "$(inherit)";
 				MACOSX_DEPLOYMENT_TARGET = 10.11;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
@@ -3457,13 +3481,8 @@
 				GCC_WARN_UNUSED_LABEL = YES;
 				GCC_WARN_UNUSED_VALUE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				HEADER_SEARCH_PATHS = (
-					"\"$(BUILD_ROOT)/../IntermediateBuildFilesPath/UninstalledProducts/$(PLATFORM_NAME)/include\"",
-					"$(inherited)",
-				);
 				LD_DYLIB_INSTALL_NAME = "@rpath/$(EXECUTABLE_PATH)";
 				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks";
-				LIBRARY_SEARCH_PATHS = "$(inherit)";
 				MACOSX_DEPLOYMENT_TARGET = 10.11;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				OTHER_LDFLAGS = "-ObjC";
@@ -3492,17 +3511,16 @@
 				GCC_PREFIX_HEADER = "Source/MasterPassword-Prefix.pch";
 				GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
 				HEADER_SEARCH_PATHS = (
-					"\"$(BUILD_ROOT)/../IntermediateBuildFilesPath/UninstalledProducts/$(PLATFORM_NAME)/include\"",
 					"$(inherited)",
-					"\"$(PROJECT_DIR)/../lib/libsodium/build-ios~/out/include\"",
-					"\"$(PROJECT_DIR)/../lib/libjson-c/build-ios~/out/include\"",
+					"\"$(PROJECT_DIR)/../lib/libsodium/build-macos~/out/include\"",
+					"\"$(PROJECT_DIR)/../lib/libjson-c/build-macos~/out/include\"",
 				);
 				INFOPLIST_FILE = "Source/Mac/MasterPassword-Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
-					"$(PROJECT_DIR)/../lib/libsodium/build-macos~/out/lib",
-					"$(PROJECT_DIR)/../lib/libjson-c/build-macos~/out/lib",
+					"\"$(PROJECT_DIR)/../lib/libsodium/build-macos~/out/lib\"",
+					"\"$(PROJECT_DIR)/../lib/libjson-c/build-macos~/out/lib\"",
 				);
 				OTHER_CFLAGS = (
 					"-DMPW_SODIUM=1",
@@ -3530,17 +3548,16 @@
 				GCC_PREFIX_HEADER = "Source/MasterPassword-Prefix.pch";
 				GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
 				HEADER_SEARCH_PATHS = (
-					"\"$(BUILD_ROOT)/../IntermediateBuildFilesPath/UninstalledProducts/$(PLATFORM_NAME)/include\"",
 					"$(inherited)",
-					"\"$(PROJECT_DIR)/../lib/libsodium/build-ios~/out/include\"",
-					"\"$(PROJECT_DIR)/../lib/libjson-c/build-ios~/out/include\"",
+					"\"$(PROJECT_DIR)/../lib/libsodium/build-macos~/out/include\"",
+					"\"$(PROJECT_DIR)/../lib/libjson-c/build-macos~/out/include\"",
 				);
 				INFOPLIST_FILE = "Source/Mac/MasterPassword-Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
-					"$(PROJECT_DIR)/../lib/libsodium/build-macos~/out/lib",
-					"$(PROJECT_DIR)/../lib/libjson-c/build-macos~/out/lib",
+					"\"$(PROJECT_DIR)/../lib/libsodium/build-macos~/out/lib\"",
+					"\"$(PROJECT_DIR)/../lib/libjson-c/build-macos~/out/lib\"",
 				);
 				OTHER_CFLAGS = (
 					"-DMPW_SODIUM=1",
@@ -3557,13 +3574,15 @@
 			buildSettings = {
 				CLANG_WARN_DOCUMENTATION_COMMENTS = NO;
 				HEADER_SEARCH_PATHS = (
-					"\"$(BUILD_ROOT)/../IntermediateBuildFilesPath/UninstalledProducts/$(PLATFORM_NAME)/include\"",
-					/usr/include/libxml2,
 					"$(inherited)",
+					"\"$(PROJECT_DIR)/../lib/libsodium/build-macos~/out/include\"",
+					"\"$(PROJECT_DIR)/../lib/libjson-c/build-macos~/out/include\"",
+					/usr/include/libxml2,
 				);
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
-					"$(PROJECT_DIR)/../lib/libsodium/build-macos~/out/lib",
+					"\"$(PROJECT_DIR)/../lib/libsodium/build-macos~/out/lib\"",
+					"\"$(PROJECT_DIR)/../lib/libjson-c/build-macos~/out/lib\"",
 				);
 				OTHER_CFLAGS = (
 					"-DMPW_SODIUM=1",
@@ -3577,13 +3596,15 @@
 			buildSettings = {
 				CLANG_WARN_DOCUMENTATION_COMMENTS = NO;
 				HEADER_SEARCH_PATHS = (
-					"\"$(BUILD_ROOT)/../IntermediateBuildFilesPath/UninstalledProducts/$(PLATFORM_NAME)/include\"",
-					/usr/include/libxml2,
 					"$(inherited)",
+					"\"$(PROJECT_DIR)/../lib/libsodium/build-macos~/out/include\"",
+					"\"$(PROJECT_DIR)/../lib/libjson-c/build-macos~/out/include\"",
+					/usr/include/libxml2,
 				);
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
-					"$(PROJECT_DIR)/../lib/libsodium/build-macos~/out/lib",
+					"\"$(PROJECT_DIR)/../lib/libsodium/build-macos~/out/lib\"",
+					"\"$(PROJECT_DIR)/../lib/libjson-c/build-macos~/out/lib\"",
 				);
 				OTHER_CFLAGS = (
 					"-DMPW_SODIUM=1",