3 files changed, 11 insertions, 7 deletions
diff --git a/src/buildtool/main/analyse.cpp b/src/buildtool/main/analyse.cpp
index ab88685d..96972703 100644
--- a/src/buildtool/main/analyse.cpp
+++ b/src/buildtool/main/analyse.cpp
@@ -108,7 +108,9 @@ void DetectAndReportPending(std::string const& name,
 
     auto provides_exp = Expression::FromJson(provides);
     return std::make_shared<AnalysedTarget const>(
-        TargetResult{inputs_exp, provides_exp, Expression::kEmptyMap},
+        TargetResult{.artifact_stage = inputs_exp,
+                     .provides = provides_exp,
+                     .runfiles = Expression::kEmptyMap},
         std::vector<ActionDescription::Ptr>{action},
         target->Blobs(),
         target->Trees(),
@@ -249,5 +251,5 @@ void DetectAndReportPending(std::string const& name,
             }
         }
     }
-    return AnalysisResult{id, target, modified};
+    return AnalysisResult{.id = id, .target = target, .modified = modified};
 }
diff --git a/src/buildtool/main/install_cas.cpp b/src/buildtool/main/install_cas.cpp
index 4566a1bb..cdeca553 100644
--- a/src/buildtool/main/install_cas.cpp
+++ b/src/buildtool/main/install_cas.cpp
@@ -57,7 +57,8 @@ namespace {
         size_str.empty() ? 0 : std::atol(size_str.c_str()));
     auto const& object_type = FromChar(*type.c_str());
     return Artifact::ObjectInfo{
-        ArtifactDigest{id, size, IsTreeObject(object_type)}, object_type};
+        .digest = ArtifactDigest{id, size, IsTreeObject(object_type)},
+        .type = object_type};
 }
 
 #ifndef BOOTSTRAP_BUILD_TOOL
diff --git a/src/buildtool/main/main.cpp b/src/buildtool/main/main.cpp
index 498507b1..3dee0096 100644
--- a/src/buildtool/main/main.cpp
+++ b/src/buildtool/main/main.cpp
@@ -576,7 +576,8 @@ void SetupHashFunction() {
         if (not entity) {
             std::exit(kExitFailure);
         }
-        return Target::ConfiguredTarget{std::move(*entity), std::move(config)};
+        return Target::ConfiguredTarget{.target = std::move(*entity),
+                                        .config = std::move(config)};
     }
     auto const target_file =
         (std::filesystem::path{current_module} / target_file_name).string();
@@ -608,9 +609,9 @@ void SetupHashFunction() {
         std::exit(kExitFailure);
     }
     return Target::ConfiguredTarget{
-        Base::EntityName{
-            Base::NamedTarget{main_repo, current_module, json.begin().key()}},
-        std::move(config)};
+        .target = Base::EntityName{Base::NamedTarget{
+            main_repo, current_module, json.begin().key()}},
+        .config = std::move(config)};
 }
 
 [[nodiscard]] auto DetermineWorkspaceRootByLookingForMarkers() noexcept