diff --git a/include/swift/IDE/CompileInstance.h b/include/swift/IDETool/CompileInstance.h
similarity index 100%
rename from include/swift/IDE/CompileInstance.h
rename to include/swift/IDETool/CompileInstance.h
diff --git a/include/swift/IDE/CompletionInstance.h b/include/swift/IDETool/CompletionInstance.h
similarity index 100%
rename from include/swift/IDE/CompletionInstance.h
rename to include/swift/IDETool/CompletionInstance.h
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 3b508b4662d8d..e06d61d353991 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -32,6 +32,7 @@ add_subdirectory(Frontend)
 add_subdirectory(FrontendTool)
 add_subdirectory(Index)
 add_subdirectory(IDE)
+add_subdirectory(IDETool)
 add_subdirectory(Immediate)
 add_subdirectory(IRGen)
 add_subdirectory(LLVMPasses)
diff --git a/lib/Frontend/CMakeLists.txt b/lib/Frontend/CMakeLists.txt
index b883676afe17f..3015d431af8c0 100644
--- a/lib/Frontend/CMakeLists.txt
+++ b/lib/Frontend/CMakeLists.txt
@@ -18,6 +18,7 @@ add_dependencies(swiftFrontend
   SwiftOptions)
 target_link_libraries(swiftFrontend PRIVATE
   swiftAST
+  swiftConstExtract
   swiftSIL
   swiftMigrator
   swiftOption
diff --git a/lib/IDE/CMakeLists.txt b/lib/IDE/CMakeLists.txt
index a94780f803230..5e0e89944900d 100644
--- a/lib/IDE/CMakeLists.txt
+++ b/lib/IDE/CMakeLists.txt
@@ -15,12 +15,9 @@ add_swift_host_library(swiftIDE STATIC
   CodeCompletionString.cpp
   CodeCompletionStringPrinter.cpp
   CommentConversion.cpp
-  CompileInstance.cpp
-  CompletionInstance.cpp
   CompletionLookup.cpp
   CompletionOverrideLookup.cpp
   ConformingMethodList.cpp
-  DependencyChecking.cpp
   ExprCompletion.cpp
   ExprContextAnalysis.cpp
   Formatting.cpp
@@ -45,8 +42,6 @@ target_link_libraries(swiftIDE PRIVATE
   swiftAST
   swiftClangImporter
   swiftDriver
-  swiftFrontend
-  swiftFrontendTool
   swiftIndex
   swiftParse
   swiftSema)
diff --git a/lib/IDETool/CMakeLists.txt b/lib/IDETool/CMakeLists.txt
new file mode 100644
index 0000000000000..28ce561a7b26d
--- /dev/null
+++ b/lib/IDETool/CMakeLists.txt
@@ -0,0 +1,14 @@
+
+add_swift_host_library(swiftIDETool STATIC
+  CompileInstance.cpp
+  CompletionInstance.cpp
+  DependencyChecking.cpp
+  )
+
+target_link_libraries(swiftIDETool PRIVATE
+  swiftAST
+  swiftDriver
+  swiftFrontend
+  swiftFrontendTool)
+
+set_swift_llvm_is_available(swiftIDETool)
diff --git a/lib/IDE/CompileInstance.cpp b/lib/IDETool/CompileInstance.cpp
similarity index 99%
rename from lib/IDE/CompileInstance.cpp
rename to lib/IDETool/CompileInstance.cpp
index 8f8765ae07fd7..c34bea07916f7 100644
--- a/lib/IDE/CompileInstance.cpp
+++ b/lib/IDETool/CompileInstance.cpp
@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "swift/IDE/CompileInstance.h"
+#include "swift/IDETool/CompileInstance.h"
 
 #include "DependencyChecking.h"
 #include "swift/AST/ASTContext.h"
@@ -25,7 +25,6 @@
 #include "swift/Driver/FrontendUtil.h"
 #include "swift/Frontend/Frontend.h"
 #include "swift/FrontendTool/FrontendTool.h"
-#include "swift/IDE/Utils.h"
 #include "swift/Parse/Lexer.h"
 #include "swift/Parse/PersistentParserState.h"
 #include "swift/Subsystems.h"
diff --git a/lib/IDE/CompletionInstance.cpp b/lib/IDETool/CompletionInstance.cpp
similarity index 99%
rename from lib/IDE/CompletionInstance.cpp
rename to lib/IDETool/CompletionInstance.cpp
index 2ca16545de4cb..13591aeb05951 100644
--- a/lib/IDE/CompletionInstance.cpp
+++ b/lib/IDETool/CompletionInstance.cpp
@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "swift/IDE/CompletionInstance.h"
+#include "swift/IDETool/CompletionInstance.h"
 
 #include "DependencyChecking.h"
 #include "swift/AST/ASTContext.h"
diff --git a/lib/IDE/DependencyChecking.cpp b/lib/IDETool/DependencyChecking.cpp
similarity index 100%
rename from lib/IDE/DependencyChecking.cpp
rename to lib/IDETool/DependencyChecking.cpp
diff --git a/lib/IDE/DependencyChecking.h b/lib/IDETool/DependencyChecking.h
similarity index 100%
rename from lib/IDE/DependencyChecking.h
rename to lib/IDETool/DependencyChecking.h
diff --git a/tools/SourceKit/lib/SwiftLang/CMakeLists.txt b/tools/SourceKit/lib/SwiftLang/CMakeLists.txt
index c0292bf323faa..ce292e2134e77 100644
--- a/tools/SourceKit/lib/SwiftLang/CMakeLists.txt
+++ b/tools/SourceKit/lib/SwiftLang/CMakeLists.txt
@@ -31,6 +31,7 @@ target_link_libraries(SourceKitSwiftLang PRIVATE
   swiftFrontend
   swiftClangImporter
   swiftIDE
+  swiftIDETool
   swiftAST
   swiftMarkup
   swiftParse
diff --git a/tools/SourceKit/lib/SwiftLang/SwiftCompile.cpp b/tools/SourceKit/lib/SwiftLang/SwiftCompile.cpp
index 5de3dd5c932dc..0bf275568941c 100644
--- a/tools/SourceKit/lib/SwiftLang/SwiftCompile.cpp
+++ b/tools/SourceKit/lib/SwiftLang/SwiftCompile.cpp
@@ -15,7 +15,7 @@
 
 #include "SourceKit/Support/FileSystemProvider.h"
 
-#include "swift/IDE/CompileInstance.h"
+#include "swift/IDETool/CompileInstance.h"
 #include "llvm/Support/Compiler.h"
 #include "llvm/Support/MemoryBuffer.h"
 
diff --git a/tools/SourceKit/lib/SwiftLang/SwiftCompletion.cpp b/tools/SourceKit/lib/SwiftLang/SwiftCompletion.cpp
index 137368fb131a3..c44a8b3f8f098 100644
--- a/tools/SourceKit/lib/SwiftLang/SwiftCompletion.cpp
+++ b/tools/SourceKit/lib/SwiftLang/SwiftCompletion.cpp
@@ -23,7 +23,7 @@
 #include "swift/Frontend/PrintingDiagnosticConsumer.h"
 #include "swift/IDE/CodeCompletionCache.h"
 #include "swift/IDE/CodeCompletionResultPrinter.h"
-#include "swift/IDE/CompletionInstance.h"
+#include "swift/IDETool/CompletionInstance.h"
 
 #include "llvm/Support/Compiler.h"
 #include "llvm/Support/MemoryBuffer.h"
diff --git a/tools/SourceKit/lib/SwiftLang/SwiftConformingMethodList.cpp b/tools/SourceKit/lib/SwiftLang/SwiftConformingMethodList.cpp
index 7e01a9e5be773..cf959db328aef 100644
--- a/tools/SourceKit/lib/SwiftLang/SwiftConformingMethodList.cpp
+++ b/tools/SourceKit/lib/SwiftLang/SwiftConformingMethodList.cpp
@@ -16,7 +16,7 @@
 #include "swift/Frontend/Frontend.h"
 #include "swift/Frontend/PrintingDiagnosticConsumer.h"
 #include "swift/IDE/ConformingMethodList.h"
-#include "swift/IDE/CompletionInstance.h"
+#include "swift/IDETool/CompletionInstance.h"
 #include "clang/AST/ASTContext.h"
 #include "clang/AST/Comment.h"
 #include "clang/AST/Decl.h"
diff --git a/tools/SourceKit/lib/SwiftLang/SwiftLangSupport.cpp b/tools/SourceKit/lib/SwiftLang/SwiftLangSupport.cpp
index 621ed86827955..2b3b062a61e1d 100644
--- a/tools/SourceKit/lib/SwiftLang/SwiftLangSupport.cpp
+++ b/tools/SourceKit/lib/SwiftLang/SwiftLangSupport.cpp
@@ -26,9 +26,9 @@
 #include "swift/Config.h"
 #include "swift/Frontend/PrintingDiagnosticConsumer.h"
 #include "swift/IDE/CodeCompletionCache.h"
-#include "swift/IDE/CompletionInstance.h"
 #include "swift/IDE/SyntaxModel.h"
 #include "swift/IDE/Utils.h"
+#include "swift/IDETool/CompletionInstance.h"
 
 #include "clang/Lex/HeaderSearch.h"
 #include "clang/Lex/Preprocessor.h"
diff --git a/tools/SourceKit/lib/SwiftLang/SwiftLangSupport.h b/tools/SourceKit/lib/SwiftLang/SwiftLangSupport.h
index db0eaba53ba98..767b91c3a858f 100644
--- a/tools/SourceKit/lib/SwiftLang/SwiftLangSupport.h
+++ b/tools/SourceKit/lib/SwiftLang/SwiftLangSupport.h
@@ -24,10 +24,10 @@
 #include "swift/AST/DiagnosticConsumer.h"
 #include "swift/Basic/ThreadSafeRefCounted.h"
 #include "swift/IDE/CancellableResult.h"
-#include "swift/IDE/CompileInstance.h"
-#include "swift/IDE/CompletionInstance.h"
 #include "swift/IDE/Indenting.h"
 #include "swift/IDE/Refactoring.h"
+#include "swift/IDETool/CompileInstance.h"
+#include "swift/IDETool/CompletionInstance.h"
 #include "swift/Index/IndexSymbol.h"
 #include "llvm/ADT/IntrusiveRefCntPtr.h"
 #include "llvm/ADT/StringMap.h"
diff --git a/tools/SourceKit/lib/SwiftLang/SwiftTypeContextInfo.cpp b/tools/SourceKit/lib/SwiftLang/SwiftTypeContextInfo.cpp
index 676308ad543db..3bdc115cff665 100644
--- a/tools/SourceKit/lib/SwiftLang/SwiftTypeContextInfo.cpp
+++ b/tools/SourceKit/lib/SwiftLang/SwiftTypeContextInfo.cpp
@@ -15,8 +15,8 @@
 #include "SwiftEditorDiagConsumer.h"
 #include "swift/Frontend/Frontend.h"
 #include "swift/Frontend/PrintingDiagnosticConsumer.h"
-#include "swift/IDE/CompletionInstance.h"
 #include "swift/IDE/TypeContextInfo.h"
+#include "swift/IDETool/CompletionInstance.h"
 #include "clang/AST/ASTContext.h"
 #include "clang/AST/Comment.h"
 #include "clang/AST/Decl.h"
diff --git a/tools/swift-ide-test/CMakeLists.txt b/tools/swift-ide-test/CMakeLists.txt
index f2c772683b3d8..1c8dacdee059c 100644
--- a/tools/swift-ide-test/CMakeLists.txt
+++ b/tools/swift-ide-test/CMakeLists.txt
@@ -12,6 +12,7 @@ target_link_libraries(swift-ide-test
                         swiftDriver
                         swiftFrontend
                         swiftIDE
+                        swiftIDETool
                         swiftCompilerModules)
 
 # If libxml2 is available, make it available for swift-ide-test.
diff --git a/tools/swift-ide-test/swift-ide-test.cpp b/tools/swift-ide-test/swift-ide-test.cpp
index f724222223df6..55bf7074c4be5 100644
--- a/tools/swift-ide-test/swift-ide-test.cpp
+++ b/tools/swift-ide-test/swift-ide-test.cpp
@@ -38,7 +38,6 @@
 #include "swift/Frontend/PrintingDiagnosticConsumer.h"
 #include "swift/IDE/CodeCompletionResultPrinter.h"
 #include "swift/IDE/CommentConversion.h"
-#include "swift/IDE/CompletionInstance.h"
 #include "swift/IDE/ConformingMethodList.h"
 #include "swift/IDE/IDERequests.h"
 #include "swift/IDE/ModuleInterfacePrinting.h"
@@ -47,6 +46,7 @@
 #include "swift/IDE/SyntaxModel.h"
 #include "swift/IDE/TypeContextInfo.h"
 #include "swift/IDE/Utils.h"
+#include "swift/IDETool/CompletionInstance.h"
 #include "swift/Index/Index.h"
 #include "swift/Markup/Markup.h"
 #include "swift/Parse/ParseVersion.h"