--- old/src/hotspot/os/windows/attachListener_windows.cpp	2018-04-27 15:29:22.074203674 +0200
+++ new/src/hotspot/os/windows/attachListener_windows.cpp	2018-04-27 15:29:21.830203682 +0200
@@ -23,6 +23,7 @@
  */
 
 #include "precompiled.hpp"
+#include "logging/log.hpp"
 #include "runtime/interfaceSupport.inline.hpp"
 #include "runtime/os.hpp"
 #include "services/attachListener.hpp"
--- old/src/hotspot/share/classfile/classLoader.cpp	2018-04-27 15:29:22.462203660 +0200
+++ new/src/hotspot/share/classfile/classLoader.cpp	2018-04-27 15:29:22.210203669 +0200
@@ -37,8 +37,6 @@
 #include "classfile/systemDictionary.hpp"
 #include "classfile/vmSymbols.hpp"
 #include "compiler/compileBroker.hpp"
-#include "gc/shared/collectedHeap.inline.hpp"
-#include "gc/shared/generation.hpp"
 #include "interpreter/bytecodeStream.hpp"
 #include "interpreter/oopMapCache.hpp"
 #include "logging/log.hpp"
--- old/src/hotspot/share/classfile/symbolTable.cpp	2018-04-27 15:29:22.878203646 +0200
+++ new/src/hotspot/share/classfile/symbolTable.cpp	2018-04-27 15:29:22.630203655 +0200
@@ -29,7 +29,6 @@
 #include "classfile/symbolTable.hpp"
 #include "classfile/systemDictionary.hpp"
 #include "gc/shared/collectedHeap.inline.hpp"
-#include "gc/shared/gcLocker.hpp"
 #include "memory/allocation.inline.hpp"
 #include "memory/filemap.hpp"
 #include "memory/metaspaceClosure.hpp"
--- old/src/hotspot/share/gc/cms/concurrentMarkSweepGeneration.hpp	2018-04-27 15:29:23.270203632 +0200
+++ new/src/hotspot/share/gc/cms/concurrentMarkSweepGeneration.hpp	2018-04-27 15:29:23.026203641 +0200
@@ -69,7 +69,6 @@
 class ParNewGeneration;
 class PromotionInfo;
 class ScanMarkedObjectsAgainCarefullyClosure;
-class TenuredGeneration;
 class SerialOldTracer;
 
 // A generic CMS bit map. It's the basis for both the CMS marking bit map
--- old/src/hotspot/share/gc/g1/g1Arguments.cpp	2018-04-27 15:29:23.678203618 +0200
+++ new/src/hotspot/share/gc/g1/g1Arguments.cpp	2018-04-27 15:29:23.430203627 +0200
@@ -81,11 +81,9 @@
     vm_exit_during_initialization("The flag -XX:+UseG1GC can not be combined with -XX:ParallelGCThreads=0", NULL);
   }
 
-#if INCLUDE_ALL_GCS
   if (FLAG_IS_DEFAULT(G1ConcRefinementThreads)) {
     FLAG_SET_ERGO(uint, G1ConcRefinementThreads, ParallelGCThreads);
   }
-#endif
 
   // MarkStackSize will be set (if it hasn't been set by the user)
   // when concurrent marking is initialized.
--- old/src/hotspot/share/gc/g1/g1FullGCMarker.cpp	2018-04-27 15:29:24.054203605 +0200
+++ new/src/hotspot/share/gc/g1/g1FullGCMarker.cpp	2018-04-27 15:29:23.810203613 +0200
@@ -24,6 +24,7 @@
 
 #include "precompiled.hpp"
 #include "gc/g1/g1FullGCMarker.inline.hpp"
+#include "gc/shared/referenceProcessor.hpp"
 
 G1FullGCMarker::G1FullGCMarker(uint worker_id, PreservedMarks* preserved_stack, G1CMBitMap* bitmap) :
     _worker_id(worker_id),
--- old/src/hotspot/share/gc/g1/g1MonitoringSupport.cpp	2018-04-27 15:29:24.430203592 +0200
+++ new/src/hotspot/share/gc/g1/g1MonitoringSupport.cpp	2018-04-27 15:29:24.186203600 +0200
@@ -26,6 +26,7 @@
 #include "gc/g1/g1CollectedHeap.inline.hpp"
 #include "gc/g1/g1MonitoringSupport.hpp"
 #include "gc/g1/g1Policy.hpp"
+#include "gc/shared/collectorCounters.hpp"
 #include "gc/shared/hSpaceCounters.hpp"
 #include "memory/metaspaceCounters.hpp"
 
--- old/src/hotspot/share/gc/g1/g1RootProcessor.cpp	2018-04-27 15:29:24.814203578 +0200
+++ new/src/hotspot/share/gc/g1/g1RootProcessor.cpp	2018-04-27 15:29:24.566203587 +0200
@@ -38,6 +38,7 @@
 #include "gc/g1/g1RootClosures.hpp"
 #include "gc/g1/g1RootProcessor.hpp"
 #include "gc/g1/heapRegion.inline.hpp"
+#include "gc/shared/referenceProcessor.hpp"
 #include "gc/shared/weakProcessor.hpp"
 #include "memory/allocation.inline.hpp"
 #include "runtime/mutex.hpp"
--- old/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp	2018-04-27 15:29:25.190203565 +0200
+++ new/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp	2018-04-27 15:29:24.946203574 +0200
@@ -48,6 +48,7 @@
 #include "runtime/vmThread.hpp"
 #include "services/memoryManager.hpp"
 #include "services/memTracker.hpp"
+#include "utilities/macros.hpp"
 #include "utilities/vmError.hpp"
 
 PSYoungGen*  ParallelScavengeHeap::_young_gen = NULL;
--- old/src/hotspot/share/gc/parallel/psParallelCompact.cpp	2018-04-27 15:29:25.578203552 +0200
+++ new/src/hotspot/share/gc/parallel/psParallelCompact.cpp	2018-04-27 15:29:25.334203560 +0200
@@ -34,8 +34,6 @@
 #include "gc/parallel/pcTasks.hpp"
 #include "gc/parallel/psAdaptiveSizePolicy.hpp"
 #include "gc/parallel/psCompactionManager.inline.hpp"
-#include "gc/parallel/psMarkSweep.hpp"
-#include "gc/parallel/psMarkSweepDecorator.hpp"
 #include "gc/parallel/psOldGen.hpp"
 #include "gc/parallel/psParallelCompact.inline.hpp"
 #include "gc/parallel/psPromotionManager.inline.hpp"
@@ -72,6 +70,7 @@
 #include "utilities/debug.hpp"
 #include "utilities/events.hpp"
 #include "utilities/formatBuffer.hpp"
+#include "utilities/macros.hpp"
 #include "utilities/stack.inline.hpp"
 
 #include <math.h>
--- old/src/hotspot/share/gc/parallel/psTasks.cpp	2018-04-27 15:29:26.006203537 +0200
+++ new/src/hotspot/share/gc/parallel/psTasks.cpp	2018-04-27 15:29:25.766203545 +0200
@@ -27,7 +27,6 @@
 #include "classfile/systemDictionary.hpp"
 #include "code/codeCache.hpp"
 #include "gc/parallel/gcTaskManager.hpp"
-#include "gc/parallel/psMarkSweep.hpp"
 #include "gc/parallel/psCardTable.hpp"
 #include "gc/parallel/psPromotionManager.hpp"
 #include "gc/parallel/psPromotionManager.inline.hpp"
--- old/src/hotspot/share/gc/parallel/vmPSOperations.cpp	2018-04-27 15:29:26.370203524 +0200
+++ new/src/hotspot/share/gc/parallel/vmPSOperations.cpp	2018-04-27 15:29:26.122203533 +0200
@@ -24,7 +24,6 @@
 
 #include "precompiled.hpp"
 #include "gc/parallel/parallelScavengeHeap.inline.hpp"
-#include "gc/parallel/psMarkSweep.hpp"
 #include "gc/parallel/psScavenge.hpp"
 #include "gc/parallel/vmPSOperations.hpp"
 #include "gc/shared/gcLocker.hpp"
--- old/src/hotspot/share/gc/shared/c1/cardTableBarrierSetC1.cpp	2018-04-27 15:29:26.750203511 +0200
+++ new/src/hotspot/share/gc/shared/c1/cardTableBarrierSetC1.cpp	2018-04-27 15:29:26.502203520 +0200
@@ -24,6 +24,7 @@
 
 #include "precompiled.hpp"
 #include "gc/shared/c1/cardTableBarrierSetC1.hpp"
+#include "gc/shared/cardTable.hpp"
 #include "gc/shared/cardTableBarrierSet.hpp"
 #include "utilities/macros.hpp"
 
--- old/src/hotspot/share/gc/shared/cardGeneration.cpp	2018-04-27 15:29:27.126203498 +0200
+++ new/src/hotspot/share/gc/shared/cardGeneration.cpp	2018-04-27 15:29:26.882203506 +0200
@@ -208,7 +208,7 @@
 
     const size_t free_after_gc = free();
     const double free_percentage = ((double)free_after_gc) / capacity_after_gc;
-    log_trace(gc, heap)("TenuredGeneration::compute_new_size:");
+    log_trace(gc, heap)("CardGeneration::compute_new_size:");
     log_trace(gc, heap)("    minimum_free_percentage: %6.2f  maximum_used_percentage: %6.2f",
                   minimum_free_percentage,
                   maximum_used_percentage);
--- old/src/hotspot/share/gc/shared/cardTableRS.cpp	2018-04-27 15:29:27.486203485 +0200
+++ new/src/hotspot/share/gc/shared/cardTableRS.cpp	2018-04-27 15:29:27.242203494 +0200
@@ -25,6 +25,7 @@
 #include "precompiled.hpp"
 #include "gc/shared/cardTableRS.hpp"
 #include "gc/shared/genCollectedHeap.hpp"
+#include "gc/shared/genOopClosures.hpp"
 #include "gc/shared/generation.hpp"
 #include "gc/shared/space.inline.hpp"
 #include "memory/allocation.inline.hpp"
--- old/src/hotspot/share/gc/shared/gcName.hpp	2018-04-27 15:29:27.862203472 +0200
+++ new/src/hotspot/share/gc/shared/gcName.hpp	2018-04-27 15:29:27.618203481 +0200
@@ -30,7 +30,6 @@
 enum GCName {
   ParallelOld,
   SerialOld,
-  PSMarkSweep,
   ParallelScavenge,
   DefNew,
   ParNew,
@@ -47,7 +46,6 @@
     switch(name) {
       case ParallelOld: return "ParallelOld";
       case SerialOld: return "SerialOld";
-      case PSMarkSweep: return "PSMarkSweep";
       case ParallelScavenge: return "ParallelScavenge";
       case DefNew: return "DefNew";
       case ParNew: return "ParNew";
--- old/src/hotspot/share/gc/shared/genCollectedHeap.cpp	2018-04-27 15:29:28.194203461 +0200
+++ new/src/hotspot/share/gc/shared/genCollectedHeap.cpp	2018-04-27 15:29:27.954203469 +0200
@@ -30,6 +30,7 @@
 #include "classfile/vmSymbols.hpp"
 #include "code/codeCache.hpp"
 #include "code/icBuffer.hpp"
+#include "gc/serial/defNewGeneration.hpp"
 #include "gc/shared/adaptiveSizePolicy.hpp"
 #include "gc/shared/cardTableBarrierSet.hpp"
 #include "gc/shared/cardTableRS.hpp"
--- old/src/hotspot/share/gc/shared/preservedMarks.inline.hpp	2018-04-27 15:29:28.574203448 +0200
+++ new/src/hotspot/share/gc/shared/preservedMarks.inline.hpp	2018-04-27 15:29:28.330203456 +0200
@@ -26,6 +26,7 @@
 #define SHARE_VM_GC_SHARED_PRESERVEDMARKS_INLINE_HPP
 
 #include "gc/shared/preservedMarks.hpp"
+#include "logging/log.hpp"
 #include "oops/oop.inline.hpp"
 #include "utilities/stack.inline.hpp"
 
--- old/src/hotspot/share/gc/shared/vmStructs_gc.hpp	2018-04-27 15:29:28.970203434 +0200
+++ new/src/hotspot/share/gc/shared/vmStructs_gc.hpp	2018-04-27 15:29:28.722203442 +0200
@@ -25,6 +25,7 @@
 #ifndef SHARE_GC_SHARED_VMSTRUCTS_GC_HPP
 #define SHARE_GC_SHARED_VMSTRUCTS_GC_HPP
 
+#include "gc/shared/ageTable.hpp"
 #include "gc/shared/cardGeneration.hpp"
 #include "gc/shared/cardTableRS.hpp"
 #include "gc/shared/collectedHeap.hpp"
--- old/src/hotspot/share/memory/universe.cpp	2018-04-27 15:29:29.358203420 +0200
+++ new/src/hotspot/share/memory/universe.cpp	2018-04-27 15:29:29.110203429 +0200
@@ -32,14 +32,10 @@
 #include "classfile/vmSymbols.hpp"
 #include "code/codeCache.hpp"
 #include "code/dependencies.hpp"
-#include "gc/shared/cardTableBarrierSet.hpp"
 #include "gc/shared/collectedHeap.inline.hpp"
 #include "gc/shared/gcArguments.hpp"
 #include "gc/shared/gcConfig.hpp"
-#include "gc/shared/gcLocker.hpp"
-#include "gc/shared/generation.hpp"
 #include "gc/shared/gcTraceTime.inline.hpp"
-#include "gc/shared/space.hpp"
 #include "interpreter/interpreter.hpp"
 #include "logging/log.hpp"
 #include "logging/logStream.hpp"
--- old/src/hotspot/share/oops/method.cpp	2018-04-27 15:29:29.758203406 +0200
+++ new/src/hotspot/share/oops/method.cpp	2018-04-27 15:29:29.514203415 +0200
@@ -28,7 +28,6 @@
 #include "code/codeCache.hpp"
 #include "code/debugInfoRec.hpp"
 #include "gc/shared/collectedHeap.inline.hpp"
-#include "gc/shared/generation.hpp"
 #include "interpreter/bytecodeStream.hpp"
 #include "interpreter/bytecodeTracer.hpp"
 #include "interpreter/bytecodes.hpp"
--- old/src/hotspot/share/oops/oop.inline.hpp	2018-04-27 15:29:30.134203393 +0200
+++ new/src/hotspot/share/oops/oop.inline.hpp	2018-04-27 15:29:29.890203402 +0200
@@ -25,9 +25,7 @@
 #ifndef SHARE_VM_OOPS_OOP_INLINE_HPP
 #define SHARE_VM_OOPS_OOP_INLINE_HPP
 
-#include "gc/shared/ageTable.hpp"
 #include "gc/shared/collectedHeap.hpp"
-#include "gc/shared/generation.hpp"
 #include "oops/access.inline.hpp"
 #include "oops/arrayKlass.hpp"
 #include "oops/arrayOop.hpp"
--- old/src/hotspot/share/opto/graphKit.cpp	2018-04-27 15:29:30.462203382 +0200
+++ new/src/hotspot/share/opto/graphKit.cpp	2018-04-27 15:29:30.222203390 +0200
@@ -49,7 +49,9 @@
 #include "runtime/deoptimization.hpp"
 #include "runtime/sharedRuntime.hpp"
 #if INCLUDE_ALL_GCS
+#include "gc/g1/g1CardTable.hpp"
 #include "gc/g1/g1ThreadLocalData.hpp"
+#include "gc/g1/heapRegion.hpp"
 #endif // INCLUDE_ALL_GCS
 
 //----------------------------GraphKit-----------------------------------------
--- old/src/hotspot/share/prims/forte.cpp	2018-04-27 15:29:30.870203368 +0200
+++ new/src/hotspot/share/prims/forte.cpp	2018-04-27 15:29:30.618203376 +0200
@@ -26,7 +26,6 @@
 #include "code/debugInfoRec.hpp"
 #include "code/pcDesc.hpp"
 #include "gc/shared/collectedHeap.inline.hpp"
-#include "gc/shared/space.hpp"
 #include "memory/universe.hpp"
 #include "oops/oop.inline.hpp"
 #include "prims/forte.hpp"
--- old/src/hotspot/share/prims/jni.cpp	2018-04-27 15:29:31.214203356 +0200
+++ new/src/hotspot/share/prims/jni.cpp	2018-04-27 15:29:30.970203364 +0200
@@ -38,6 +38,7 @@
 #include "classfile/vmSymbols.hpp"
 #include "gc/shared/gcLocker.inline.hpp"
 #include "interpreter/linkResolver.hpp"
+#include "logging/log.hpp"
 #include "memory/allocation.hpp"
 #include "memory/allocation.inline.hpp"
 #include "memory/oopFactory.hpp"
--- old/src/hotspot/share/prims/jvmtiExport.cpp	2018-04-27 15:29:31.650203340 +0200
+++ new/src/hotspot/share/prims/jvmtiExport.cpp	2018-04-27 15:29:31.406203349 +0200
@@ -59,9 +59,6 @@
 #include "runtime/threadSMR.hpp"
 #include "runtime/vframe.inline.hpp"
 #include "utilities/macros.hpp"
-#if INCLUDE_ALL_GCS
-#include "gc/parallel/psMarkSweep.hpp"
-#endif // INCLUDE_ALL_GCS
 
 #ifdef JVMTI_TRACE
 #define EVT_TRACE(evt,out) if ((JvmtiTrace::event_trace_flags(evt) & JvmtiTrace::SHOW_EVENT_SENT) != 0) { SafeResourceMark rm; log_trace(jvmti) out; }
--- old/src/hotspot/share/prims/jvmtiTagMap.cpp	2018-04-27 15:29:32.054203326 +0200
+++ new/src/hotspot/share/prims/jvmtiTagMap.cpp	2018-04-27 15:29:31.810203335 +0200
@@ -29,6 +29,7 @@
 #include "classfile/vmSymbols.hpp"
 #include "code/codeCache.hpp"
 #include "jvmtifiles/jvmtiEnv.hpp"
+#include "logging/log.hpp"
 #include "memory/allocation.inline.hpp"
 #include "memory/resourceArea.hpp"
 #include "oops/access.inline.hpp"
--- old/src/hotspot/share/prims/methodComparator.cpp	2018-04-27 15:29:32.482203311 +0200
+++ new/src/hotspot/share/prims/methodComparator.cpp	2018-04-27 15:29:32.238203320 +0200
@@ -23,6 +23,7 @@
  */
 
 #include "precompiled.hpp"
+#include "logging/log.hpp"
 #include "memory/resourceArea.hpp"
 #include "oops/constantPool.inline.hpp"
 #include "oops/oop.inline.hpp"
--- old/src/hotspot/share/prims/resolvedMethodTable.cpp	2018-04-27 15:29:32.810203300 +0200
+++ new/src/hotspot/share/prims/resolvedMethodTable.cpp	2018-04-27 15:29:32.574203308 +0200
@@ -24,6 +24,7 @@
 
 #include "precompiled.hpp"
 #include "classfile/javaClasses.hpp"
+#include "logging/log.hpp"
 #include "memory/allocation.hpp"
 #include "memory/resourceArea.hpp"
 #include "oops/access.inline.hpp"
--- old/src/hotspot/share/runtime/flags/jvmFlagWriteableList.cpp	2018-04-27 15:29:33.166203288 +0200
+++ new/src/hotspot/share/runtime/flags/jvmFlagWriteableList.cpp	2018-04-27 15:29:32.922203296 +0200
@@ -23,7 +23,6 @@
  */
 
 #include "precompiled.hpp"
-#include "gc/shared/plab.hpp"
 #include "runtime/flags/jvmFlagWriteableList.hpp"
 #include "runtime/os.hpp"
 #ifdef COMPILER1
--- old/src/hotspot/share/runtime/java.cpp	2018-04-27 15:29:33.510203276 +0200
+++ new/src/hotspot/share/runtime/java.cpp	2018-04-27 15:29:33.274203284 +0200
@@ -74,10 +74,6 @@
 #include "utilities/histogram.hpp"
 #include "utilities/macros.hpp"
 #include "utilities/vmError.hpp"
-#if INCLUDE_ALL_GCS
-#include "gc/cms/concurrentMarkSweepThread.hpp"
-#include "gc/parallel/psScavenge.hpp"
-#endif // INCLUDE_ALL_GCS
 #ifdef COMPILER1
 #include "c1/c1_Compiler.hpp"
 #include "c1/c1_Runtime1.hpp"
--- old/src/hotspot/share/runtime/memprofiler.cpp	2018-04-27 15:29:33.870203263 +0200
+++ new/src/hotspot/share/runtime/memprofiler.cpp	2018-04-27 15:29:33.626203272 +0200
@@ -27,7 +27,6 @@
 #include "classfile/systemDictionary.hpp"
 #include "code/codeCache.hpp"
 #include "gc/shared/collectedHeap.inline.hpp"
-#include "gc/shared/generation.hpp"
 #include "interpreter/oopMapCache.hpp"
 #include "memory/resourceArea.hpp"
 #include "runtime/handles.inline.hpp"
--- old/src/hotspot/share/runtime/reflection.cpp	2018-04-27 15:29:34.246203250 +0200
+++ new/src/hotspot/share/runtime/reflection.cpp	2018-04-27 15:29:34.002203258 +0200
@@ -32,6 +32,7 @@
 #include "classfile/verifier.hpp"
 #include "classfile/vmSymbols.hpp"
 #include "interpreter/linkResolver.hpp"
+#include "logging/log.hpp"
 #include "memory/oopFactory.hpp"
 #include "memory/resourceArea.hpp"
 #include "memory/universe.hpp"
--- old/src/hotspot/share/runtime/thread.hpp	2018-04-27 15:29:34.594203238 +0200
+++ new/src/hotspot/share/runtime/thread.hpp	2018-04-27 15:29:34.358203246 +0200
@@ -32,6 +32,7 @@
 #include "oops/oop.hpp"
 #include "prims/jvmtiExport.hpp"
 #include "runtime/frame.hpp"
+#include "runtime/globals.hpp"
 #include "runtime/handshake.hpp"
 #include "runtime/javaFrameAnchor.hpp"
 #include "runtime/jniHandles.hpp"
--- old/src/hotspot/share/runtime/thread.inline.hpp	2018-04-27 15:29:34.970203225 +0200
+++ new/src/hotspot/share/runtime/thread.inline.hpp	2018-04-27 15:29:34.726203233 +0200
@@ -26,6 +26,7 @@
 #define SHARE_VM_RUNTIME_THREAD_INLINE_HPP
 
 #include "runtime/atomic.hpp"
+#include "runtime/globals.hpp"
 #include "runtime/orderAccess.inline.hpp"
 #include "runtime/os.inline.hpp"
 #include "runtime/thread.hpp"
--- old/src/hotspot/share/runtime/unhandledOops.cpp	2018-04-27 15:29:35.338203212 +0200
+++ new/src/hotspot/share/runtime/unhandledOops.cpp	2018-04-27 15:29:35.098203220 +0200
@@ -24,7 +24,6 @@
 
 #include "precompiled.hpp"
 #include "gc/shared/collectedHeap.hpp"
-#include "gc/shared/gcLocker.hpp"
 #include "memory/universe.hpp"
 #include "oops/oop.inline.hpp"
 #include "runtime/thread.hpp"
--- old/src/hotspot/share/utilities/hashtable.cpp	2018-04-27 15:29:35.714203199 +0200
+++ new/src/hotspot/share/utilities/hashtable.cpp	2018-04-27 15:29:35.466203207 +0200
@@ -31,6 +31,7 @@
 #include "classfile/placeholders.hpp"
 #include "classfile/protectionDomainCache.hpp"
 #include "classfile/stringTable.hpp"
+#include "logging/log.hpp"
 #include "memory/allocation.inline.hpp"
 #include "memory/metaspaceShared.hpp"
 #include "memory/resourceArea.hpp"