diff --git a/CMakeLists.txt b/CMakeLists.txt
index f93c026e41a0a..ab194b6ec0335 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1471,6 +1471,10 @@ if(SWIFT_ENABLE_DISPATCH)
 endif()
 
 # Add all of the subdirectories, where we actually do work.
+add_subdirectory(include)
+if(SWIFT_INCLUDE_TOOLS)
+  add_subdirectory(lib)
+endif()
 
 ###############
 # PLEASE READ #
@@ -1523,11 +1527,7 @@ if(SWIFT_INCLUDE_APINOTES)
   add_subdirectory(apinotes)
 endif()
 
-add_subdirectory(include)
-
 if(SWIFT_INCLUDE_TOOLS)
-  add_subdirectory(lib)
-
   add_subdirectory(SwiftCompilerSources)
 
   # Always include this after including stdlib/!
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index d06c9bf36798a..b2364f026b9d7 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -76,3 +76,4 @@ add_subdirectory(StaticMirror)
 add_subdirectory(SymbolGraphGen)
 add_subdirectory(SwiftSyntax)
 add_subdirectory(Threading)
+add_subdirectory(Tooling)
diff --git a/lib/Tooling/CMakeLists.txt b/lib/Tooling/CMakeLists.txt
new file mode 100644
index 0000000000000..c37af112f298b
--- /dev/null
+++ b/lib/Tooling/CMakeLists.txt
@@ -0,0 +1 @@
+add_swift_tool_subdirectory(libSwiftScan)
diff --git a/tools/libSwiftScan/CMakeLists.txt b/lib/Tooling/libSwiftScan/CMakeLists.txt
similarity index 100%
rename from tools/libSwiftScan/CMakeLists.txt
rename to lib/Tooling/libSwiftScan/CMakeLists.txt
diff --git a/tools/libSwiftScan/SwiftCaching.cpp b/lib/Tooling/libSwiftScan/SwiftCaching.cpp
similarity index 100%
rename from tools/libSwiftScan/SwiftCaching.cpp
rename to lib/Tooling/libSwiftScan/SwiftCaching.cpp
diff --git a/tools/libSwiftScan/c-include-check.c b/lib/Tooling/libSwiftScan/c-include-check.c
similarity index 100%
rename from tools/libSwiftScan/c-include-check.c
rename to lib/Tooling/libSwiftScan/c-include-check.c
diff --git a/tools/libSwiftScan/libSwiftScan.cpp b/lib/Tooling/libSwiftScan/libSwiftScan.cpp
similarity index 100%
rename from tools/libSwiftScan/libSwiftScan.cpp
rename to lib/Tooling/libSwiftScan/libSwiftScan.cpp
diff --git a/tools/libSwiftScan/libSwiftScan.exports b/lib/Tooling/libSwiftScan/libSwiftScan.exports
similarity index 100%
rename from tools/libSwiftScan/libSwiftScan.exports
rename to lib/Tooling/libSwiftScan/libSwiftScan.exports
diff --git a/stdlib/public/core/CMakeLists.txt b/stdlib/public/core/CMakeLists.txt
index f4ee2598b14ee..6e517d6230532 100644
--- a/stdlib/public/core/CMakeLists.txt
+++ b/stdlib/public/core/CMakeLists.txt
@@ -405,7 +405,7 @@ endif()
 
 set(tooling_stdlib_deps)
 if(TARGET libSwiftScan)
-  list(append tooling_stdlib_deps libSwiftScan)
+  list(APPEND tooling_stdlib_deps libSwiftScan)
 endif()
 
 add_swift_target_library(swiftCore
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index 5897b52225131..3f8fee3e1314e 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -24,7 +24,6 @@ add_swift_tool_subdirectory(swift-def-to-strings-converter)
 add_swift_tool_subdirectory(swift-serialize-diagnostics)
 add_swift_tool_subdirectory(swift-ast-script)
 add_swift_tool_subdirectory(swift-refactor)
-add_swift_tool_subdirectory(libSwiftScan)
 add_swift_tool_subdirectory(libStaticMirror)
 add_swift_tool_subdirectory(libMockPlugin)
 add_swift_tool_subdirectory(swift-plugin-server)