1 files changed, 5 insertions, 10 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileActionBuilder.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileActionBuilder.java
index de0801c57e..a87df83677 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileActionBuilder.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileActionBuilder.java
@@ -284,12 +284,10 @@ public class CppCompileActionBuilder {
     NestedSet<Artifact> realMandatoryInputs = buildMandatoryInputs();
     NestedSet<Artifact> allInputs = buildAllInputs(realMandatoryInputs);
 
-    NestedSetBuilder<Artifact> prunableHeadersBuilder = NestedSetBuilder.stableOrder();
-    prunableHeadersBuilder.addTransitive(ccCompilationContext.getDeclaredIncludeSrcs());
-    prunableHeadersBuilder.addTransitive(cppSemantics.getAdditionalPrunableIncludes());
-    prunableHeadersBuilder.addAll(additionalPrunableHeaders);
-
-    NestedSet<Artifact> prunableHeaders = prunableHeadersBuilder.build();
+    NestedSet<Artifact> prunableHeaders =
+        NestedSetBuilder.fromNestedSet(cppSemantics.getAdditionalPrunableIncludes())
+            .addAll(additionalPrunableHeaders)
+            .build();
 
     // Copying the collections is needed to make the builder reusable.
     CppCompileAction action;
@@ -393,10 +391,7 @@ public class CppCompileActionBuilder {
    * Returns the list of all inputs for the {@link CppCompileAction} as configured.
    */
   NestedSet<Artifact> buildAllInputs(NestedSet<Artifact> mandatoryInputs) {
-    NestedSetBuilder<Artifact> builder = NestedSetBuilder.stableOrder();
-    builder.addTransitive(mandatoryInputs);
-    builder.addAll(inputsForInvalidation);
-    return builder.build();
+    return NestedSetBuilder.fromNestedSet(mandatoryInputs).addAll(inputsForInvalidation).build();
   }
 
   private boolean useHeaderModules() {