2 files changed, 5 insertions, 4 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/query2/output/ProtoOutputFormatter.java b/src/main/java/com/google/devtools/build/lib/query2/output/ProtoOutputFormatter.java
index 88aae47652..1fface3bb9 100644
--- a/src/main/java/com/google/devtools/build/lib/query2/output/ProtoOutputFormatter.java
+++ b/src/main/java/com/google/devtools/build/lib/query2/output/ProtoOutputFormatter.java
@@ -61,10 +61,11 @@ public class ProtoOutputFormatter extends OutputFormatter implements UnorderedFo
    */
   public static final String RULE_IMPLEMENTATION_HASH_ATTR_NAME = "$rule_implementation_hash";
 
-  private BinaryPredicate<Rule, Attribute> dependencyFilter;
+  private transient BinaryPredicate<Rule, Attribute> dependencyFilter;
+  protected transient AspectResolver aspectResolver;
+
   private boolean relativeLocations = false;
   protected boolean includeDefaultValues = true;
-  protected AspectResolver aspectResolver;
 
   protected void setDependencyFilter(QueryOptions options) {
     this.dependencyFilter = OutputFormatter.getDependencyFilter(options);
diff --git a/src/main/java/com/google/devtools/build/lib/query2/output/XmlOutputFormatter.java b/src/main/java/com/google/devtools/build/lib/query2/output/XmlOutputFormatter.java
index 9902b3f937..c0c47ba4a4 100644
--- a/src/main/java/com/google/devtools/build/lib/query2/output/XmlOutputFormatter.java
+++ b/src/main/java/com/google/devtools/build/lib/query2/output/XmlOutputFormatter.java
@@ -60,8 +60,8 @@ class XmlOutputFormatter extends AbstractUnorderedFormatter {
   private boolean xmlLineNumbers;
   private boolean showDefaultValues;
   private boolean relativeLocations;
-  private AspectResolver aspectResolver;
-  private BinaryPredicate<Rule, Attribute> dependencyFilter;
+  private transient AspectResolver aspectResolver;
+  private transient BinaryPredicate<Rule, Attribute> dependencyFilter;
 
   @Override
   public String getName() {