--- a/js/src/gc/ForkJoinNursery-inl.h
+++ b/js/src/gc/ForkJoinNursery-inl.h
@@ -7,16 +7,18 @@
 
 #ifndef gc_ForkJoinNursery_inl_h
 #define gc_ForkJoinNursery_inl_h
 
 #ifdef JSGC_FJGENERATIONAL
 
 #include "gc/ForkJoinNursery.h"
 
+#include "jsgc.h"
+
 namespace js {
 namespace gc {
 
 // For the following two predicates we can't check the attributes on
 // the chunk trailer because it's not known whether addr points into a
 // chunk.
 //
 // A couple of optimizations are possible if performance is an issue:

--- a/js/src/gc/ForkJoinNursery.h
+++ b/js/src/gc/ForkJoinNursery.h
@@ -31,16 +31,17 @@ class ForkJoinShared;
 }
 
 namespace js {
 namespace gc {
 
 class ForkJoinGCShared;
 class ForkJoinNursery;
 class ForkJoinNurseryCollectionTracer;
+class RelocationOverlay;
 
 // This tracer comes into play when a class has a tracer function, but
 // is otherwise unused and has no other functionality.
 //
 // It could look like this could be merged into ForkJoinNursery by
 // making the latter derive from JSTracer; I've decided to keep them
 // separate for now, since it allows for multiple instantiations of
 // this class with different parameters, for different purposes.  That