diff --git a/lldb/source/Core/Debugger.cpp b/lldb/source/Core/Debugger.cpp
--- a/lldb/source/Core/Debugger.cpp
+++ b/lldb/source/Core/Debugger.cpp
@@ -204,12 +204,12 @@
 
 static constexpr PropertyDefinition g_properties[] = {
 #define LLDB_PROPERTIES_debugger
-#include "Properties.inc"
+#include "Core/Properties.inc"
 };
 
 enum {
 #define LLDB_PROPERTIES_debugger
-#include "PropertiesEnum.inc"
+#include "Core/PropertiesEnum.inc"
 };
 
 LoadPluginCallbackType Debugger::g_load_plugin_callback = nullptr;
diff --git a/lldb/source/Core/ModuleList.cpp b/lldb/source/Core/ModuleList.cpp
--- a/lldb/source/Core/ModuleList.cpp
+++ b/lldb/source/Core/ModuleList.cpp
@@ -67,12 +67,12 @@
 
 static constexpr PropertyDefinition g_properties[] = {
 #define LLDB_PROPERTIES_modulelist
-#include "Properties.inc"
+#include "Core/Properties.inc"
 };
 
 enum {
 #define LLDB_PROPERTIES_modulelist
-#include "PropertiesEnum.inc"
+#include "Core/PropertiesEnum.inc"
 };
 
 } // namespace
diff --git a/lldb/source/Interpreter/CommandInterpreter.cpp b/lldb/source/Interpreter/CommandInterpreter.cpp
--- a/lldb/source/Interpreter/CommandInterpreter.cpp
+++ b/lldb/source/Interpreter/CommandInterpreter.cpp
@@ -91,12 +91,12 @@
 
 static constexpr PropertyDefinition g_properties[] = {
 #define LLDB_PROPERTIES_commandinterpreter
-#include "Properties.inc"
+#include "Interpreter/Properties.inc"
 };
 
 enum {
 #define LLDB_PROPERTIES_commandinterpreter
-#include "PropertiesEnum.inc"
+#include "Interpreter/PropertiesEnum.inc"
 };
 
 ConstString &CommandInterpreter::GetStaticBroadcasterClass() {
diff --git a/lldb/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.cpp b/lldb/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.cpp
--- a/lldb/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.cpp
+++ b/lldb/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.cpp
@@ -74,12 +74,12 @@
 
 static constexpr PropertyDefinition g_properties[] = {
 #define LLDB_PROPERTIES_dynamicloaderdarwinkernel
-#include "Properties.inc"
+#include "Plugins/DynamicLoader/Darwin-Kernel/Properties.inc"
 };
 
 enum {
 #define LLDB_PROPERTIES_dynamicloaderdarwinkernel
-#include "PropertiesEnum.inc"
+#include "Plugins/DynamicLoader/Darwin-Kernel/PropertiesEnum.inc"
 };
 
 class DynamicLoaderDarwinKernelProperties : public Properties {
diff --git a/lldb/source/Plugins/JITLoader/GDB/JITLoaderGDB.cpp b/lldb/source/Plugins/JITLoader/GDB/JITLoaderGDB.cpp
--- a/lldb/source/Plugins/JITLoader/GDB/JITLoaderGDB.cpp
+++ b/lldb/source/Plugins/JITLoader/GDB/JITLoaderGDB.cpp
@@ -68,12 +68,12 @@
 
 static constexpr PropertyDefinition g_properties[] = {
 #define LLDB_PROPERTIES_jitloadergdb
-#include "Properties.inc"
+#include "Plugins/JITLoader/GDB/Properties.inc"
 };
 
 enum {
 #define LLDB_PROPERTIES_jitloadergdb
-#include "PropertiesEnum.inc"
+#include "Plugins/JITLoader/GDB/PropertiesEnum.inc"
   ePropertyEnableJITBreakpoint
 };
 
diff --git a/lldb/source/Plugins/Platform/MacOSX/PlatformDarwinKernel.cpp b/lldb/source/Plugins/Platform/MacOSX/PlatformDarwinKernel.cpp
--- a/lldb/source/Plugins/Platform/MacOSX/PlatformDarwinKernel.cpp
+++ b/lldb/source/Plugins/Platform/MacOSX/PlatformDarwinKernel.cpp
@@ -179,12 +179,12 @@
 
 static constexpr PropertyDefinition g_properties[] = {
 #define LLDB_PROPERTIES_platformdarwinkernel
-#include "Properties.inc"
+#include "Plugins/Platform/MacOSX/Properties.inc"
 };
 
 enum {
 #define LLDB_PROPERTIES_platformdarwinkernel
-#include "PropertiesEnum.inc"
+#include "Plugins/Platform/MacOSX/PropertiesEnum.inc"
 };
 
 class PlatformDarwinKernelProperties : public Properties {
diff --git a/lldb/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp b/lldb/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp
--- a/lldb/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp
+++ b/lldb/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp
@@ -54,12 +54,12 @@
 
 static constexpr PropertyDefinition g_properties[] = {
 #define LLDB_PROPERTIES_processkdp
-#include "Properties.inc"
+#include "Plugins/Process/MacOSX-Kernel/Properties.inc"
 };
 
 enum {
 #define LLDB_PROPERTIES_processkdp
-#include "PropertiesEnum.inc"
+#include "Plugins/Process/MacOSX-Kernel/PropertiesEnum.inc"
 };
 
 class PluginProperties : public Properties {
diff --git a/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp b/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp
--- a/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp
+++ b/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp
@@ -112,12 +112,12 @@
 
 static constexpr PropertyDefinition g_properties[] = {
 #define LLDB_PROPERTIES_processgdbremote
-#include "Properties.inc"
+#include "Plugins/Process/gdb-remote/Properties.inc"
 };
 
 enum {
 #define LLDB_PROPERTIES_processgdbremote
-#include "PropertiesEnum.inc"
+#include "Plugins/Process/gdb-remote/PropertiesEnum.inc"
 };
 
 class PluginProperties : public Properties {
diff --git a/lldb/source/Plugins/StructuredData/DarwinLog/StructuredDataDarwinLog.cpp b/lldb/source/Plugins/StructuredData/DarwinLog/StructuredDataDarwinLog.cpp
--- a/lldb/source/Plugins/StructuredData/DarwinLog/StructuredDataDarwinLog.cpp
+++ b/lldb/source/Plugins/StructuredData/DarwinLog/StructuredDataDarwinLog.cpp
@@ -106,12 +106,12 @@
 
 static constexpr PropertyDefinition g_properties[] = {
 #define LLDB_PROPERTIES_darwinlog
-#include "Properties.inc"
+#include "Plugins/StructuredData/DarwinLog/Properties.inc"
 };
 
 enum {
 #define LLDB_PROPERTIES_darwinlog
-#include "PropertiesEnum.inc"
+#include "Plugins/StructuredData/DarwinLog/PropertiesEnum.inc"
 };
 
 class StructuredDataDarwinLogProperties : public Properties {
diff --git a/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp b/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp
--- a/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp
+++ b/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp
@@ -115,12 +115,12 @@
 
 static constexpr PropertyDefinition g_properties[] = {
 #define LLDB_PROPERTIES_symbolfiledwarf
-#include "Properties.inc"
+#include "Plugins/SymbolFile/DWARF/Properties.inc"
 };
 
 enum {
 #define LLDB_PROPERTIES_symbolfiledwarf
-#include "PropertiesEnum.inc"
+#include "Plugins/SymbolFile/DWARF/PropertiesEnum.inc"
 };
 
 class PluginProperties : public Properties {
diff --git a/lldb/source/Target/Platform.cpp b/lldb/source/Target/Platform.cpp
--- a/lldb/source/Target/Platform.cpp
+++ b/lldb/source/Target/Platform.cpp
@@ -65,12 +65,12 @@
 
 static constexpr PropertyDefinition g_properties[] = {
 #define LLDB_PROPERTIES_platform
-#include "Properties.inc"
+#include "Target/Properties.inc"
 };
 
 enum {
 #define LLDB_PROPERTIES_platform
-#include "PropertiesEnum.inc"
+#include "Target/PropertiesEnum.inc"
 };
 
 } // namespace
diff --git a/lldb/source/Target/Process.cpp b/lldb/source/Target/Process.cpp
--- a/lldb/source/Target/Process.cpp
+++ b/lldb/source/Target/Process.cpp
@@ -114,12 +114,12 @@
 
 static constexpr PropertyDefinition g_properties[] = {
 #define LLDB_PROPERTIES_process
-#include "Properties.inc"
+#include "Target/Properties.inc"
 };
 
 enum {
 #define LLDB_PROPERTIES_process
-#include "PropertiesEnum.inc"
+#include "Target/PropertiesEnum.inc"
 };
 
 ProcessProperties::ProcessProperties(lldb_private::Process *process)
diff --git a/lldb/source/Target/Target.cpp b/lldb/source/Target/Target.cpp
--- a/lldb/source/Target/Target.cpp
+++ b/lldb/source/Target/Target.cpp
@@ -3275,12 +3275,12 @@
 
 static constexpr PropertyDefinition g_properties[] = {
 #define LLDB_PROPERTIES_target
-#include "Properties.inc"
+#include "Target/Properties.inc"
 };
 
 enum {
 #define LLDB_PROPERTIES_target
-#include "PropertiesEnum.inc"
+#include "Target/PropertiesEnum.inc"
   ePropertyExperimental,
 };
 
@@ -3358,12 +3358,12 @@
 // TargetProperties
 static constexpr PropertyDefinition g_experimental_properties[]{
 #define LLDB_PROPERTIES_experimental
-#include "Properties.inc"
+#include "Target/Properties.inc"
 };
 
 enum {
 #define LLDB_PROPERTIES_experimental
-#include "PropertiesEnum.inc"
+#include "Target/PropertiesEnum.inc"
 };
 
 class TargetExperimentalOptionValueProperties : public OptionValueProperties {
diff --git a/lldb/source/Target/Thread.cpp b/lldb/source/Target/Thread.cpp
--- a/lldb/source/Target/Thread.cpp
+++ b/lldb/source/Target/Thread.cpp
@@ -65,12 +65,12 @@
 
 static constexpr PropertyDefinition g_properties[] = {
 #define LLDB_PROPERTIES_thread
-#include "Properties.inc"
+#include "Target/Properties.inc"
 };
 
 enum {
 #define LLDB_PROPERTIES_thread
-#include "PropertiesEnum.inc"
+#include "Target/PropertiesEnum.inc"
 };
 
 class ThreadOptionValueProperties : public OptionValueProperties {