--- a/hotspot/src/share/vm/gc/g1/g1CollectedHeap.hpp	Fri Jun 23 15:16:23 2017 -0700
+++ b/hotspot/src/share/vm/gc/g1/g1CollectedHeap.hpp	Thu Jun 22 09:07:47 2017 +0200
@@ -89,6 +89,8 @@
 class G1ArchiveAllocator;
 class G1HeapVerifier;
 class G1HeapSizingPolicy;
+class G1HeapSummary;
+class G1EvacSummary;
 
 typedef OverflowTaskQueue<StarTask, mtGC>         RefToScanQueue;
 typedef GenericTaskQueueSet<RefToScanQueue, mtGC> RefToScanQueueSet;

--- a/hotspot/src/share/vm/gc/g1/g1ParScanThreadState.cpp	Fri Jun 23 15:16:23 2017 -0700
+++ b/hotspot/src/share/vm/gc/g1/g1ParScanThreadState.cpp	Thu Jun 22 09:07:47 2017 +0200
@@ -30,6 +30,7 @@
 #include "gc/g1/g1ParScanThreadState.inline.hpp"
 #include "gc/g1/g1RootClosures.hpp"
 #include "gc/g1/g1StringDedup.hpp"
+#include "gc/shared/gcTrace.hpp"
 #include "gc/shared/taskqueue.inline.hpp"
 #include "oops/oop.inline.hpp"
 #include "runtime/prefetch.inline.hpp"

--- a/hotspot/src/share/vm/gc/parallel/generationSizer.cpp	Fri Jun 23 15:16:23 2017 -0700
+++ b/hotspot/src/share/vm/gc/parallel/generationSizer.cpp	Thu Jun 22 09:07:47 2017 +0200
@@ -25,6 +25,8 @@
 #include "precompiled.hpp"
 #include "gc/parallel/generationSizer.hpp"
 #include "gc/shared/collectorPolicy.hpp"
+#include "runtime/globals_extension.hpp"
+#include "utilities/globalDefinitions.hpp"
 
 void GenerationSizer::initialize_alignments() {
   _space_alignment = _gen_alignment = default_gen_alignment();

--- a/hotspot/src/share/vm/gc/serial/tenuredGeneration.cpp	Fri Jun 23 15:16:23 2017 -0700
+++ b/hotspot/src/share/vm/gc/serial/tenuredGeneration.cpp	Thu Jun 22 09:07:47 2017 +0200
@@ -29,6 +29,7 @@
 #include "gc/shared/cardGeneration.inline.hpp"
 #include "gc/shared/collectorCounters.hpp"
 #include "gc/shared/gcTimer.hpp"
+#include "gc/shared/gcTrace.hpp"
 #include "gc/shared/genOopClosures.inline.hpp"
 #include "gc/shared/generationSpec.hpp"
 #include "gc/shared/space.hpp"

--- a/hotspot/src/share/vm/gc/shared/referenceProcessor.hpp	Fri Jun 23 15:16:23 2017 -0700
+++ b/hotspot/src/share/vm/gc/shared/referenceProcessor.hpp	Thu Jun 22 09:07:47 2017 +0200
@@ -25,7 +25,6 @@
 #ifndef SHARE_VM_GC_SHARED_REFERENCEPROCESSOR_HPP
 #define SHARE_VM_GC_SHARED_REFERENCEPROCESSOR_HPP
 
-#include "gc/shared/gcTrace.hpp"
 #include "gc/shared/referencePolicy.hpp"
 #include "gc/shared/referenceProcessorStats.hpp"
 #include "memory/referenceType.hpp"

--- a/hotspot/src/share/vm/runtime/commandLineFlagConstraintList.cpp	Fri Jun 23 15:16:23 2017 -0700
+++ b/hotspot/src/share/vm/runtime/commandLineFlagConstraintList.cpp	Thu Jun 22 09:07:47 2017 +0200
@@ -33,6 +33,10 @@
 #include "runtime/commandLineFlagConstraintsRuntime.hpp"
 #include "runtime/os.hpp"
 #include "utilities/macros.hpp"
+#if INCLUDE_ALL_GCS
+#include "gc/g1/g1_globals.hpp"
+#endif
+
 class CommandLineFlagConstraint_bool : public CommandLineFlagConstraint {
   CommandLineFlagConstraintFunc_bool _constraint;
   const bool* _ptr;

--- a/hotspot/test/native/gc/shared/test_collectorPolicy.cpp	Fri Jun 23 15:16:23 2017 -0700
+++ b/hotspot/test/native/gc/shared/test_collectorPolicy.cpp	Thu Jun 22 09:07:47 2017 +0200
@@ -23,8 +23,11 @@
 
 #include "precompiled.hpp"
 #include "gc/shared/collectorPolicy.hpp"
+#include "runtime/arguments.hpp"
+#include "runtime/globals_extension.hpp"
+#include "utilities/globalDefinitions.hpp"
+#include "utilities/macros.hpp"
 #include "unittest.hpp"
-#include "utilities/macros.hpp"
 
 class TestGenCollectorPolicy {
  public: