diff --git a/js/src/jsobj.h b/js/src/jsobj.h
index e85909c0b645..dd284cfcbad1 100644
--- a/js/src/jsobj.h
+++ b/js/src/jsobj.h
@@ -455,7 +455,7 @@ struct JSObject : js::gc::Cell
     friend class nanojit::ValidateWriter;
 
   private:
-    friend class js::Shape;
+    friend struct js::Shape;
 
     /*
      * Private pointer to the last added property and methods to manipulate the
diff --git a/js/src/jsscope.h b/js/src/jsscope.h
index 43614923e788..0e59cb71b08f 100644
--- a/js/src/jsscope.h
+++ b/js/src/jsscope.h
@@ -335,7 +335,7 @@ class UnownedBaseShape;
 class BaseShape : public js::gc::Cell
 {
   public:
-    friend class Shape;
+    friend struct Shape;
     friend struct JSCompartment::BaseShapeEntry;
 
     enum Flag {