Rename config_instance_derived to cuttlefish_config_paths

Databean · Databean · commit e14572795d2b · 2026-04-20T23:26:06.000Z
Bug: b/474188702
Assisted-by: Gemini:Next
diff --git a/base/cvd/cuttlefish/common/frontend/socket_vsock_proxy/BUILD.bazel b/base/cvd/cuttlefish/common/frontend/socket_vsock_proxy/BUILD.bazel
@@ -20,8 +20,8 @@ cf_cc_binary(
         "//cuttlefish/common/libs/utils:tee_logging",
         "//cuttlefish/host/commands/kernel_log_monitor:kernel_log_monitor_utils",
         "//cuttlefish/host/libs/command_util",
-        "//cuttlefish/host/libs/config:config_instance_derived",
         "//cuttlefish/host/libs/config:cuttlefish_config",
+        "//cuttlefish/host/libs/config:cuttlefish_config_paths",
         "//cuttlefish/host/libs/config:logging",
         "//cuttlefish/result",
         "//libbase",
diff --git a/base/cvd/cuttlefish/common/frontend/socket_vsock_proxy/socket_vsock_proxy.cpp b/base/cvd/cuttlefish/common/frontend/socket_vsock_proxy/socket_vsock_proxy.cpp
@@ -28,8 +28,8 @@
 #include "cuttlefish/common/libs/fs/shared_fd.h"
 #include "cuttlefish/common/libs/utils/socket2socket_proxy.h"
 #include "cuttlefish/host/commands/kernel_log_monitor/utils.h"
-#include "cuttlefish/host/libs/config/config_instance_derived.h"
 #include "cuttlefish/host/libs/config/cuttlefish_config.h"
+#include "cuttlefish/host/libs/config/cuttlefish_config_paths.h"
 #include "cuttlefish/host/libs/config/logging.h"
 #include "cuttlefish/result/result.h"
 
diff --git a/base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel b/base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel
@@ -211,8 +211,8 @@ cf_cc_library(
         "//cuttlefish/host/commands/assemble_cvd/flags:system_image_dir",
         "//cuttlefish/host/libs/config:ap_boot_flow",
         "//cuttlefish/host/libs/config:build_archive",
-        "//cuttlefish/host/libs/config:config_instance_derived",
         "//cuttlefish/host/libs/config:cuttlefish_config",
+        "//cuttlefish/host/libs/config:cuttlefish_config_paths",
         "//cuttlefish/host/libs/config:data_image",
         "//cuttlefish/host/libs/config:fetcher_config",
         "//cuttlefish/host/libs/config:fetcher_configs",
diff --git a/base/cvd/cuttlefish/host/commands/assemble_cvd/create_dynamic_disk_files.cc b/base/cvd/cuttlefish/host/commands/assemble_cvd/create_dynamic_disk_files.cc
@@ -53,8 +53,8 @@
 #include "cuttlefish/host/commands/assemble_cvd/super_image_mixer.h"
 #include "cuttlefish/host/libs/config/ap_boot_flow.h"
 #include "cuttlefish/host/libs/config/build_archive.h"
-#include "cuttlefish/host/libs/config/config_instance_derived.h"
 #include "cuttlefish/host/libs/config/cuttlefish_config.h"
+#include "cuttlefish/host/libs/config/cuttlefish_config_paths.h"
 #include "cuttlefish/host/libs/config/data_image.h"
 #include "cuttlefish/host/libs/config/fetcher_config.h"
 #include "cuttlefish/host/libs/config/fetcher_configs.h"
diff --git a/base/cvd/cuttlefish/host/commands/assemble_cvd/disk/BUILD.bazel b/base/cvd/cuttlefish/host/commands/assemble_cvd/disk/BUILD.bazel
@@ -10,8 +10,8 @@ cf_cc_library(
     hdrs = ["access_kregistry.h"],
     deps = [
         "//cuttlefish/common/libs/utils:files",
-        "//cuttlefish/host/libs/config:config_instance_derived",
         "//cuttlefish/host/libs/config:cuttlefish_config",
+        "//cuttlefish/host/libs/config:cuttlefish_config_paths",
         "//cuttlefish/host/libs/config:data_image",
         "//cuttlefish/result",
     ],
@@ -188,8 +188,8 @@ cf_cc_library(
     hdrs = ["hwcomposer_pmem.h"],
     deps = [
         "//cuttlefish/common/libs/utils:files",
-        "//cuttlefish/host/libs/config:config_instance_derived",
         "//cuttlefish/host/libs/config:cuttlefish_config",
+        "//cuttlefish/host/libs/config:cuttlefish_config_paths",
         "//cuttlefish/host/libs/config:data_image",
         "//cuttlefish/result",
     ],
@@ -314,8 +314,8 @@ cf_cc_library(
     hdrs = ["pflash.h"],
     deps = [
         "//cuttlefish/common/libs/utils:files",
-        "//cuttlefish/host/libs/config:config_instance_derived",
         "//cuttlefish/host/libs/config:cuttlefish_config",
+        "//cuttlefish/host/libs/config:cuttlefish_config_paths",
         "//cuttlefish/host/libs/config:data_image",
         "//cuttlefish/result",
     ],
@@ -327,8 +327,8 @@ cf_cc_library(
     hdrs = ["pstore.h"],
     deps = [
         "//cuttlefish/common/libs/utils:files",
-        "//cuttlefish/host/libs/config:config_instance_derived",
         "//cuttlefish/host/libs/config:cuttlefish_config",
+        "//cuttlefish/host/libs/config:cuttlefish_config_paths",
         "//cuttlefish/host/libs/config:data_image",
         "//cuttlefish/result",
     ],
diff --git a/base/cvd/cuttlefish/host/commands/assemble_cvd/disk/access_kregistry.cc b/base/cvd/cuttlefish/host/commands/assemble_cvd/disk/access_kregistry.cc
@@ -17,8 +17,8 @@
 #include "cuttlefish/host/commands/assemble_cvd/disk/access_kregistry.h"
 
 #include "cuttlefish/common/libs/utils/files.h"
-#include "cuttlefish/host/libs/config/config_instance_derived.h"
 #include "cuttlefish/host/libs/config/cuttlefish_config.h"
+#include "cuttlefish/host/libs/config/cuttlefish_config_paths.h"
 #include "cuttlefish/host/libs/config/data_image.h"
 #include "cuttlefish/result/result.h"
 
diff --git a/base/cvd/cuttlefish/host/commands/assemble_cvd/disk/hwcomposer_pmem.cc b/base/cvd/cuttlefish/host/commands/assemble_cvd/disk/hwcomposer_pmem.cc
@@ -17,8 +17,8 @@
 #include "cuttlefish/host/commands/assemble_cvd/disk/hwcomposer_pmem.h"
 
 #include "cuttlefish/common/libs/utils/files.h"
-#include "cuttlefish/host/libs/config/config_instance_derived.h"
 #include "cuttlefish/host/libs/config/cuttlefish_config.h"
+#include "cuttlefish/host/libs/config/cuttlefish_config_paths.h"
 #include "cuttlefish/host/libs/config/data_image.h"
 #include "cuttlefish/result/result.h"
 
diff --git a/base/cvd/cuttlefish/host/commands/assemble_cvd/disk/pflash.cc b/base/cvd/cuttlefish/host/commands/assemble_cvd/disk/pflash.cc
@@ -17,8 +17,8 @@
 #include "cuttlefish/host/commands/assemble_cvd/disk/pflash.h"
 
 #include "cuttlefish/common/libs/utils/files.h"
-#include "cuttlefish/host/libs/config/config_instance_derived.h"
 #include "cuttlefish/host/libs/config/cuttlefish_config.h"
+#include "cuttlefish/host/libs/config/cuttlefish_config_paths.h"
 #include "cuttlefish/host/libs/config/data_image.h"
 #include "cuttlefish/result/result.h"
 
diff --git a/base/cvd/cuttlefish/host/commands/assemble_cvd/disk/pstore.cc b/base/cvd/cuttlefish/host/commands/assemble_cvd/disk/pstore.cc
@@ -17,8 +17,8 @@
 #include "cuttlefish/host/commands/assemble_cvd/disk/pstore.h"
 
 #include "cuttlefish/common/libs/utils/files.h"
-#include "cuttlefish/host/libs/config/config_instance_derived.h"
 #include "cuttlefish/host/libs/config/cuttlefish_config.h"
+#include "cuttlefish/host/libs/config/cuttlefish_config_paths.h"
 #include "cuttlefish/host/libs/config/data_image.h"
 #include "cuttlefish/result/result.h"
 
diff --git a/base/cvd/cuttlefish/host/commands/console_forwarder/BUILD.bazel b/base/cvd/cuttlefish/host/commands/console_forwarder/BUILD.bazel
@@ -12,8 +12,8 @@ cf_cc_binary(
     deps = [
         "//cuttlefish/common/libs/fs",
         "//cuttlefish/host/commands/kernel_log_monitor:kernel_log_monitor_utils",
-        "//cuttlefish/host/libs/config:config_instance_derived",
         "//cuttlefish/host/libs/config:cuttlefish_config",
+        "//cuttlefish/host/libs/config:cuttlefish_config_paths",
         "//cuttlefish/host/libs/config:logging",
         "//cuttlefish/posix:strerror",
         "//libbase",
diff --git a/base/cvd/cuttlefish/host/commands/console_forwarder/main.cpp b/base/cvd/cuttlefish/host/commands/console_forwarder/main.cpp
@@ -31,8 +31,8 @@
 
 #include "cuttlefish/common/libs/fs/shared_fd.h"
 #include "cuttlefish/common/libs/fs/shared_select.h"
-#include "cuttlefish/host/libs/config/config_instance_derived.h"
 #include "cuttlefish/host/libs/config/cuttlefish_config.h"
+#include "cuttlefish/host/libs/config/cuttlefish_config_paths.h"
 #include "cuttlefish/host/libs/config/logging.h"
 #include "cuttlefish/posix/strerror.h"
 
diff --git a/base/cvd/cuttlefish/host/commands/kernel_log_monitor/BUILD.bazel b/base/cvd/cuttlefish/host/commands/kernel_log_monitor/BUILD.bazel
@@ -14,8 +14,8 @@ cf_cc_binary(
     deps = [
         ":kernel_log_monitor_utils",
         "//cuttlefish/common/libs/fs",
-        "//cuttlefish/host/libs/config:config_instance_derived",
         "//cuttlefish/host/libs/config:cuttlefish_config",
+        "//cuttlefish/host/libs/config:cuttlefish_config_paths",
         "//cuttlefish/host/libs/config:logging",
         "//cuttlefish/result",
         "//libbase",
diff --git a/base/cvd/cuttlefish/host/commands/kernel_log_monitor/main.cc b/base/cvd/cuttlefish/host/commands/kernel_log_monitor/main.cc
@@ -33,8 +33,8 @@
 #include "cuttlefish/common/libs/fs/shared_select.h"
 #include "cuttlefish/host/commands/kernel_log_monitor/kernel_log_server.h"
 #include "cuttlefish/host/commands/kernel_log_monitor/utils.h"
-#include "cuttlefish/host/libs/config/config_instance_derived.h"
 #include "cuttlefish/host/libs/config/cuttlefish_config.h"
+#include "cuttlefish/host/libs/config/cuttlefish_config_paths.h"
 #include "cuttlefish/host/libs/config/logging.h"
 
 DEFINE_int32(log_pipe_fd, -1,
diff --git a/base/cvd/cuttlefish/host/commands/logcat_receiver/BUILD.bazel b/base/cvd/cuttlefish/host/commands/logcat_receiver/BUILD.bazel
@@ -11,8 +11,8 @@ cf_cc_binary(
     ],
     deps = [
         "//cuttlefish/common/libs/fs",
-        "//cuttlefish/host/libs/config:config_instance_derived",
         "//cuttlefish/host/libs/config:cuttlefish_config",
+        "//cuttlefish/host/libs/config:cuttlefish_config_paths",
         "//cuttlefish/host/libs/config:logging",
         "//libbase",
         "@abseil-cpp//absl/log",
diff --git a/base/cvd/cuttlefish/host/commands/logcat_receiver/main.cpp b/base/cvd/cuttlefish/host/commands/logcat_receiver/main.cpp
@@ -22,8 +22,8 @@
 
 #include "cuttlefish/common/libs/fs/shared_buf.h"
 #include "cuttlefish/common/libs/fs/shared_fd.h"
-#include "cuttlefish/host/libs/config/config_instance_derived.h"
 #include "cuttlefish/host/libs/config/cuttlefish_config.h"
+#include "cuttlefish/host/libs/config/cuttlefish_config_paths.h"
 #include "cuttlefish/host/libs/config/logging.h"
 
 DEFINE_int32(log_pipe_fd, -1,
diff --git a/base/cvd/cuttlefish/host/commands/run_cvd/BUILD.bazel b/base/cvd/cuttlefish/host/commands/run_cvd/BUILD.bazel
@@ -22,9 +22,9 @@ cf_cc_library(
         "//cuttlefish/host/commands/run_cvd:validate",
         "//cuttlefish/host/libs/command_util",
         "//cuttlefish/host/libs/config:config_constants",
-        "//cuttlefish/host/libs/config:config_instance_derived",
         "//cuttlefish/host/libs/config:config_utils",
         "//cuttlefish/host/libs/config:cuttlefish_config",
+        "//cuttlefish/host/libs/config:cuttlefish_config_paths",
         "//cuttlefish/host/libs/feature",
         "//cuttlefish/host/libs/vm_manager",
         "//cuttlefish/posix:strerror",
@@ -137,9 +137,9 @@ cf_cc_library(
         "//cuttlefish/host/libs/command_util:libcuttlefish_run_cvd_proto",
         "//cuttlefish/host/libs/config:ap_boot_flow",
         "//cuttlefish/host/libs/config:config_constants",
-        "//cuttlefish/host/libs/config:config_instance_derived",
         "//cuttlefish/host/libs/config:config_utils",
         "//cuttlefish/host/libs/config:cuttlefish_config",
+        "//cuttlefish/host/libs/config:cuttlefish_config_paths",
         "//cuttlefish/host/libs/config:data_image",
         "//cuttlefish/host/libs/config:vmm_mode",
         "//cuttlefish/host/libs/feature",
diff --git a/base/cvd/cuttlefish/host/commands/run_cvd/boot_state_machine.cc b/base/cvd/cuttlefish/host/commands/run_cvd/boot_state_machine.cc
@@ -57,9 +57,9 @@
 #include "cuttlefish/host/libs/command_util/runner/defs.h"
 #include "cuttlefish/host/libs/command_util/util.h"
 #include "cuttlefish/host/libs/config/config_constants.h"
-#include "cuttlefish/host/libs/config/config_instance_derived.h"
 #include "cuttlefish/host/libs/config/config_utils.h"
 #include "cuttlefish/host/libs/config/cuttlefish_config.h"
+#include "cuttlefish/host/libs/config/cuttlefish_config_paths.h"
 #include "cuttlefish/host/libs/feature/feature.h"
 #include "cuttlefish/host/libs/feature/kernel_log_pipe_provider.h"
 #include "cuttlefish/host/libs/vm_manager/vm_manager.h"
diff --git a/base/cvd/cuttlefish/host/commands/run_cvd/launch/BUILD.bazel b/base/cvd/cuttlefish/host/commands/run_cvd/launch/BUILD.bazel
@@ -87,8 +87,8 @@ cf_cc_library(
     deps = [
         "//cuttlefish/common/libs/fs",
         "//cuttlefish/common/libs/utils:subprocess",
-        "//cuttlefish/host/libs/config:config_instance_derived",
         "//cuttlefish/host/libs/config:cuttlefish_config",
+        "//cuttlefish/host/libs/config:cuttlefish_config_paths",
         "//cuttlefish/host/libs/config:known_paths",
         "//cuttlefish/host/libs/feature",
         "//cuttlefish/result",
@@ -175,8 +175,8 @@ cf_cc_library(
     deps = [
         "//cuttlefish/common/libs/utils:subprocess",
         "//cuttlefish/host/commands/run_cvd:reporting",
-        "//cuttlefish/host/libs/config:config_instance_derived",
         "//cuttlefish/host/libs/config:cuttlefish_config",
+        "//cuttlefish/host/libs/config:cuttlefish_config_paths",
         "//cuttlefish/host/libs/config:known_paths",
         "//cuttlefish/host/libs/config:logging",
         "//cuttlefish/host/libs/feature",
@@ -210,8 +210,8 @@ cf_cc_library(
     deps = [
         "//cuttlefish/common/libs/fs",
         "//cuttlefish/common/libs/utils:subprocess",
-        "//cuttlefish/host/libs/config:config_instance_derived",
         "//cuttlefish/host/libs/config:cuttlefish_config",
+        "//cuttlefish/host/libs/config:cuttlefish_config_paths",
         "//cuttlefish/host/libs/config:known_paths",
         "//cuttlefish/host/libs/feature",
         "//cuttlefish/result",
@@ -560,8 +560,8 @@ cf_cc_library(
         "//cuttlefish/common/libs/utils:subprocess",
         "//cuttlefish/host/commands/run_cvd/launch:enable_multitouch",
         "//cuttlefish/host/commands/run_cvd/launch:log_tee_creator",
-        "//cuttlefish/host/libs/config:config_instance_derived",
         "//cuttlefish/host/libs/config:cuttlefish_config",
+        "//cuttlefish/host/libs/config:cuttlefish_config_paths",
         "//cuttlefish/host/libs/config:guest_os",
         "//cuttlefish/host/libs/config:known_paths",
         "//cuttlefish/host/libs/feature",
diff --git a/base/cvd/cuttlefish/host/commands/run_cvd/launch/console_forwarder.cpp b/base/cvd/cuttlefish/host/commands/run_cvd/launch/console_forwarder.cpp
@@ -20,8 +20,8 @@
 
 #include "cuttlefish/common/libs/fs/shared_fd.h"
 #include "cuttlefish/common/libs/utils/subprocess.h"
-#include "cuttlefish/host/libs/config/config_instance_derived.h"
 #include "cuttlefish/host/libs/config/cuttlefish_config.h"
+#include "cuttlefish/host/libs/config/cuttlefish_config_paths.h"
 #include "cuttlefish/host/libs/config/known_paths.h"
 #include "cuttlefish/host/libs/feature/command_source.h"
 #include "cuttlefish/result/result.h"
diff --git a/base/cvd/cuttlefish/host/commands/run_cvd/launch/kernel_log_monitor.cpp b/base/cvd/cuttlefish/host/commands/run_cvd/launch/kernel_log_monitor.cpp
@@ -32,8 +32,8 @@
 
 #include "cuttlefish/common/libs/utils/subprocess.h"
 #include "cuttlefish/host/commands/run_cvd/reporting.h"
-#include "cuttlefish/host/libs/config/config_instance_derived.h"
 #include "cuttlefish/host/libs/config/cuttlefish_config.h"
+#include "cuttlefish/host/libs/config/cuttlefish_config_paths.h"
 #include "cuttlefish/host/libs/config/known_paths.h"
 #include "cuttlefish/host/libs/feature/command_source.h"
 #include "cuttlefish/host/libs/feature/feature.h"
diff --git a/base/cvd/cuttlefish/host/commands/run_cvd/launch/logcat_receiver.cpp b/base/cvd/cuttlefish/host/commands/run_cvd/launch/logcat_receiver.cpp
@@ -19,8 +19,8 @@
 
 #include "cuttlefish/common/libs/fs/shared_fd.h"
 #include "cuttlefish/common/libs/utils/subprocess.h"
-#include "cuttlefish/host/libs/config/config_instance_derived.h"
 #include "cuttlefish/host/libs/config/cuttlefish_config.h"
+#include "cuttlefish/host/libs/config/cuttlefish_config_paths.h"
 #include "cuttlefish/host/libs/config/known_paths.h"
 #include "cuttlefish/host/libs/feature/command_source.h"
 #include "cuttlefish/result/result.h"
diff --git a/base/cvd/cuttlefish/host/commands/run_cvd/launch/vhost_input_devices.cpp b/base/cvd/cuttlefish/host/commands/run_cvd/launch/vhost_input_devices.cpp
@@ -36,8 +36,8 @@
 #include "cuttlefish/common/libs/utils/subprocess.h"
 #include "cuttlefish/host/commands/run_cvd/launch/enable_multitouch.h"
 #include "cuttlefish/host/commands/run_cvd/launch/log_tee_creator.h"
-#include "cuttlefish/host/libs/config/config_instance_derived.h"
 #include "cuttlefish/host/libs/config/cuttlefish_config.h"
+#include "cuttlefish/host/libs/config/cuttlefish_config_paths.h"
 #include "cuttlefish/host/libs/config/known_paths.h"
 #include "cuttlefish/host/libs/feature/command_source.h"
 #include "cuttlefish/host/libs/feature/feature.h"
diff --git a/base/cvd/cuttlefish/host/commands/run_cvd/server_loop_impl.cpp b/base/cvd/cuttlefish/host/commands/run_cvd/server_loop_impl.cpp
@@ -44,8 +44,8 @@
 #include "cuttlefish/host/libs/command_util/runner/run_cvd.pb.h"
 #include "cuttlefish/host/libs/command_util/util.h"
 #include "cuttlefish/host/libs/config/ap_boot_flow.h"
-#include "cuttlefish/host/libs/config/config_instance_derived.h"
 #include "cuttlefish/host/libs/config/cuttlefish_config.h"
+#include "cuttlefish/host/libs/config/cuttlefish_config_paths.h"
 #include "cuttlefish/host/libs/config/data_image.h"
 #include "cuttlefish/host/libs/config/vmm_mode.h"
 #include "cuttlefish/host/libs/feature/command_source.h"
diff --git a/base/cvd/cuttlefish/host/libs/command_util/BUILD.bazel b/base/cvd/cuttlefish/host/libs/command_util/BUILD.bazel
@@ -34,8 +34,8 @@ cf_cc_library(
         "//cuttlefish/common/libs/utils:environment",
         "//cuttlefish/common/libs/utils:files",
         "//cuttlefish/common/libs/utils:json",
-        "//cuttlefish/host/libs/config:config_instance_derived",
         "//cuttlefish/host/libs/config:cuttlefish_config",
+        "//cuttlefish/host/libs/config:cuttlefish_config_paths",
         "//cuttlefish/posix:strerror",
         "//cuttlefish/posix:symlink",
         "//cuttlefish/result",
diff --git a/base/cvd/cuttlefish/host/libs/command_util/util.cc b/base/cvd/cuttlefish/host/libs/command_util/util.cc
@@ -28,8 +28,8 @@
 #include "cuttlefish/common/libs/fs/shared_select.h"
 #include "cuttlefish/host/libs/command_util/runner/defs.h"
 #include "cuttlefish/host/libs/command_util/runner/run_cvd.pb.h"
-#include "cuttlefish/host/libs/config/config_instance_derived.h"
 #include "cuttlefish/host/libs/config/cuttlefish_config.h"
+#include "cuttlefish/host/libs/config/cuttlefish_config_paths.h"
 #include "cuttlefish/posix/strerror.h"
 #include "cuttlefish/result/result.h"
 
diff --git a/base/cvd/cuttlefish/host/libs/config/BUILD.bazel b/base/cvd/cuttlefish/host/libs/config/BUILD.bazel
@@ -52,9 +52,9 @@ cf_cc_library(
 )
 
 cf_cc_library(
-    name = "config_instance_derived",
-    srcs = ["config_instance_derived.cc"],
-    hdrs = ["config_instance_derived.h"],
+    name = "cuttlefish_config_paths",
+    srcs = ["cuttlefish_config_paths.cc"],
+    hdrs = ["cuttlefish_config_paths.h"],
     deps = [
         "//cuttlefish/common/libs/utils:files",
         "//cuttlefish/host/libs/config:cuttlefish_config",
diff --git a/base/cvd/cuttlefish/host/libs/config/cuttlefish_config_paths.cc b/base/cvd/cuttlefish/host/libs/config/cuttlefish_config_paths.cc
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "cuttlefish/host/libs/config/config_instance_derived.h"
+#include "cuttlefish/host/libs/config/cuttlefish_config_paths.h"
 
 #include <string>
 
@@ -96,4 +96,3 @@ std::string RestoreAdbdPipeName(const CuttlefishConfig::InstanceSpecific& ins) {
 }
 
 }  // namespace cuttlefish
-
diff --git a/base/cvd/cuttlefish/host/libs/config/cuttlefish_config_paths.h b/base/cvd/cuttlefish/host/libs/config/cuttlefish_config_paths.h
@@ -42,4 +42,3 @@ std::string SwitchesSocketPath(const CuttlefishConfig::InstanceSpecific&);
 std::string RestoreAdbdPipeName(const CuttlefishConfig::InstanceSpecific&);
 
 }  // namespace cuttlefish
-
diff --git a/base/cvd/cuttlefish/host/libs/vm_manager/BUILD.bazel b/base/cvd/cuttlefish/host/libs/vm_manager/BUILD.bazel
@@ -44,8 +44,8 @@ cf_cc_library(
         "//cuttlefish/common/libs/utils:wait_for_unix_socket",
         "//cuttlefish/host/libs/command_util",
         "//cuttlefish/host/libs/config:config_constants",
-        "//cuttlefish/host/libs/config:config_instance_derived",
         "//cuttlefish/host/libs/config:cuttlefish_config",
+        "//cuttlefish/host/libs/config:cuttlefish_config_paths",
         "//cuttlefish/host/libs/config:external_network_mode",
         "//cuttlefish/host/libs/config:gpu_mode",
         "//cuttlefish/host/libs/config:guest_hwui_renderer",
diff --git a/base/cvd/cuttlefish/host/libs/vm_manager/crosvm_manager.cpp b/base/cvd/cuttlefish/host/libs/vm_manager/crosvm_manager.cpp
@@ -42,8 +42,8 @@
 #include "cuttlefish/common/libs/utils/wait_for_unix_socket.h"
 #include "cuttlefish/host/libs/command_util/snapshot_utils.h"
 #include "cuttlefish/host/libs/config/config_constants.h"
-#include "cuttlefish/host/libs/config/config_instance_derived.h"
 #include "cuttlefish/host/libs/config/cuttlefish_config.h"
+#include "cuttlefish/host/libs/config/cuttlefish_config_paths.h"
 #include "cuttlefish/host/libs/config/gpu_mode.h"
 #include "cuttlefish/host/libs/config/guest_hwui_renderer.h"
 #include "cuttlefish/host/libs/config/guest_renderer_preload.h"
diff --git a/base/cvd/cuttlefish/host/libs/vm_manager/qemu_manager.cpp b/base/cvd/cuttlefish/host/libs/vm_manager/qemu_manager.cpp
@@ -40,8 +40,8 @@
 #include "cuttlefish/common/libs/utils/subprocess_managed_stdio.h"
 #include "cuttlefish/common/libs/utils/wait_for_unix_socket.h"
 #include "cuttlefish/host/libs/config/config_constants.h"
-#include "cuttlefish/host/libs/config/config_instance_derived.h"
 #include "cuttlefish/host/libs/config/cuttlefish_config.h"
+#include "cuttlefish/host/libs/config/cuttlefish_config_paths.h"
 #include "cuttlefish/host/libs/config/external_network_mode.h"
 #include "cuttlefish/host/libs/config/gpu_mode.h"
 #include "cuttlefish/host/libs/feature/command_source.h"
