8229873: 8229401 broke jdk8u-jfr-incubator

Reviewed-by: neugens

src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp

@@ -38,6 +38,7 @@
 #include "gc_implementation/g1/g1YCTypes.hpp"
 #include "gc_implementation/g1/heapRegionManager.hpp"
 #include "gc_implementation/g1/heapRegionSet.hpp"
+#include "gc_implementation/shared/gcHeapSummary.hpp"
 #include "gc_implementation/shared/hSpaceCounters.hpp"
 #include "gc_implementation/shared/parGCAllocBuffer.hpp"
 #include "memory/barrierSet.hpp"

src/share/vm/jfr/recorder/checkpoint/types/jfrType.cpp

@@ -55,7 +55,7 @@
 #include "opto/node.hpp"
 #endif
 #if INCLUDE_ALL_GCS
-//#include "gc_implementation/g1/g1HeapRegionTraceType.hpp"
+#include "gc_implementation/g1/g1HeapRegionTraceType.hpp"
 #include "gc_implementation/g1/g1YCTypes.hpp"
 #endif