diff --git a/lldb/lldb.xcodeproj/project.pbxproj b/lldb/lldb.xcodeproj/project.pbxproj
index c83b16ed8c62..11b3b3ea87ed 100644
--- a/lldb/lldb.xcodeproj/project.pbxproj
+++ b/lldb/lldb.xcodeproj/project.pbxproj
@@ -16,7 +16,6 @@
 			dependencies = (
 				26B391F11A6DCCBE00456239 /* PBXTargetDependency */,
 				26CEF3B014FD591F007286B2 /* PBXTargetDependency */,
-				2687EACD1508115900DD8C2E /* PBXTargetDependency */,
 			);
 			name = desktop_no_xpc;
 			productName = snowleopard;
@@ -30,7 +29,6 @@
 			dependencies = (
 				26CEF3BB14FD595B007286B2 /* PBXTargetDependency */,
 				26B391EF1A6DCCAF00456239 /* PBXTargetDependency */,
-				2687EACB1508115000DD8C2E /* PBXTargetDependency */,
 			);
 			name = desktop;
 			productName = desktop;
@@ -45,7 +43,6 @@
 			dependencies = (
 				AFCA21D21D18E556004386B8 /* PBXTargetDependency */,
 				26CEF3C214FD5973007286B2 /* PBXTargetDependency */,
-				2687EACF1508116300DD8C2E /* PBXTargetDependency */,
 			);
 			name = ios;
 			productName = ios;
@@ -1188,27 +1185,6 @@
 			remoteGlobalIDString = 26680206115FD0ED008E1FE4;
 			remoteInfo = LLDB;
 		};
-		2687EACA1508115000DD8C2E /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 2687EAC51508110B00DD8C2E;
-			remoteInfo = "install-headers";
-		};
-		2687EACC1508115900DD8C2E /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 2687EAC51508110B00DD8C2E;
-			remoteInfo = "install-headers";
-		};
-		2687EACE1508116300DD8C2E /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 2687EAC51508110B00DD8C2E;
-			remoteInfo = "install-headers";
-		};
 		2689011413353E9B00698AC0 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
@@ -7181,20 +7157,6 @@
 			passBuildSettingsInEnvironment = 1;
 			productName = "LLDB Python Test Suite";
 		};
-		2687EAC51508110B00DD8C2E /* install-headers */ = {
-			isa = PBXLegacyTarget;
-			buildArgumentsString = "$(ACTION)";
-			buildConfigurationList = 2687EAC61508110B00DD8C2E /* Build configuration list for PBXLegacyTarget "install-headers" */;
-			buildPhases = (
-			);
-			buildToolPath = /usr/bin/make;
-			buildWorkingDirectory = "$(SRCROOT)/tools/install-headers";
-			dependencies = (
-			);
-			name = "install-headers";
-			passBuildSettingsInEnvironment = 1;
-			productName = "install-headers";
-		};
 /* End PBXLegacyTarget section */
 
 /* Begin PBXNativeTarget section */
@@ -7448,7 +7410,6 @@
 				26579F67126A25920007C5CB /* darwin-debug */,
 				2689FFC913353D7A00698AC0 /* lldb-core */,
 				26DC6A0F1337FE6900FF7998 /* lldb-server */,
-				2687EAC51508110B00DD8C2E /* install-headers */,
 				2690CD161A6DC0D000E717C8 /* lldb-mi */,
 				942829BF1A89835300521B30 /* lldb-argdumper */,
 				2679260B211CA3AC00EE1D10 /* lldb-vscode */,
@@ -8792,21 +8753,6 @@
 			target = 26680206115FD0ED008E1FE4 /* LLDB */;
 			targetProxy = 2679261F211CA40700EE1D10 /* PBXContainerItemProxy */;
 		};
-		2687EACB1508115000DD8C2E /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = 2687EAC51508110B00DD8C2E /* install-headers */;
-			targetProxy = 2687EACA1508115000DD8C2E /* PBXContainerItemProxy */;
-		};
-		2687EACD1508115900DD8C2E /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = 2687EAC51508110B00DD8C2E /* install-headers */;
-			targetProxy = 2687EACC1508115900DD8C2E /* PBXContainerItemProxy */;
-		};
-		2687EACF1508116300DD8C2E /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = 2687EAC51508110B00DD8C2E /* install-headers */;
-			targetProxy = 2687EACE1508116300DD8C2E /* PBXContainerItemProxy */;
-		};
 		2689011513353E9B00698AC0 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			target = 2689FFC913353D7A00698AC0 /* lldb-core */;
@@ -9833,62 +9779,6 @@
 			};
 			name = BuildAndIntegration;
 		};
-		2687EAC71508110B00DD8C2E /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 360.99.0;
-				DEBUGGING_SYMBOLS = YES;
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
-				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					"DEBUG=1",
-					"$(inherited)",
-				);
-				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				OTHER_CFLAGS = "";
-				OTHER_LDFLAGS = "";
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				SDKROOT = macosx;
-			};
-			name = Debug;
-		};
-		2687EAC81508110B00DD8C2E /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				COMBINE_HIDPI_IMAGES = YES;
-				COPY_PHASE_STRIP = YES;
-				CURRENT_PROJECT_VERSION = 360.99.0;
-				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				OTHER_CFLAGS = "";
-				OTHER_LDFLAGS = "";
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				SDKROOT = macosx;
-			};
-			name = Release;
-		};
-		2687EAC91508110B00DD8C2E /* BuildAndIntegration */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				COMBINE_HIDPI_IMAGES = YES;
-				COPY_PHASE_STRIP = YES;
-				CURRENT_PROJECT_VERSION = 360.99.0;
-				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				OTHER_CFLAGS = "";
-				OTHER_LDFLAGS = "";
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				SDKROOT = macosx;
-			};
-			name = BuildAndIntegration;
-		};
 		2689FFD513353D7A00698AC0 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
@@ -11118,30 +11008,6 @@
 			};
 			name = DebugClang;
 		};
-		49BB8F3F1611172B00BDD462 /* DebugClang */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 360.99.0;
-				DEBUGGING_SYMBOLS = YES;
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
-				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					"DEBUG=1",
-					"$(inherited)",
-				);
-				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				OTHER_CFLAGS = "";
-				OTHER_LDFLAGS = "";
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				SDKROOT = macosx;
-			};
-			name = DebugClang;
-		};
 		942829C51A89835400521B30 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
@@ -11539,17 +11405,6 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = BuildAndIntegration;
 		};
-		2687EAC61508110B00DD8C2E /* Build configuration list for PBXLegacyTarget "install-headers" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				2687EAC71508110B00DD8C2E /* Debug */,
-				49BB8F3F1611172B00BDD462 /* DebugClang */,
-				2687EAC81508110B00DD8C2E /* Release */,
-				2687EAC91508110B00DD8C2E /* BuildAndIntegration */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = BuildAndIntegration;
-		};
 		2689FFD813353D7A00698AC0 /* Build configuration list for PBXNativeTarget "lldb-core" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
diff --git a/lldb/tools/install-headers/Makefile b/lldb/tools/install-headers/Makefile
deleted file mode 100644
index 384a54e6d6f6..000000000000
--- a/lldb/tools/install-headers/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-installsrc:
-	echo "installsrc (doing nothing)"
-
-install:
-	echo "install (doing nothing)"
-
-clean:
-	echo "clean (doing nothing)"
-
-LLDB_VERSION=`echo ${CURRENT_PROJECT_VERSION} | /usr/bin/sed -E 's/^([0-9]+).([0-9]+).([0-9]+)(.[0-9]+)?$$/\1/g'`
-LLDB_REVISION=`echo ${CURRENT_PROJECT_VERSION} | /usr/bin/sed -E 's/^([0-9]+).([0-9]+).([0-9]+)(.[0-9]+)?$$/\3/g'`
-LLDB_VERSION_STRING=`echo ${CURRENT_PROJECT_VERSION}`
-
-installhdrs:
-	cd "${TARGET_BUILD_DIR}/${LLDB_FRAMEWORK_INSTALL_DIR}/LLDB.framework/Headers" ;\
-	for file in *.h ;\
-	do \
-		/usr/bin/sed -i '' 's/\(#include\)[ ]*"lldb\/\(API\/\)\{0,1\}\(.*\)"/\1 <LLDB\/\3>/1' "$$file" ;\
-		/usr/bin/sed -i '' 's|<LLDB/Utility|<LLDB|' "$$file" ;\
-		/usr/bin/sed -i '' "s|//#define LLDB_VERSION$$|#define LLDB_VERSION $(LLDB_VERSION) |" "$$file" ;\
-		/usr/bin/sed -i '' "s|//#define LLDB_REVISION|#define LLDB_REVISION $(LLDB_REVISION) |" "$$file" ;\
-		/usr/bin/sed -i '' "s|//#define LLDB_VERSION_STRING|#define LLDB_VERSION_STRING \"$(LLDB_VERSION_STRING)\" |" "$$file" ;\
-	done