6 files changed, 4 insertions, 7 deletions
diff --git a/lldb/source/Utility/CMakeLists.txt b/lldb/source/Utility/CMakeLists.txt
index 72c38b2135f..90aff225fe3 100644
--- a/lldb/source/Utility/CMakeLists.txt
+++ b/lldb/source/Utility/CMakeLists.txt
@@ -12,7 +12,6 @@ add_lldb_library(lldbUtility
   RegisterNumber.cpp
   SelectHelper.cpp
   SharingPtr.cpp
-  StdStringExtractor.cpp
   StringExtractor.cpp
   StringExtractorGDBRemote.cpp
   StringLexer.cpp
diff --git a/lldb/tools/debugserver/source/CMakeLists.txt b/lldb/tools/debugserver/source/CMakeLists.txt
index 9bd518e3772..43479bd3643 100644
--- a/lldb/tools/debugserver/source/CMakeLists.txt
+++ b/lldb/tools/debugserver/source/CMakeLists.txt
@@ -44,9 +44,9 @@ add_library(lldbDebugserverCommon
   DNBRegisterInfo.cpp
   DNBThreadResumeActions.cpp
   JSON.cpp
+  StdStringExtractor.cpp
   # JSON reader depends on the following LLDB-common files
   ${LLDB_SOURCE_DIR}/source/Host/common/StringConvert.cpp
-  ${LLDB_SOURCE_DIR}/source/Utility/StdStringExtractor.cpp
   # end JSON reader dependencies
   libdebugserver.cpp
   PseudoTerminal.cpp
diff --git a/lldb/tools/debugserver/source/JSON.h b/lldb/tools/debugserver/source/JSON.h
index d3951776cac..eee62f45332 100644
--- a/lldb/tools/debugserver/source/JSON.h
+++ b/lldb/tools/debugserver/source/JSON.h
@@ -10,9 +10,7 @@
 #ifndef utility_JSON_h_
 #define utility_JSON_h_
 
-// This cross-project usage is fine as StdStringExtractor.h is entirely
-// self-contained.
-#include "lldb/Utility/StdStringExtractor.h"
+#include "StdStringExtractor.h"
 
 // C includes
 #include <inttypes.h>
diff --git a/lldb/tools/debugserver/source/RNBRemote.cpp b/lldb/tools/debugserver/source/RNBRemote.cpp
index 6ee84eed27d..71c6f717cad 100644
--- a/lldb/tools/debugserver/source/RNBRemote.cpp
+++ b/lldb/tools/debugserver/source/RNBRemote.cpp
@@ -40,7 +40,7 @@
 #include "RNBContext.h"
 #include "RNBServices.h"
 #include "RNBSocket.h"
-#include "lldb/Utility/StdStringExtractor.h"
+#include "StdStringExtractor.h"
 
 #if defined(HAVE_LIBCOMPRESSION)
 #include <compression.h>
diff --git a/lldb/source/Utility/StdStringExtractor.cpp b/lldb/tools/debugserver/source/StdStringExtractor.cpp
index c439edde22b..d23f9319fa7 100644
--- a/lldb/source/Utility/StdStringExtractor.cpp
+++ b/lldb/tools/debugserver/source/StdStringExtractor.cpp
@@ -7,7 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "lldb/Utility/StdStringExtractor.h"
+#include "StdStringExtractor.h"
 
 // C Includes
 #include <stdlib.h>
diff --git a/lldb/include/lldb/Utility/StdStringExtractor.h b/lldb/tools/debugserver/source/StdStringExtractor.h
index c46978b61f4..c46978b61f4 100644
--- a/lldb/include/lldb/Utility/StdStringExtractor.h
+++ b/lldb/tools/debugserver/source/StdStringExtractor.h