diff --git a/src/libstore/build.cc b/src/libstore/build.cc
index 4137c47e5..30077556d 100644
--- a/src/libstore/build.cc
+++ b/src/libstore/build.cc
@@ -2580,6 +2580,7 @@ void DerivationGoal::writeStructuredAttrs()
     }
 
     writeFile(tmpDir + "/.attrs.json", rewriteStrings(json.dump(), inputRewrites));
+    chownToBuilder(tmpDir + "/.attrs.json");
 
     /* As a convenience to bash scripts, write a shell file that
        maps all attributes that are representable in bash -
@@ -2648,6 +2649,7 @@ void DerivationGoal::writeStructuredAttrs()
     }
 
     writeFile(tmpDir + "/.attrs.sh", rewriteStrings(jsonSh, inputRewrites));
+    chownToBuilder(tmpDir + "/.attrs.sh");
 }
 
 
diff --git a/src/libstore/path.hh b/src/libstore/path.hh
index 6b29c3566..c31ea2179 100644
--- a/src/libstore/path.hh
+++ b/src/libstore/path.hh
@@ -7,7 +7,7 @@ namespace nix {
 /* See path.rs. */
 struct StorePath;
 
-struct Store;
+class Store;
 
 extern "C" {
     void ffi_StorePath_drop(void *);