diff --git a/base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel b/base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel
index 4518362766e..568705e2021 100644
--- a/base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel
+++ b/base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel
@@ -12,9 +12,7 @@ cf_cc_library(
     name = "alloc",
     srcs = ["alloc.cc"],
     hdrs = ["alloc.h"],
-    include_cleaner_enabled = False,
     deps = [
-        "//cuttlefish/common/libs/fs",
         "//cuttlefish/host/commands/cvdalloc:interface",
         "//cuttlefish/host/libs/config:cuttlefish_config",
         "//cuttlefish/result",
@@ -26,7 +24,6 @@ cf_cc_library(
 cf_cc_binary(
     name = "assemble_cvd",
     srcs = ["assemble_cvd.cc"],
-    include_cleaner_enabled = False,
     deps = [
         "//cuttlefish/common/libs/fs",
         "//cuttlefish/common/libs/utils:contains",
@@ -41,10 +38,12 @@ cf_cc_binary(
         "//cuttlefish/host/commands/assemble_cvd:assemble_cvd_flags",
         "//cuttlefish/host/commands/assemble_cvd:clean",
         "//cuttlefish/host/commands/assemble_cvd:create_dynamic_disk_files",
+        "//cuttlefish/host/commands/assemble_cvd:disk_builder",
         "//cuttlefish/host/commands/assemble_cvd:display",
         "//cuttlefish/host/commands/assemble_cvd:flag_feature",
         "//cuttlefish/host/commands/assemble_cvd:flags",
         "//cuttlefish/host/commands/assemble_cvd:flags_defaults",
+        "//cuttlefish/host/commands/assemble_cvd:guest_config",
         "//cuttlefish/host/commands/assemble_cvd:instance_image_files",
         "//cuttlefish/host/commands/assemble_cvd:media",
         "//cuttlefish/host/commands/assemble_cvd:required_directories",
@@ -54,6 +53,7 @@ cf_cc_binary(
         "//cuttlefish/host/commands/assemble_cvd/android_build:android_builds",
         "//cuttlefish/host/commands/assemble_cvd/android_build:identify_build",
         "//cuttlefish/host/commands/assemble_cvd/disk:ap_composite_disk",
+        "//cuttlefish/host/commands/assemble_cvd/disk:chromeos_state",
         "//cuttlefish/host/commands/assemble_cvd/disk:factory_reset_protected",
         "//cuttlefish/host/commands/assemble_cvd/disk:image_file",
         "//cuttlefish/host/commands/assemble_cvd/disk:metadata_image",
@@ -68,14 +68,18 @@ cf_cc_binary(
         "//cuttlefish/host/commands/assemble_cvd/flags:vm_manager",
         "//cuttlefish/host/libs/command_util",
         "//cuttlefish/host/libs/config:ap_boot_flow",
+        "//cuttlefish/host/libs/config:config_constants",
         "//cuttlefish/host/libs/config:config_flag",
+        "//cuttlefish/host/libs/config:config_utils",
         "//cuttlefish/host/libs/config:custom_actions",
         "//cuttlefish/host/libs/config:cuttlefish_config",
         "//cuttlefish/host/libs/config:fetcher_configs",
+        "//cuttlefish/host/libs/config:file_source",
         "//cuttlefish/host/libs/config:log_string_to_dir",
         "//cuttlefish/host/libs/config/adb",
         "//cuttlefish/host/libs/config/defaults",
         "//cuttlefish/host/libs/config/fastboot",
+        "//cuttlefish/host/libs/feature",
         "//cuttlefish/host/libs/feature:inject",
         "//cuttlefish/host/libs/log_names",
         "//cuttlefish/posix:symlink",
@@ -83,6 +87,8 @@ cf_cc_binary(
         "//cuttlefish/result",
         "@abseil-cpp//absl/log",
         "@abseil-cpp//absl/strings",
+        "@fmt",
+        "@fruit",
         "@gflags",
     ],
 )
@@ -91,7 +97,6 @@ cf_cc_library(
     name = "boot_config",
     srcs = ["boot_config.cc"],
     hdrs = ["boot_config.h"],
-    include_cleaner_enabled = False,
     deps = [
         "//cuttlefish/common/libs/utils:files",
         "//cuttlefish/common/libs/utils:size_utils",
@@ -114,7 +119,6 @@ cf_cc_library(
     name = "boot_image_utils",
     srcs = ["boot_image_utils.cc"],
     hdrs = ["boot_image_utils.h"],
-    include_cleaner_enabled = False,
     deps = [
         "//cuttlefish/common/libs/fs",
         "//cuttlefish/common/libs/utils:files",
@@ -151,16 +155,20 @@ cf_cc_library(
     name = "bootconfig_args",
     srcs = ["bootconfig_args.cpp"],
     hdrs = ["bootconfig_args.h"],
-    include_cleaner_enabled = False,
     deps = [
-        "//cuttlefish/common/libs/utils:contains",
+        "//cuttlefish/common/libs/utils:device_type",
+        "//cuttlefish/common/libs/utils:host_info",
         "//cuttlefish/common/libs/utils:json",
         "//cuttlefish/host/libs/config:config_constants",
         "//cuttlefish/host/libs/config:cuttlefish_config",
+        "//cuttlefish/host/libs/config:gpu_mode",
+        "//cuttlefish/host/libs/config:secure_hals",
+        "//cuttlefish/host/libs/config:vmm_mode",
         "//cuttlefish/host/libs/vm_manager",
         "//cuttlefish/result",
         "@abseil-cpp//absl/log",
         "@abseil-cpp//absl/strings",
+        "@fmt",
     ],
 )
 
@@ -168,9 +176,7 @@ cf_cc_library(
     name = "clean",
     srcs = ["clean.cc"],
     hdrs = ["clean.h"],
-    include_cleaner_enabled = False,
     deps = [
-        "//cuttlefish/common/libs/utils:files",
         "//cuttlefish/common/libs/utils:in_sandbox",
         "//cuttlefish/files:directory_contents",
         "//cuttlefish/host/libs/config:config_utils",
@@ -188,7 +194,6 @@ cf_cc_library(
     name = "create_dynamic_disk_files",
     srcs = ["create_dynamic_disk_files.cc"],
     hdrs = ["create_dynamic_disk_files.h"],
-    include_cleaner_enabled = False,
     deps = [
         "//cuttlefish/common/libs/utils:files",
         "//cuttlefish/files:file_exists",
@@ -228,7 +233,6 @@ cf_cc_library(
         "//cuttlefish/result",
         "@abseil-cpp//absl/log",
         "@abseil-cpp//absl/strings",
-        "@gflags",
     ],
 )
 
@@ -236,7 +240,6 @@ cf_cc_library(
     name = "disk_builder",
     srcs = ["disk_builder.cpp"],
     hdrs = ["disk_builder.h"],
-    include_cleaner_enabled = False,
     deps = [
         "//cuttlefish/common/libs/utils:files",
         "//cuttlefish/host/libs/config:vmm_mode",
@@ -275,7 +278,6 @@ cf_cc_library(
     name = "display",
     srcs = ["display.cpp"],
     hdrs = ["display.h"],
-    include_cleaner_enabled = False,
     deps = [
         "//cuttlefish/flag_parser",
         "//cuttlefish/host/libs/config:config_flag",
@@ -286,6 +288,7 @@ cf_cc_library(
         "//cuttlefish/result",
         "@abseil-cpp//absl/log",
         "@fruit",
+        "@jsoncpp",
     ],
 )
 
@@ -293,7 +296,6 @@ cf_cc_library(
     name = "flag_feature",
     srcs = ["flag_feature.cpp"],
     hdrs = ["flag_feature.h"],
-    include_cleaner_enabled = False,
     deps = [
         "//cuttlefish/host/libs/config:config_flag",
         "//cuttlefish/host/libs/feature",
@@ -308,7 +310,6 @@ cf_cc_library(
     name = "flags",
     srcs = ["flags.cc"],
     hdrs = ["flags.h"],
-    include_cleaner_enabled = False,
     deps = [
         "//cuttlefish/common/libs/utils:base64",
         "//cuttlefish/common/libs/utils:container",
@@ -324,6 +325,7 @@ cf_cc_library(
         "//cuttlefish/host/commands/assemble_cvd:display",
         "//cuttlefish/host/commands/assemble_cvd:graphics_flags",
         "//cuttlefish/host/commands/assemble_cvd:guest_config",
+        "//cuttlefish/host/commands/assemble_cvd:guest_config_cc_proto",
         "//cuttlefish/host/commands/assemble_cvd:media",
         "//cuttlefish/host/commands/assemble_cvd:network_flags",
         "//cuttlefish/host/commands/assemble_cvd:touchpad",
@@ -352,6 +354,8 @@ cf_cc_library(
         "//cuttlefish/host/commands/cvdalloc:interface",
         "//cuttlefish/host/libs/config:ap_boot_flow",
         "//cuttlefish/host/libs/config:config_constants",
+        "//cuttlefish/host/libs/config:config_fragment",
+        "//cuttlefish/host/libs/config:config_utils",
         "//cuttlefish/host/libs/config:cuttlefish_config",
         "//cuttlefish/host/libs/config:display",
         "//cuttlefish/host/libs/config:external_network_mode",
@@ -365,13 +369,11 @@ cf_cc_library(
         "//cuttlefish/host/libs/vhal_proxy_server",
         "//cuttlefish/host/libs/vm_manager",
         "//cuttlefish/result",
-        "//libbase",
         "@abseil-cpp//absl/log",
         "@abseil-cpp//absl/strings",
         "@fmt",
         "@fruit",
         "@gflags",
-        "@jsoncpp",
     ],
 )
 
@@ -393,7 +395,6 @@ cf_cc_library(
     name = "guest_config",
     srcs = ["guest_config.cc"],
     hdrs = ["guest_config.h"],
-    include_cleaner_enabled = False,
     deps = [
         "//cuttlefish/common/libs/key_equals_value",
         "//cuttlefish/common/libs/utils:device_type",
@@ -428,7 +429,6 @@ cf_cc_library(
     name = "graphics_flags",
     srcs = ["graphics_flags.cc"],
     hdrs = ["graphics_flags.h"],
-    include_cleaner_enabled = False,
     deps = [
         "//cuttlefish/common/libs/utils:contains",
         "//cuttlefish/common/libs/utils:files",
@@ -437,6 +437,7 @@ cf_cc_library(
         "//cuttlefish/host/commands/assemble_cvd:guest_config",
         "//cuttlefish/host/graphics_detector:graphics_detector_cc_proto",
         "//cuttlefish/host/libs/config:config_constants",
+        "//cuttlefish/host/libs/config:config_utils",
         "//cuttlefish/host/libs/config:cuttlefish_config",
         "//cuttlefish/host/libs/config:gpu_mode",
         "//cuttlefish/host/libs/config:guest_hwui_renderer",
@@ -458,7 +459,6 @@ cf_cc_library(
     name = "kernel_module_parser",
     srcs = ["kernel_module_parser.cc"],
     hdrs = ["kernel_module_parser.h"],
-    include_cleaner_enabled = False,
     deps = [
         "//cuttlefish/io",
         "//cuttlefish/io:string",
@@ -502,7 +502,6 @@ cf_cc_library(
     name = "instance_image_files",
     srcs = ["instance_image_files.cc"],
     hdrs = ["instance_image_files.h"],
-    include_cleaner_enabled = False,
     deps = [
         "//cuttlefish/host/commands/assemble_cvd/disk:efi_loader",
         "//cuttlefish/host/commands/assemble_cvd/disk:image_file",
@@ -518,7 +517,6 @@ cf_cc_library(
     name = "misc_info",
     srcs = ["misc_info.cc"],
     hdrs = ["misc_info.h"],
-    include_cleaner_enabled = False,
     deps = [
         "//cuttlefish/common/libs/utils:contains",
         "//cuttlefish/host/libs/avb",
@@ -533,14 +531,12 @@ cf_cc_library(
     name = "network_flags",
     srcs = ["network_flags.cpp"],
     hdrs = ["network_flags.h"],
-    include_cleaner_enabled = False,
     deps = [
         "//cuttlefish/host/commands/cvdalloc:interface",
         "//cuttlefish/host/libs/config:cuttlefish_config",
         "//cuttlefish/result",
         "@abseil-cpp//absl/log",
         "@abseil-cpp//absl/strings",
-        "@abseil-cpp//absl/strings:str_format",
     ],
 )
 
@@ -548,10 +544,10 @@ cf_cc_library(
     name = "required_directories",
     srcs = ["required_directories.cc"],
     hdrs = ["required_directories.h"],
-    include_cleaner_enabled = False,
     deps = [
         "//cuttlefish/host/libs/config:config_constants",
         "//cuttlefish/host/libs/config:cuttlefish_config",
+        "@abseil-cpp//absl/strings",
     ],
 )
 
@@ -559,7 +555,6 @@ cf_cc_library(
     name = "resolve_instance_files",
     srcs = ["resolve_instance_files.cc"],
     hdrs = ["resolve_instance_files.h"],
-    include_cleaner_enabled = False,
     deps = [
         "//cuttlefish/host/commands/assemble_cvd:assemble_cvd_flags",
         "//cuttlefish/host/commands/assemble_cvd/flags:boot_image",
@@ -571,6 +566,7 @@ cf_cc_library(
         "//cuttlefish/host/libs/config:instance_nums",
         "//cuttlefish/result",
         "@abseil-cpp//absl/strings",
+        "@fmt",
         "@gflags",
     ],
 )
@@ -579,7 +575,6 @@ cf_cc_library(
     name = "super_image_mixer",
     srcs = ["super_image_mixer.cc"],
     hdrs = ["super_image_mixer.h"],
-    include_cleaner_enabled = False,
     deps = [
         "//cuttlefish/common/libs/key_equals_value",
         "//cuttlefish/common/libs/utils:archive",
@@ -604,7 +599,6 @@ cf_cc_library(
     name = "touchpad",
     srcs = ["touchpad.cpp"],
     hdrs = ["touchpad.h"],
-    include_cleaner_enabled = False,
     deps = [
         "//cuttlefish/flag_parser",
         "//cuttlefish/host/libs/config:config_flag",
@@ -620,7 +614,6 @@ cf_cc_library(
     name = "vendor_dlkm_utils",
     srcs = ["vendor_dlkm_utils.cc"],
     hdrs = ["vendor_dlkm_utils.h"],
-    include_cleaner_enabled = False,
     deps = [
         "//cuttlefish/common/libs/fs",
         "//cuttlefish/common/libs/utils:contains",
@@ -663,15 +656,16 @@ cf_cc_library(
     name = "media",
     srcs = ["media.cpp"],
     hdrs = ["media.h"],
-    include_cleaner_enabled = False,
     deps = [
         "//cuttlefish/flag_parser",
         "//cuttlefish/host/libs/config:config_flag",
         "//cuttlefish/host/libs/config:config_fragment",
         "//cuttlefish/host/libs/config:cuttlefish_config",
         "//cuttlefish/host/libs/config:media",
+        "//cuttlefish/host/libs/feature",
         "//cuttlefish/result",
         "@abseil-cpp//absl/log",
         "@fruit",
+        "@jsoncpp",
     ],
 )
diff --git a/base/cvd/cuttlefish/host/commands/assemble_cvd/alloc.cc b/base/cvd/cuttlefish/host/commands/assemble_cvd/alloc.cc
index 746a66a57b8..b26b25c9edb 100644
--- a/base/cvd/cuttlefish/host/commands/assemble_cvd/alloc.cc
+++ b/base/cvd/cuttlefish/host/commands/assemble_cvd/alloc.cc
@@ -16,14 +16,13 @@
 
 #include "cuttlefish/host/commands/assemble_cvd/alloc.h"
 
-#include <iomanip>
-#include <sstream>
+#include <string>
 
 #include "absl/strings/numbers.h"
 #include "absl/strings/str_format.h"
 
-#include "cuttlefish/common/libs/fs/shared_fd.h"
 #include "cuttlefish/host/commands/cvdalloc/interface.h"
+#include "cuttlefish/host/libs/config/cuttlefish_config.h"
 #include "cuttlefish/result/result.h"
 
 namespace cuttlefish {
diff --git a/base/cvd/cuttlefish/host/commands/assemble_cvd/assemble_cvd.cc b/base/cvd/cuttlefish/host/commands/assemble_cvd/assemble_cvd.cc
index 192f9d65342..afd7d41f5e0 100644
--- a/base/cvd/cuttlefish/host/commands/assemble_cvd/assemble_cvd.cc
+++ b/base/cvd/cuttlefish/host/commands/assemble_cvd/assemble_cvd.cc
@@ -13,14 +13,32 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <errno.h>
+#include <fcntl.h>
+#include <stdlib.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <unistd.h>
+
 #include <iostream>
+#include <memory>
+#include <optional>
+#include <ostream>
+#include <set>
+#include <sstream>
+#include <string>
 #include <string_view>
+#include <utility>
 #include <vector>
 
 #include "absl/log/log.h"
 #include "absl/strings/match.h"
 #include "absl/strings/str_cat.h"
+#include "absl/strings/str_join.h"
 #include "absl/strings/str_split.h"
+#include "fmt/format.h"
+#include "fruit/component.h"
+#include "fruit/injector.h"
 #include "gflags/gflags.h"
 
 #include "cuttlefish/common/libs/fs/shared_buf.h"
@@ -42,11 +60,13 @@
 #include "cuttlefish/host/commands/assemble_cvd/clean.h"
 #include "cuttlefish/host/commands/assemble_cvd/create_dynamic_disk_files.h"
 #include "cuttlefish/host/commands/assemble_cvd/disk/ap_composite_disk.h"
+#include "cuttlefish/host/commands/assemble_cvd/disk/chromeos_state.h"
 #include "cuttlefish/host/commands/assemble_cvd/disk/factory_reset_protected.h"
 #include "cuttlefish/host/commands/assemble_cvd/disk/image_file.h"
 #include "cuttlefish/host/commands/assemble_cvd/disk/metadata_image.h"
 #include "cuttlefish/host/commands/assemble_cvd/disk/misc_image.h"
 #include "cuttlefish/host/commands/assemble_cvd/disk/os_composite_disk.h"
+#include "cuttlefish/host/commands/assemble_cvd/disk_builder.h"
 #include "cuttlefish/host/commands/assemble_cvd/display.h"
 #include "cuttlefish/host/commands/assemble_cvd/flag_feature.h"
 #include "cuttlefish/host/commands/assemble_cvd/flags.h"
@@ -58,6 +78,7 @@
 #include "cuttlefish/host/commands/assemble_cvd/flags/vendor_boot_image.h"
 #include "cuttlefish/host/commands/assemble_cvd/flags/vm_manager.h"
 #include "cuttlefish/host/commands/assemble_cvd/flags_defaults.h"
+#include "cuttlefish/host/commands/assemble_cvd/guest_config.h"
 #include "cuttlefish/host/commands/assemble_cvd/instance_image_files.h"
 #include "cuttlefish/host/commands/assemble_cvd/media.h"
 #include "cuttlefish/host/commands/assemble_cvd/required_directories.h"
@@ -66,13 +87,17 @@
 #include "cuttlefish/host/libs/command_util/snapshot_utils.h"
 #include "cuttlefish/host/libs/config/adb/adb.h"
 #include "cuttlefish/host/libs/config/ap_boot_flow.h"
+#include "cuttlefish/host/libs/config/config_constants.h"
 #include "cuttlefish/host/libs/config/config_flag.h"
+#include "cuttlefish/host/libs/config/config_utils.h"
 #include "cuttlefish/host/libs/config/custom_actions.h"
 #include "cuttlefish/host/libs/config/cuttlefish_config.h"
 #include "cuttlefish/host/libs/config/defaults/defaults.h"
 #include "cuttlefish/host/libs/config/fastboot/fastboot.h"
 #include "cuttlefish/host/libs/config/fetcher_configs.h"
+#include "cuttlefish/host/libs/config/file_source.h"
 #include "cuttlefish/host/libs/config/log_string_to_dir.h"
+#include "cuttlefish/host/libs/feature/feature.h"
 #include "cuttlefish/host/libs/feature/inject.h"
 #include "cuttlefish/host/libs/log_names/log_names.h"
 #include "cuttlefish/posix/symlink.h"
diff --git a/base/cvd/cuttlefish/host/commands/assemble_cvd/boot_config.cc b/base/cvd/cuttlefish/host/commands/assemble_cvd/boot_config.cc
index 1c5eba4d5af..005949fe1f9 100644
--- a/base/cvd/cuttlefish/host/commands/assemble_cvd/boot_config.cc
+++ b/base/cvd/cuttlefish/host/commands/assemble_cvd/boot_config.cc
@@ -16,13 +16,20 @@
 
 #include "cuttlefish/host/commands/assemble_cvd/boot_config.h"
 
-#include <stdint.h>
-#include <sys/stat.h>
+#include <stddef.h>
+#include <sys/types.h>
 
 #include <fstream>
+#include <functional>
+#include <ios>
+#include <map>
+#include <optional>
+#include <ostream>
 #include <sstream>
 #include <string>
 #include <string_view>
+#include <unordered_map>
+#include <utility>
 
 #include "absl/log/log.h"
 #include "absl/strings/str_join.h"
diff --git a/base/cvd/cuttlefish/host/commands/assemble_cvd/boot_image/vendor_boot_image.h b/base/cvd/cuttlefish/host/commands/assemble_cvd/boot_image/vendor_boot_image.h
index 5ae137847b2..1170b248b5e 100644
--- a/base/cvd/cuttlefish/host/commands/assemble_cvd/boot_image/vendor_boot_image.h
+++ b/base/cvd/cuttlefish/host/commands/assemble_cvd/boot_image/vendor_boot_image.h
@@ -17,6 +17,8 @@
 
 #include <stdint.h>
 
+#include <memory>
+#include <optional>
 #include <variant>
 
 #include "bootimg.h"
diff --git a/base/cvd/cuttlefish/host/commands/assemble_cvd/boot_image_utils.cc b/base/cvd/cuttlefish/host/commands/assemble_cvd/boot_image_utils.cc
index 70ad48bc60a..c7303eb7974 100644
--- a/base/cvd/cuttlefish/host/commands/assemble_cvd/boot_image_utils.cc
+++ b/base/cvd/cuttlefish/host/commands/assemble_cvd/boot_image_utils.cc
@@ -16,14 +16,20 @@
 
 #include "cuttlefish/host/commands/assemble_cvd/boot_image_utils.h"
 
+#include <fcntl.h>
 #include <stddef.h>
+#include <stdint.h>
 #include <string.h>
-#include <unistd.h>
 
+#include <array>
 #include <fstream>
+#include <ios>
+#include <memory>
 #include <optional>
 #include <regex>
 #include <string>
+#include <string_view>
+#include <utility>
 
 #include "absl/log/check.h"
 #include "absl/log/log.h"
@@ -36,6 +42,7 @@
 #include "cuttlefish/host/commands/assemble_cvd/boot_image/boot_image_builder.h"
 #include "cuttlefish/host/commands/assemble_cvd/boot_image/vendor_boot_image.h"
 #include "cuttlefish/host/commands/assemble_cvd/boot_image/vendor_boot_image_builder.h"
+#include "cuttlefish/host/commands/assemble_cvd/disk/generate_persistent_bootconfig.h"
 #include "cuttlefish/host/libs/avb/avb.h"
 #include "cuttlefish/host/libs/avb/parser.h"
 #include "cuttlefish/host/libs/config/config_utils.h"
diff --git a/base/cvd/cuttlefish/host/commands/assemble_cvd/bootconfig_args.cpp b/base/cvd/cuttlefish/host/commands/assemble_cvd/bootconfig_args.cpp
index 05bea0c460e..e057ff1d2c1 100644
--- a/base/cvd/cuttlefish/host/commands/assemble_cvd/bootconfig_args.cpp
+++ b/base/cvd/cuttlefish/host/commands/assemble_cvd/bootconfig_args.cpp
@@ -16,10 +16,14 @@
 
 #include "cuttlefish/host/commands/assemble_cvd/bootconfig_args.h"
 
-#include <algorithm>
+#include <stdint.h>
+
 #include <array>
+#include <functional>
+#include <map>
 #include <string>
 #include <string_view>
+#include <unordered_map>
 #include <unordered_set>
 #include <vector>
 
@@ -27,11 +31,16 @@
 #include "absl/strings/numbers.h"
 #include "absl/strings/str_join.h"
 #include "absl/strings/str_split.h"
+#include "fmt/format.h"
 
-#include "cuttlefish/common/libs/utils/contains.h"
+#include "cuttlefish/common/libs/utils/device_type.h"
+#include "cuttlefish/common/libs/utils/host_info.h"
 #include "cuttlefish/common/libs/utils/json.h"
 #include "cuttlefish/host/libs/config/config_constants.h"
 #include "cuttlefish/host/libs/config/cuttlefish_config.h"
+#include "cuttlefish/host/libs/config/gpu_mode.h"
+#include "cuttlefish/host/libs/config/secure_hals.h"
+#include "cuttlefish/host/libs/config/vmm_mode.h"
 #include "cuttlefish/host/libs/vm_manager/crosvm_manager.h"
 #include "cuttlefish/host/libs/vm_manager/qemu_manager.h"
 #include "cuttlefish/host/libs/vm_manager/vm_manager.h"
diff --git a/base/cvd/cuttlefish/host/commands/assemble_cvd/clean.cc b/base/cvd/cuttlefish/host/commands/assemble_cvd/clean.cc
index 9c78e93be8a..652f3acb26d 100644
--- a/base/cvd/cuttlefish/host/commands/assemble_cvd/clean.cc
+++ b/base/cvd/cuttlefish/host/commands/assemble_cvd/clean.cc
@@ -17,16 +17,22 @@
 
 #include <dirent.h>
 #include <errno.h>
+#include <fcntl.h>
 #include <sys/stat.h>
+#include <sys/types.h>
+#include <unistd.h>
 
+#include <memory>
+#include <set>
+#include <string>
 #include <vector>
 
 #include "absl/log/log.h"
 #include "absl/strings/str_join.h"
 #include "android-base/file.h"
+#include "fmt/format.h"
 #include "fmt/ranges.h"
 
-#include "cuttlefish/common/libs/utils/files.h"
 #include "cuttlefish/common/libs/utils/in_sandbox.h"
 #include "cuttlefish/files/directory_contents.h"
 #include "cuttlefish/host/libs/config/config_utils.h"
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
index 96932fac1f3..d33c17d02cd 100644
--- 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
@@ -16,14 +16,20 @@
 
 #include "cuttlefish/host/commands/assemble_cvd/create_dynamic_disk_files.h"
 
+#include <errno.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <string.h>
 #include <sys/statvfs.h>
 
 #include <memory>
+#include <optional>
 #include <string>
+#include <string_view>
+#include <vector>
 
 #include "absl/log/log.h"
 #include "absl/strings/match.h"
-#include "gflags/gflags.h"
 
 #include "cuttlefish/common/libs/utils/files.h"
 #include "cuttlefish/files/file_exists.h"
diff --git a/base/cvd/cuttlefish/host/commands/assemble_cvd/disk_builder.cpp b/base/cvd/cuttlefish/host/commands/assemble_cvd/disk_builder.cpp
index f156d470e77..209b5757478 100644
--- a/base/cvd/cuttlefish/host/commands/assemble_cvd/disk_builder.cpp
+++ b/base/cvd/cuttlefish/host/commands/assemble_cvd/disk_builder.cpp
@@ -15,8 +15,10 @@
 
 #include "cuttlefish/host/commands/assemble_cvd/disk_builder.h"
 
+#include <chrono>
 #include <sstream>
 #include <string>
+#include <utility>
 #include <vector>
 
 #include "absl/log/log.h"
diff --git a/base/cvd/cuttlefish/host/commands/assemble_cvd/display.cpp b/base/cvd/cuttlefish/host/commands/assemble_cvd/display.cpp
index 75f6c2475ab..a45cf71af94 100644
--- a/base/cvd/cuttlefish/host/commands/assemble_cvd/display.cpp
+++ b/base/cvd/cuttlefish/host/commands/assemble_cvd/display.cpp
@@ -15,15 +15,24 @@
 
 #include "cuttlefish/host/commands/assemble_cvd/display.h"
 
+#include <ostream>
 #include <string>
+#include <unordered_set>
 #include <vector>
 
 #include "absl/log/log.h"
-#include "fruit/fruit.h"
+#include "fruit/component.h"
+#include "fruit/fruit_forward_decls.h"
+#include "fruit/macro.h"
+#include "json/value.h"
 
 #include "cuttlefish/flag_parser/flag.h"
 #include "cuttlefish/flag_parser/gflags_compat.h"
+#include "cuttlefish/host/libs/config/config_flag.h"
+#include "cuttlefish/host/libs/config/config_fragment.h"
+#include "cuttlefish/host/libs/config/cuttlefish_config.h"
 #include "cuttlefish/host/libs/config/display.h"
+#include "cuttlefish/host/libs/feature/feature.h"
 #include "cuttlefish/result/result.h"
 
 namespace cuttlefish {
diff --git a/base/cvd/cuttlefish/host/commands/assemble_cvd/flag_feature.cpp b/base/cvd/cuttlefish/host/commands/assemble_cvd/flag_feature.cpp
index 64014fd8b23..078437b4a4a 100644
--- a/base/cvd/cuttlefish/host/commands/assemble_cvd/flag_feature.cpp
+++ b/base/cvd/cuttlefish/host/commands/assemble_cvd/flag_feature.cpp
@@ -15,14 +15,18 @@
  */
 #include "cuttlefish/host/commands/assemble_cvd/flag_feature.h"
 
+#include <ostream>
 #include <string>
 #include <unordered_set>
 #include <vector>
 
 #include "absl/strings/str_replace.h"
-#include "fruit/fruit.h"
+#include "fruit/component.h"
+#include "fruit/fruit_forward_decls.h"
+#include "fruit/macro.h"
 #include "gflags/gflags.h"
 
+#include "cuttlefish/host/libs/config/config_flag.h"
 #include "cuttlefish/host/libs/feature/feature.h"
 #include "cuttlefish/result/result.h"
 
diff --git a/base/cvd/cuttlefish/host/commands/assemble_cvd/flags.cc b/base/cvd/cuttlefish/host/commands/assemble_cvd/flags.cc
index cffe45d8b75..9c8419e064e 100644
--- a/base/cvd/cuttlefish/host/commands/assemble_cvd/flags.cc
+++ b/base/cvd/cuttlefish/host/commands/assemble_cvd/flags.cc
@@ -15,13 +15,17 @@
  */
 #include "cuttlefish/host/commands/assemble_cvd/flags.h"
 
+#include <stddef.h>
 #include <stdint.h>
-#include <sys/types.h>
+#include <stdlib.h>
+#include <time.h>
 #include <unistd.h>
 
 #include <algorithm>
 #include <iomanip>
 #include <iostream>
+#include <map>
+#include <memory>
 #include <optional>
 #include <regex>
 #include <set>
@@ -29,18 +33,17 @@
 #include <string>
 #include <string_view>
 #include <unordered_map>
+#include <utility>
 #include <vector>
 
 #include "absl/log/log.h"
 #include "absl/strings/numbers.h"
 #include "absl/strings/str_replace.h"
 #include "absl/strings/str_split.h"
-#include "android-base/file.h"
 #include "fmt/format.h"
-#include "fruit/fruit.h"
+#include "fruit/fruit_forward_decls.h"
+#include "fruit/injector.h"
 #include "gflags/gflags.h"
-#include "json/json.h"
-#include "json/writer.h"
 
 #include "cuttlefish/common/libs/utils/base64.h"
 #include "cuttlefish/common/libs/utils/container.h"
@@ -71,6 +74,7 @@
 #include "cuttlefish/host/commands/assemble_cvd/flags/memory_mb.h"
 #include "cuttlefish/host/commands/assemble_cvd/flags/parser.h"
 #include "cuttlefish/host/commands/assemble_cvd/flags/restart_subprocesses.h"
+#include "cuttlefish/host/commands/assemble_cvd/flags/super_image.h"
 #include "cuttlefish/host/commands/assemble_cvd/flags/system_image_dir.h"
 #include "cuttlefish/host/commands/assemble_cvd/flags/use_cvdalloc.h"
 #include "cuttlefish/host/commands/assemble_cvd/flags/vendor_boot_image.h"
@@ -79,11 +83,15 @@
 #include "cuttlefish/host/commands/assemble_cvd/guest_config.h"
 #include "cuttlefish/host/commands/assemble_cvd/media.h"
 #include "cuttlefish/host/commands/assemble_cvd/network_flags.h"
+#include "cuttlefish/host/commands/assemble_cvd/proto/guest_config.pb.h"
 #include "cuttlefish/host/commands/assemble_cvd/touchpad.h"
 #include "cuttlefish/host/commands/cvdalloc/interface.h"
 #include "cuttlefish/host/libs/config/ap_boot_flow.h"
 #include "cuttlefish/host/libs/config/config_constants.h"
+#include "cuttlefish/host/libs/config/config_fragment.h"
+#include "cuttlefish/host/libs/config/config_utils.h"
 #include "cuttlefish/host/libs/config/cuttlefish_config.h"
+#include "cuttlefish/host/libs/config/defaults/defaults.h"
 #include "cuttlefish/host/libs/config/display.h"
 #include "cuttlefish/host/libs/config/external_network_mode.h"
 #include "cuttlefish/host/libs/config/fetcher_configs.h"
@@ -722,7 +730,7 @@ Result<CuttlefishConfig> InitializeCuttlefishConfiguration(
   auto env_config = const_cast<const CuttlefishConfig&>(tmp_config_obj)
                         .ForEnvironment(environment_name);
 
-  mutable_env_config.set_group_uuid(std::time(0));
+  mutable_env_config.set_group_uuid(time(0));
 
   std::vector<bool> enable_wifi_vec =
       CF_EXPECT(GET_FLAG_BOOL_VALUE(enable_wifi));
diff --git a/base/cvd/cuttlefish/host/commands/assemble_cvd/graphics_flags.cc b/base/cvd/cuttlefish/host/commands/assemble_cvd/graphics_flags.cc
index 099dde8a3ea..fcef013afe8 100644
--- a/base/cvd/cuttlefish/host/commands/assemble_cvd/graphics_flags.cc
+++ b/base/cvd/cuttlefish/host/commands/assemble_cvd/graphics_flags.cc
@@ -16,17 +16,23 @@
 
 #include "cuttlefish/host/commands/assemble_cvd/graphics_flags.h"
 
+#include <stddef.h>
+
+#include <functional>
 #include <ostream>
 #include <string_view>
+#include <unordered_map>
+#include <unordered_set>
+#include <utility>
 #include <vector>
 
 #include "absl/log/log.h"
 #include "absl/strings/ascii.h"
+#include "absl/strings/str_cat.h"
 #include "absl/strings/str_join.h"
 #include "absl/strings/str_split.h"
 #include "android-base/file.h"
 #include "fmt/base.h"
-#include "fmt/format.h"
 #include "fmt/ostream.h"
 #include "google/protobuf/io/tokenizer.h"
 #include "google/protobuf/text_format.h"
@@ -35,8 +41,10 @@
 #include "cuttlefish/common/libs/utils/files.h"
 #include "cuttlefish/common/libs/utils/host_info.h"
 #include "cuttlefish/common/libs/utils/semver.h"
+#include "cuttlefish/host/commands/assemble_cvd/guest_config.h"
 #include "cuttlefish/host/graphics_detector/graphics_detector.pb.h"
 #include "cuttlefish/host/libs/config/config_constants.h"
+#include "cuttlefish/host/libs/config/config_utils.h"
 #include "cuttlefish/host/libs/config/cuttlefish_config.h"
 #include "cuttlefish/host/libs/config/gpu_mode.h"
 #include "cuttlefish/host/libs/config/guest_hwui_renderer.h"
@@ -57,7 +65,7 @@ namespace {
 
 struct AggregatingErrorCollector : public google::protobuf::io::ErrorCollector {
   void RecordError(int /* line */, int /* column */,
-                   const absl::string_view message) override {
+                   const std::string_view message) override {
     if (!error_message.empty()) {
       absl::StrAppend(&error_message, "; ");
     }
@@ -65,7 +73,7 @@ struct AggregatingErrorCollector : public google::protobuf::io::ErrorCollector {
   }
 
   void RecordWarning(int /* line */, int /* column */,
-                     const absl::string_view /* message */) override {
+                     const std::string_view /* message */) override {
     // Ignore warnings
   }
 
@@ -890,7 +898,7 @@ GetGraphicsAvailabilityWithSubprocessCheck() {
   }
 
   VLOG(0) << "Host Graphics Availability:";
-  for (absl::string_view line :
+  for (std::string_view line :
        absl::StrSplit(graphics_availability_content, '\n')) {
     VLOG(0) << line;
   }
diff --git a/base/cvd/cuttlefish/host/commands/assemble_cvd/guest_config.cc b/base/cvd/cuttlefish/host/commands/assemble_cvd/guest_config.cc
index 73de7d87393..c33e2ba027e 100644
--- a/base/cvd/cuttlefish/host/commands/assemble_cvd/guest_config.cc
+++ b/base/cvd/cuttlefish/host/commands/assemble_cvd/guest_config.cc
@@ -16,12 +16,16 @@
 
 #include "cuttlefish/host/commands/assemble_cvd/guest_config.h"
 
-#include <sys/types.h>
+#include <fcntl.h>
 #include <unistd.h>
 
+#include <functional>
+#include <map>
 #include <optional>
 #include <string>
 #include <string_view>
+#include <unordered_map>
+#include <utility>
 #include <vector>
 
 #include "absl/strings/match.h"
@@ -33,6 +37,7 @@
 #include "google/protobuf/text_format.h"
 
 #include "cuttlefish/common/libs/key_equals_value/key_equals_value.h"
+#include "cuttlefish/common/libs/utils/device_type.h"
 #include "cuttlefish/common/libs/utils/environment.h"
 #include "cuttlefish/common/libs/utils/files.h"
 #include "cuttlefish/common/libs/utils/host_info.h"
@@ -46,8 +51,10 @@
 #include "cuttlefish/host/libs/config/config_utils.h"
 #include "cuttlefish/host/libs/config/display.h"
 #include "cuttlefish/host/libs/config/gpu_mode.h"
-#include "cuttlefish/pretty/optional.h"
-#include "cuttlefish/pretty/string.h"
+#include "cuttlefish/pretty/optional.h"  // IWYU pragma: keep: overloads
+#include "cuttlefish/pretty/pretty.h"
+#include "cuttlefish/pretty/string.h"  // IWYU pragma: keep: overloads
+#include "cuttlefish/pretty/struct.h"
 #include "cuttlefish/process/command.h"
 #include "cuttlefish/process/managed_stdio.h"
 #include "cuttlefish/result/result.h"
diff --git a/base/cvd/cuttlefish/host/commands/assemble_cvd/instance_image_files.cc b/base/cvd/cuttlefish/host/commands/assemble_cvd/instance_image_files.cc
index 986cb812510..82e81878f2a 100644
--- a/base/cvd/cuttlefish/host/commands/assemble_cvd/instance_image_files.cc
+++ b/base/cvd/cuttlefish/host/commands/assemble_cvd/instance_image_files.cc
@@ -16,6 +16,8 @@
 #include "cuttlefish/host/commands/assemble_cvd/instance_image_files.h"
 
 #include <memory>
+#include <optional>
+#include <utility>
 #include <vector>
 
 #include "cuttlefish/host/commands/assemble_cvd/disk/efi_loader.h"
diff --git a/base/cvd/cuttlefish/host/commands/assemble_cvd/kernel_module_parser.cc b/base/cvd/cuttlefish/host/commands/assemble_cvd/kernel_module_parser.cc
index d23e86ed154..afb06f64352 100644
--- a/base/cvd/cuttlefish/host/commands/assemble_cvd/kernel_module_parser.cc
+++ b/base/cvd/cuttlefish/host/commands/assemble_cvd/kernel_module_parser.cc
@@ -15,6 +15,8 @@
 
 #include "cuttlefish/host/commands/assemble_cvd/kernel_module_parser.h"
 
+#include <string_view>
+
 #include "cuttlefish/io/io.h"
 #include "cuttlefish/io/string.h"
 #include "cuttlefish/result/expect.h"
diff --git a/base/cvd/cuttlefish/host/commands/assemble_cvd/media.cpp b/base/cvd/cuttlefish/host/commands/assemble_cvd/media.cpp
index 3a255dbb88c..3be31f72f09 100644
--- a/base/cvd/cuttlefish/host/commands/assemble_cvd/media.cpp
+++ b/base/cvd/cuttlefish/host/commands/assemble_cvd/media.cpp
@@ -15,11 +15,24 @@
 
 #include "cuttlefish/host/commands/assemble_cvd/media.h"
 
+#include <ostream>
+#include <string>
+#include <unordered_set>
+#include <vector>
+
 #include "absl/log/log.h"
+#include "fruit/component.h"
+#include "fruit/fruit_forward_decls.h"
+#include "fruit/macro.h"
+#include "json/value.h"
 
 #include "cuttlefish/flag_parser/flag.h"
 #include "cuttlefish/flag_parser/gflags_compat.h"
+#include "cuttlefish/host/libs/config/config_flag.h"
+#include "cuttlefish/host/libs/config/config_fragment.h"
+#include "cuttlefish/host/libs/config/cuttlefish_config.h"
 #include "cuttlefish/host/libs/config/media.h"
+#include "cuttlefish/host/libs/feature/feature.h"
 #include "cuttlefish/result/result.h"
 
 namespace cuttlefish {
diff --git a/base/cvd/cuttlefish/host/commands/assemble_cvd/misc_info.cc b/base/cvd/cuttlefish/host/commands/assemble_cvd/misc_info.cc
index 023065b8c22..0dfedf2d27a 100644
--- a/base/cvd/cuttlefish/host/commands/assemble_cvd/misc_info.cc
+++ b/base/cvd/cuttlefish/host/commands/assemble_cvd/misc_info.cc
@@ -17,10 +17,12 @@
 
 #include <algorithm>
 #include <array>
+#include <iterator>
 #include <set>
 #include <string>
 #include <string_view>
 #include <unordered_set>
+#include <utility>
 #include <vector>
 
 #include "absl/strings/match.h"
diff --git a/base/cvd/cuttlefish/host/commands/assemble_cvd/network_flags.cpp b/base/cvd/cuttlefish/host/commands/assemble_cvd/network_flags.cpp
index 6f4ca7da73f..421f29cf503 100644
--- a/base/cvd/cuttlefish/host/commands/assemble_cvd/network_flags.cpp
+++ b/base/cvd/cuttlefish/host/commands/assemble_cvd/network_flags.cpp
@@ -18,12 +18,18 @@
 
 #include <arpa/inet.h>
 #include <ifaddrs.h>
+#include <netinet/in.h>
+#include <stdint.h>
+#include <string.h>
+#include <sys/socket.h>
+
+#include <string>
 
 #include "absl/log/log.h"
 #include "absl/strings/numbers.h"
-#include "absl/strings/str_format.h"
 
 #include "cuttlefish/host/commands/cvdalloc/interface.h"
+#include "cuttlefish/host/libs/config/cuttlefish_config.h"
 #include "cuttlefish/result/result.h"
 
 namespace cuttlefish {
diff --git a/base/cvd/cuttlefish/host/commands/assemble_cvd/required_directories.cc b/base/cvd/cuttlefish/host/commands/assemble_cvd/required_directories.cc
index 0c1f26524b7..8a9e7eebfc8 100644
--- a/base/cvd/cuttlefish/host/commands/assemble_cvd/required_directories.cc
+++ b/base/cvd/cuttlefish/host/commands/assemble_cvd/required_directories.cc
@@ -15,11 +15,12 @@
 
 #include "cuttlefish/host/commands/assemble_cvd/required_directories.h"
 
-#include <unistd.h>
-
 #include <string>
+#include <utility>
 #include <vector>
 
+#include "absl/strings/str_cat.h"
+
 #include "cuttlefish/host/libs/config/config_constants.h"
 #include "cuttlefish/host/libs/config/cuttlefish_config.h"
 
diff --git a/base/cvd/cuttlefish/host/commands/assemble_cvd/resolve_instance_files.cc b/base/cvd/cuttlefish/host/commands/assemble_cvd/resolve_instance_files.cc
index 94a28c3ee1f..f6ee180d63f 100644
--- a/base/cvd/cuttlefish/host/commands/assemble_cvd/resolve_instance_files.cc
+++ b/base/cvd/cuttlefish/host/commands/assemble_cvd/resolve_instance_files.cc
@@ -16,16 +16,16 @@
 
 #include "cuttlefish/host/commands/assemble_cvd/resolve_instance_files.h"
 
-#include <sys/statvfs.h>
-
 #include <string>
 #include <string_view>
 #include <vector>
 
 #include "absl/strings/str_split.h"
+#include "fmt/format.h"
 #include "gflags/gflags.h"
 
 #include "cuttlefish/host/commands/assemble_cvd/assemble_cvd_flags.h"
+#include "cuttlefish/host/commands/assemble_cvd/flags/boot_image.h"
 #include "cuttlefish/host/commands/assemble_cvd/flags/initramfs_path.h"
 #include "cuttlefish/host/commands/assemble_cvd/flags/kernel_path.h"
 #include "cuttlefish/host/commands/assemble_cvd/flags/super_image.h"
diff --git a/base/cvd/cuttlefish/host/commands/assemble_cvd/super_image_mixer.cc b/base/cvd/cuttlefish/host/commands/assemble_cvd/super_image_mixer.cc
index 339c6bf8bb7..73897a196fd 100644
--- a/base/cvd/cuttlefish/host/commands/assemble_cvd/super_image_mixer.cc
+++ b/base/cvd/cuttlefish/host/commands/assemble_cvd/super_image_mixer.cc
@@ -15,9 +15,8 @@
 
 #include "cuttlefish/host/commands/assemble_cvd/super_image_mixer.h"
 
-#include <sys/stat.h>
-
 #include <array>
+#include <set>
 #include <string>
 #include <string_view>
 #include <utility>
diff --git a/base/cvd/cuttlefish/host/commands/assemble_cvd/touchpad.cpp b/base/cvd/cuttlefish/host/commands/assemble_cvd/touchpad.cpp
index 086639e0cf0..c35e289cf37 100644
--- a/base/cvd/cuttlefish/host/commands/assemble_cvd/touchpad.cpp
+++ b/base/cvd/cuttlefish/host/commands/assemble_cvd/touchpad.cpp
@@ -15,9 +15,21 @@
 
 #include "cuttlefish/host/commands/assemble_cvd/touchpad.h"
 
+#include <ostream>
+#include <string>
+#include <unordered_set>
+#include <vector>
+
+#include "fruit/component.h"
+#include "fruit/fruit_forward_decls.h"
+#include "fruit/macro.h"
+
 #include "cuttlefish/flag_parser/flag.h"
 #include "cuttlefish/flag_parser/gflags_compat.h"
+#include "cuttlefish/host/libs/config/config_flag.h"
+#include "cuttlefish/host/libs/config/cuttlefish_config.h"
 #include "cuttlefish/host/libs/config/touchpad.h"
+#include "cuttlefish/host/libs/feature/feature.h"
 #include "cuttlefish/result/result.h"
 
 namespace cuttlefish {
diff --git a/base/cvd/cuttlefish/host/commands/assemble_cvd/vendor_dlkm_utils.cc b/base/cvd/cuttlefish/host/commands/assemble_cvd/vendor_dlkm_utils.cc
index aef14263919..9196254e0f5 100644
--- a/base/cvd/cuttlefish/host/commands/assemble_cvd/vendor_dlkm_utils.cc
+++ b/base/cvd/cuttlefish/host/commands/assemble_cvd/vendor_dlkm_utils.cc
@@ -16,13 +16,19 @@
 #include "cuttlefish/host/commands/assemble_cvd/vendor_dlkm_utils.h"
 
 #include <fcntl.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <string.h>
 
 #include <algorithm>
+#include <array>
 #include <deque>
 #include <map>
 #include <set>
 #include <sstream>
 #include <string>
+#include <string_view>
+#include <utility>
 #include <vector>
 
 #include "absl/log/log.h"
diff --git a/base/cvd/cuttlefish/host/commands/assemble_cvd/vendor_dlkm_utils.h b/base/cvd/cuttlefish/host/commands/assemble_cvd/vendor_dlkm_utils.h
index 26ecf415f87..01bb9fa94e2 100644
--- a/base/cvd/cuttlefish/host/commands/assemble_cvd/vendor_dlkm_utils.h
+++ b/base/cvd/cuttlefish/host/commands/assemble_cvd/vendor_dlkm_utils.h
@@ -33,7 +33,7 @@ Result<void> RepackSuperWithPartition(const std::string& superimg_path,
 Result<void> BuildVbmetaImage(const std::string& vendor_dlkm_img,
                               const std::string& vbmeta_path);
 
-Result<void> BuildDlkmImage(const std::string& src_dir, const bool is_erofs,
+Result<void> BuildDlkmImage(const std::string& src_dir, bool is_erofs,
                             const std::string& partition_name,
                             const std::string& output_image);