diff --git a/lldb/tools/lldb-fuzzer/CMakeLists.txt b/lldb/tools/lldb-fuzzer/CMakeLists.txt
--- a/lldb/tools/lldb-fuzzer/CMakeLists.txt
+++ b/lldb/tools/lldb-fuzzer/CMakeLists.txt
@@ -1,18 +1,2 @@
+add_subdirectory(lldb-target-fuzzer)
 add_subdirectory(utils)
-
-set(LLVM_LINK_COMPONENTS
-  Support
-  )
-
-add_llvm_fuzzer(lldb-target-fuzzer
-  EXCLUDE_FROM_ALL
-  lldb-target-fuzzer.cpp
-  )
-
-if(TARGET lldb-target-fuzzer)
-  target_link_libraries(lldb-target-fuzzer
-    PRIVATE
-    liblldb
-    lldbFuzzerUtils
-    )
-endif()
diff --git a/lldb/tools/lldb-fuzzer/CMakeLists.txt b/lldb/tools/lldb-fuzzer/lldb-target-fuzzer/CMakeLists.txt
copy from lldb/tools/lldb-fuzzer/CMakeLists.txt
copy to lldb/tools/lldb-fuzzer/lldb-target-fuzzer/CMakeLists.txt
--- a/lldb/tools/lldb-fuzzer/CMakeLists.txt
+++ b/lldb/tools/lldb-fuzzer/lldb-target-fuzzer/CMakeLists.txt
@@ -1,5 +1,3 @@
-add_subdirectory(utils)
-
 set(LLVM_LINK_COMPONENTS
   Support
   )
@@ -10,6 +8,7 @@
   )
 
 if(TARGET lldb-target-fuzzer)
+  target_include_directories(lldb-target-fuzzer PRIVATE ..)
   target_link_libraries(lldb-target-fuzzer
     PRIVATE
     liblldb
diff --git a/lldb/tools/lldb-fuzzer/lldb-target-fuzzer.cpp b/lldb/tools/lldb-fuzzer/lldb-target-fuzzer/lldb-target-fuzzer.cpp
rename from lldb/tools/lldb-fuzzer/lldb-target-fuzzer.cpp
rename to lldb/tools/lldb-fuzzer/lldb-target-fuzzer/lldb-target-fuzzer.cpp
--- a/lldb/tools/lldb-fuzzer/lldb-target-fuzzer.cpp
+++ b/lldb/tools/lldb-fuzzer/lldb-target-fuzzer/lldb-target-fuzzer.cpp
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include <utils/TempFile.h>
+#include "utils/TempFile.h"
 
 #include "lldb/API/SBDebugger.h"
 #include "lldb/API/SBTarget.h"