diff --git a/js/src/jsparse.h b/js/src/jsparse.h
index fa9b1274091..ad1d6e4c48b 100644
--- a/js/src/jsparse.h
+++ b/js/src/jsparse.h
@@ -908,8 +908,6 @@ struct JSFunctionBoxQueue {
 
 #define NUM_TEMP_FREELISTS      6U      /* 32 to 2048 byte size classes (32 bit) */
 
-class JSTreeContext;
-
 typedef struct BindData BindData;
 
 struct JSCompiler : private js::AutoGCRooter {
@@ -940,7 +938,7 @@ struct JSCompiler : private js::AutoGCRooter {
     ~JSCompiler();
 
     friend void js::AutoGCRooter::trace(JSTracer *trc);
-    friend class JSTreeContext;
+    friend struct JSTreeContext;
 
     /*
      * Initialize a compiler. Parameters are passed on to init tokenStream.
diff --git a/js/src/jsprvtd.h b/js/src/jsprvtd.h
index f8a9f9e1187..f6355713d07 100644
--- a/js/src/jsprvtd.h
+++ b/js/src/jsprvtd.h
@@ -144,7 +144,7 @@ class TraceRecorder;
 struct TraceMonitor;
 class CallStack;
 
-struct TokenStream;
+class TokenStream;
 struct Token;
 struct TokenPos;
 struct TokenPtr;