--- old/src/hotspot/cpu/aarch64/nativeInst_aarch64.hpp	2018-03-27 08:32:36.226202415 -0400
+++ new/src/hotspot/cpu/aarch64/nativeInst_aarch64.hpp	2018-03-27 08:32:35.619146329 -0400
@@ -27,7 +27,6 @@
 #define CPU_AARCH64_VM_NATIVEINST_AARCH64_HPP
 
 #include "asm/assembler.hpp"
-#include "memory/allocation.hpp"
 #include "runtime/icache.hpp"
 #include "runtime/os.hpp"
 
--- old/src/hotspot/cpu/arm/nativeInst_arm.hpp	2018-03-27 08:32:36.945268851 -0400
+++ new/src/hotspot/cpu/arm/nativeInst_arm.hpp	2018-03-27 08:32:36.345213411 -0400
@@ -26,7 +26,6 @@
 #define CPU_ARM_VM_NATIVEINST_ARM_HPP
 
 #include "asm/macroAssembler.hpp"
-#include "memory/allocation.hpp"
 #include "runtime/icache.hpp"
 #include "runtime/os.hpp"
 
--- old/src/hotspot/cpu/arm/nativeInst_arm_32.hpp	2018-03-27 08:32:37.630332145 -0400
+++ new/src/hotspot/cpu/arm/nativeInst_arm_32.hpp	2018-03-27 08:32:37.030276705 -0400
@@ -27,7 +27,6 @@
 
 #include "asm/macroAssembler.hpp"
 #include "code/codeCache.hpp"
-#include "memory/allocation.hpp"
 #include "runtime/icache.hpp"
 #include "runtime/os.hpp"
 #include "runtime/thread.hpp"
--- old/src/hotspot/cpu/arm/nativeInst_arm_64.hpp	2018-03-27 08:32:38.326396456 -0400
+++ new/src/hotspot/cpu/arm/nativeInst_arm_64.hpp	2018-03-27 08:32:37.724340831 -0400
@@ -27,7 +27,6 @@
 
 #include "asm/macroAssembler.hpp"
 #include "code/codeCache.hpp"
-#include "memory/allocation.hpp"
 #include "runtime/icache.hpp"
 #include "runtime/os.hpp"
 
--- old/src/hotspot/cpu/ppc/nativeInst_ppc.hpp	2018-03-27 08:32:39.028461321 -0400
+++ new/src/hotspot/cpu/ppc/nativeInst_ppc.hpp	2018-03-27 08:32:38.427405788 -0400
@@ -27,7 +27,6 @@
 #define CPU_PPC_VM_NATIVEINST_PPC_HPP
 
 #include "asm/macroAssembler.hpp"
-#include "memory/allocation.hpp"
 #include "runtime/icache.hpp"
 #include "runtime/os.hpp"
 #include "runtime/safepointMechanism.hpp"
--- old/src/hotspot/cpu/s390/nativeInst_s390.hpp	2018-03-27 08:32:39.727525908 -0400
+++ new/src/hotspot/cpu/s390/nativeInst_s390.hpp	2018-03-27 08:32:39.125470283 -0400
@@ -29,7 +29,6 @@
 #define CPU_S390_VM_NATIVEINST_S390_HPP
 
 #include "asm/macroAssembler.hpp"
-#include "memory/allocation.hpp"
 #include "runtime/icache.hpp"
 #include "runtime/os.hpp"
 
--- old/src/hotspot/cpu/sparc/nativeInst_sparc.hpp	2018-03-27 08:32:40.428590681 -0400
+++ new/src/hotspot/cpu/sparc/nativeInst_sparc.hpp	2018-03-27 08:32:39.827535148 -0400
@@ -26,7 +26,6 @@
 #define CPU_SPARC_VM_NATIVEINST_SPARC_HPP
 
 #include "asm/macroAssembler.hpp"
-#include "memory/allocation.hpp"
 #include "runtime/icache.hpp"
 #include "runtime/os.hpp"
 
--- old/src/hotspot/cpu/x86/nativeInst_x86.hpp	2018-03-27 08:32:41.130655546 -0400
+++ new/src/hotspot/cpu/x86/nativeInst_x86.hpp	2018-03-27 08:32:40.530600105 -0400
@@ -26,7 +26,6 @@
 #define CPU_X86_VM_NATIVEINST_X86_HPP
 
 #include "asm/assembler.hpp"
-#include "memory/allocation.hpp"
 #include "runtime/icache.hpp"
 #include "runtime/os.hpp"
 #include "runtime/safepointMechanism.hpp"
--- old/src/hotspot/cpu/zero/nativeInst_zero.hpp	2018-03-27 08:32:41.829720133 -0400
+++ new/src/hotspot/cpu/zero/nativeInst_zero.hpp	2018-03-27 08:32:41.228664601 -0400
@@ -27,7 +27,6 @@
 #define CPU_ZERO_VM_NATIVEINST_ZERO_HPP
 
 #include "asm/assembler.hpp"
-#include "memory/allocation.hpp"
 #include "runtime/icache.hpp"
 #include "runtime/os.hpp"
 
--- old/src/hotspot/share/c1/c1_FpuStackSim.hpp	2018-03-27 08:32:42.516783612 -0400
+++ new/src/hotspot/share/c1/c1_FpuStackSim.hpp	2018-03-27 08:32:41.915728080 -0400
@@ -26,7 +26,6 @@
 #define SHARE_VM_C1_C1_FPUSTACKSIM_HPP
 
 #include "c1/c1_FrameMap.hpp"
-#include "memory/allocation.hpp"
 #include "utilities/macros.hpp"
 
 // Provides location for forward declaration of this class, which is
--- old/src/hotspot/share/c1/c1_Optimizer.hpp	2018-03-27 08:32:43.199846721 -0400
+++ new/src/hotspot/share/c1/c1_Optimizer.hpp	2018-03-27 08:32:42.598791189 -0400
@@ -27,7 +27,6 @@
 
 #include "c1/c1_IR.hpp"
 #include "c1/c1_Instruction.hpp"
-#include "memory/allocation.hpp"
 
 class Optimizer {
  private:
--- old/src/hotspot/share/ci/ciFlags.hpp	2018-03-27 08:32:43.882909831 -0400
+++ new/src/hotspot/share/ci/ciFlags.hpp	2018-03-27 08:32:43.282854391 -0400
@@ -27,7 +27,6 @@
 
 #include "jvm.h"
 #include "ci/ciClassList.hpp"
-#include "memory/allocation.hpp"
 #include "utilities/accessFlags.hpp"
 #include "utilities/ostream.hpp"
 
--- old/src/hotspot/share/ci/ciMetadata.hpp	2018-03-27 08:32:44.568973217 -0400
+++ new/src/hotspot/share/ci/ciMetadata.hpp	2018-03-27 08:32:43.967917685 -0400
@@ -27,7 +27,6 @@
 
 #include "ci/ciBaseObject.hpp"
 #include "ci/ciClassList.hpp"
-#include "memory/allocation.hpp"
 #include "runtime/handles.hpp"
 #include "runtime/jniHandles.hpp"
 
--- old/src/hotspot/share/ci/ciObject.hpp	2018-03-27 08:32:45.255036604 -0400
+++ new/src/hotspot/share/ci/ciObject.hpp	2018-03-27 08:32:44.652980979 -0400
@@ -27,7 +27,6 @@
 
 #include "ci/ciBaseObject.hpp"
 #include "ci/ciClassList.hpp"
-#include "memory/allocation.hpp"
 #include "runtime/handles.hpp"
 #include "runtime/jniHandles.hpp"
 
--- old/src/hotspot/share/classfile/stringTable.hpp	2018-03-27 08:32:45.953101099 -0400
+++ new/src/hotspot/share/classfile/stringTable.hpp	2018-03-27 08:32:45.350045382 -0400
@@ -25,7 +25,6 @@
 #ifndef SHARE_VM_CLASSFILE_STRINGTABLE_HPP
 #define SHARE_VM_CLASSFILE_STRINGTABLE_HPP
 
-#include "memory/allocation.hpp"
 #include "utilities/hashtable.hpp"
 
 template <class T, class N> class CompactHashtable;
--- old/src/hotspot/share/classfile/verificationType.hpp	2018-03-27 08:32:46.640164578 -0400
+++ new/src/hotspot/share/classfile/verificationType.hpp	2018-03-27 08:32:46.041109230 -0400
@@ -26,7 +26,6 @@
 #define SHARE_VM_CLASSFILE_VERIFICATIONTYPE_HPP
 
 #include "classfile/systemDictionary.hpp"
-#include "memory/allocation.hpp"
 #include "oops/instanceKlass.hpp"
 #include "oops/oop.hpp"
 #include "oops/symbol.hpp"
--- old/src/hotspot/share/code/location.hpp	2018-03-27 08:32:47.331228426 -0400
+++ new/src/hotspot/share/code/location.hpp	2018-03-27 08:32:46.729172801 -0400
@@ -27,7 +27,6 @@
 
 #include "asm/assembler.hpp"
 #include "code/vmreg.hpp"
-#include "memory/allocation.hpp"
 
 // A Location describes a concrete machine variable location
 // (such as integer or floating point register or a stack-held
--- old/src/hotspot/share/code/pcDesc.hpp	2018-03-27 08:32:48.014291535 -0400
+++ new/src/hotspot/share/code/pcDesc.hpp	2018-03-27 08:32:47.415236188 -0400
@@ -25,7 +25,6 @@
 #ifndef SHARE_VM_CODE_PCDESC_HPP
 #define SHARE_VM_CODE_PCDESC_HPP
 
-#include "memory/allocation.hpp"
 
 // PcDescs map a physical PC (given as offset from start of nmethod) to
 // the corresponding source scope and byte code index.
--- old/src/hotspot/share/code/vmreg.hpp	2018-03-27 08:32:48.699354829 -0400
+++ new/src/hotspot/share/code/vmreg.hpp	2018-03-27 08:32:48.099299389 -0400
@@ -26,7 +26,6 @@
 #define SHARE_VM_CODE_VMREG_HPP
 
 #include "asm/register.hpp"
-#include "memory/allocation.hpp"
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/macros.hpp"
 #include "utilities/ostream.hpp"
--- old/src/hotspot/share/gc/g1/g1InCSetState.hpp	2018-03-27 08:32:49.387418401 -0400
+++ new/src/hotspot/share/gc/g1/g1InCSetState.hpp	2018-03-27 08:32:48.785362776 -0400
@@ -27,7 +27,6 @@
 
 #include "gc/g1/g1BiasedArray.hpp"
 #include "gc/g1/heapRegion.hpp"
-#include "memory/allocation.hpp"
 
 // Per-region state during garbage collection.
 struct InCSetState {
--- old/src/hotspot/share/gc/parallel/psTasks.hpp	2018-03-27 08:32:50.071481602 -0400
+++ new/src/hotspot/share/gc/parallel/psTasks.hpp	2018-03-27 08:32:49.471426162 -0400
@@ -25,7 +25,6 @@
 #ifndef SHARE_VM_GC_PARALLEL_PSTASKS_HPP
 #define SHARE_VM_GC_PARALLEL_PSTASKS_HPP
 
-#include "memory/allocation.hpp"
 #include "utilities/growableArray.hpp"
 
 //
--- old/src/hotspot/share/gc/parallel/psVirtualspace.hpp	2018-03-27 08:32:50.757544989 -0400
+++ new/src/hotspot/share/gc/parallel/psVirtualspace.hpp	2018-03-27 08:32:50.156489456 -0400
@@ -25,6 +25,7 @@
 #ifndef SHARE_VM_GC_PARALLEL_PSVIRTUALSPACE_HPP
 #define SHARE_VM_GC_PARALLEL_PSVIRTUALSPACE_HPP
 
+#include "memory/allocation.hpp"
 #include "memory/virtualspace.hpp"
 
 // VirtualSpace for the parallel scavenge collector.
--- old/src/hotspot/share/interpreter/invocationCounter.hpp	2018-03-27 08:32:51.442608283 -0400
+++ new/src/hotspot/share/interpreter/invocationCounter.hpp	2018-03-27 08:32:50.841552750 -0400
@@ -25,7 +25,6 @@
 #ifndef SHARE_VM_INTERPRETER_INVOCATIONCOUNTER_HPP
 #define SHARE_VM_INTERPRETER_INVOCATIONCOUNTER_HPP
 
-#include "memory/allocation.hpp"
 #include "runtime/handles.hpp"
 #include "utilities/exceptions.hpp"
 
--- old/src/hotspot/share/logging/log.hpp	2018-03-27 08:32:52.129671762 -0400
+++ new/src/hotspot/share/logging/log.hpp	2018-03-27 08:32:51.528616229 -0400
@@ -28,7 +28,6 @@
 #include "logging/logPrefix.hpp"
 #include "logging/logTagSet.hpp"
 #include "logging/logTag.hpp"
-#include "memory/allocation.hpp"
 #include "runtime/os.hpp"
 #include "utilities/debug.hpp"
 
--- old/src/hotspot/share/logging/logDecorations.hpp	2018-03-27 08:32:52.816735241 -0400
+++ new/src/hotspot/share/logging/logDecorations.hpp	2018-03-27 08:32:52.216679801 -0400
@@ -26,7 +26,6 @@
 
 #include "logging/logDecorators.hpp"
 #include "logging/logTagSet.hpp"
-#include "memory/allocation.hpp"
 
 // Temporary object containing the necessary data for a log call's decorations (timestamps, etc).
 class LogDecorations {
--- old/src/hotspot/share/logging/logDecorators.hpp	2018-03-27 08:32:53.503798719 -0400
+++ new/src/hotspot/share/logging/logDecorators.hpp	2018-03-27 08:32:52.904743372 -0400
@@ -24,7 +24,6 @@
 #ifndef SHARE_VM_LOGGING_LOGDECORATORS_HPP
 #define SHARE_VM_LOGGING_LOGDECORATORS_HPP
 
-#include "memory/allocation.hpp"
 #include "utilities/globalDefinitions.hpp"
 
 // The list of available decorators:
--- old/src/hotspot/share/memory/metachunk.hpp	2018-03-27 08:32:54.190862198 -0400
+++ new/src/hotspot/share/memory/metachunk.hpp	2018-03-27 08:32:53.589806666 -0400
@@ -24,7 +24,6 @@
 #ifndef SHARE_VM_MEMORY_METACHUNK_HPP
 #define SHARE_VM_MEMORY_METACHUNK_HPP
 
-#include "memory/allocation.hpp"
 #include "utilities/debug.hpp"
 #include "utilities/globalDefinitions.hpp"
 
--- old/src/hotspot/share/memory/metaspaceChunkFreeListSummary.hpp	2018-03-27 08:32:54.876925585 -0400
+++ new/src/hotspot/share/memory/metaspaceChunkFreeListSummary.hpp	2018-03-27 08:32:54.276870145 -0400
@@ -25,7 +25,6 @@
 #ifndef SHARE_VM_MEMORY_METASPACECHUNKFREELISTSUMMARY_HPP
 #define SHARE_VM_MEMORY_METASPACECHUNKFREELISTSUMMARY_HPP
 
-#include "memory/allocation.hpp"
 
 class MetaspaceChunkFreeListSummary {
   size_t _num_specialized_chunks;
--- old/src/hotspot/share/memory/padded.hpp	2018-03-27 08:32:55.564989156 -0400
+++ new/src/hotspot/share/memory/padded.hpp	2018-03-27 08:32:54.959933253 -0400
@@ -25,7 +25,6 @@
 #ifndef SHARE_VM_MEMORY_PADDED_HPP
 #define SHARE_VM_MEMORY_PADDED_HPP
 
-#include "memory/allocation.hpp"
 #include "utilities/align.hpp"
 #include "utilities/globalDefinitions.hpp"
 
--- old/src/hotspot/share/memory/virtualspace.hpp	2018-03-27 08:32:56.249052357 -0400
+++ new/src/hotspot/share/memory/virtualspace.hpp	2018-03-27 08:32:55.648996918 -0400
@@ -25,7 +25,7 @@
 #ifndef SHARE_VM_RUNTIME_VIRTUALSPACE_HPP
 #define SHARE_VM_RUNTIME_VIRTUALSPACE_HPP
 
-#include "memory/allocation.hpp"
+#include "utilities/globalDefinitions.hpp"
 
 // ReservedSpace is a data structure for reserving a contiguous address range.
 
--- old/src/hotspot/share/metaprogramming/integralConstant.hpp	2018-03-27 08:32:56.947116853 -0400
+++ new/src/hotspot/share/metaprogramming/integralConstant.hpp	2018-03-27 08:32:56.347061413 -0400
@@ -25,7 +25,6 @@
 #ifndef SHARE_VM_METAPROGRAMMING_INTEGRALCONSTANT_HPP
 #define SHARE_VM_METAPROGRAMMING_INTEGRALCONSTANT_HPP
 
-#include "memory/allocation.hpp"
 
 // An Integral Constant is a class providing a compile-time value of an
 // integral type.  An Integral Constant is also a nullary metafunction,
--- old/src/hotspot/share/metaprogramming/isIntegral.hpp	2018-03-27 08:32:57.630179962 -0400
+++ new/src/hotspot/share/metaprogramming/isIntegral.hpp	2018-03-27 08:32:57.031124614 -0400
@@ -26,7 +26,6 @@
 #ifndef SHARE_VM_METAPROGRAMMING_ISINTEGRAL_HPP
 #define SHARE_VM_METAPROGRAMMING_ISINTEGRAL_HPP
 
-#include "memory/allocation.hpp"
 #include "metaprogramming/integralConstant.hpp"
 #include "metaprogramming/isSigned.hpp"
 #include "metaprogramming/removeCV.hpp"
--- old/src/hotspot/share/metaprogramming/isRegisteredEnum.hpp	2018-03-27 08:32:58.326244272 -0400
+++ new/src/hotspot/share/metaprogramming/isRegisteredEnum.hpp	2018-03-27 08:32:57.725188740 -0400
@@ -25,7 +25,6 @@
 #ifndef SHARE_VM_METAPROGRAMMING_ISREGISTEREDENUM_HPP
 #define SHARE_VM_METAPROGRAMMING_ISREGISTEREDENUM_HPP
 
-#include "memory/allocation.hpp"
 #include "metaprogramming/integralConstant.hpp"
 
 // Recognize registered enum types.
--- old/src/hotspot/share/metaprogramming/isSigned.hpp	2018-03-27 08:32:59.008307289 -0400
+++ new/src/hotspot/share/metaprogramming/isSigned.hpp	2018-03-27 08:32:58.408251849 -0400
@@ -25,7 +25,6 @@
 #ifndef SHARE_VM_METAPROGRAMMING_ISSIGNED_HPP
 #define SHARE_VM_METAPROGRAMMING_ISSIGNED_HPP
 
-#include "memory/allocation.hpp"
 #include "metaprogramming/integralConstant.hpp"
 #include "metaprogramming/removeCV.hpp"
 #include <limits>
--- old/src/hotspot/share/oops/klassVtable.hpp	2018-03-27 08:32:59.694370676 -0400
+++ new/src/hotspot/share/oops/klassVtable.hpp	2018-03-27 08:32:59.093315143 -0400
@@ -25,7 +25,6 @@
 #ifndef SHARE_VM_OOPS_KLASSVTABLE_HPP
 #define SHARE_VM_OOPS_KLASSVTABLE_HPP
 
-#include "memory/allocation.hpp"
 #include "oops/oopsHierarchy.hpp"
 #include "runtime/handles.hpp"
 #include "utilities/growableArray.hpp"
--- old/src/hotspot/share/prims/privilegedStack.hpp	2018-03-27 08:33:00.385434524 -0400
+++ new/src/hotspot/share/prims/privilegedStack.hpp	2018-03-27 08:32:59.785379084 -0400
@@ -25,7 +25,6 @@
 #ifndef SHARE_VM_PRIMS_PRIVILEGEDSTACK_HPP
 #define SHARE_VM_PRIMS_PRIVILEGEDSTACK_HPP
 
-#include "memory/allocation.hpp"
 #include "oops/oopsHierarchy.hpp"
 #include "runtime/vframe.hpp"
 #include "utilities/growableArray.hpp"
--- old/src/hotspot/share/runtime/extendedPC.hpp	2018-03-27 08:33:01.068497633 -0400
+++ new/src/hotspot/share/runtime/extendedPC.hpp	2018-03-27 08:33:00.468442193 -0400
@@ -25,7 +25,6 @@
 #ifndef SHARE_VM_RUNTIME_EXTENDEDPC_HPP
 #define SHARE_VM_RUNTIME_EXTENDEDPC_HPP
 
-#include "memory/allocation.hpp"
 #include "utilities/globalDefinitions.hpp"
 
 // An ExtendedPC contains the _pc from a signal handler in a platform
--- old/src/hotspot/share/services/allocationSite.hpp	2018-03-27 08:33:01.752560835 -0400
+++ new/src/hotspot/share/services/allocationSite.hpp	2018-03-27 08:33:01.150505210 -0400
@@ -25,7 +25,6 @@
 #ifndef SHARE_VM_SERVICES_ALLOCATION_SITE_HPP
 #define SHARE_VM_SERVICES_ALLOCATION_SITE_HPP
 
-#include "memory/allocation.hpp"
 #include "utilities/nativeCallStack.hpp"
 
 // Allocation site represents a code path that makes a memory
--- old/src/hotspot/share/services/memBaseline.hpp	2018-03-27 08:33:02.436624037 -0400
+++ new/src/hotspot/share/services/memBaseline.hpp	2018-03-27 08:33:01.836568597 -0400
@@ -27,7 +27,6 @@
 
 #if INCLUDE_NMT
 
-#include "memory/allocation.hpp"
 #include "runtime/mutex.hpp"
 #include "services/mallocSiteTable.hpp"
 #include "services/mallocTracker.hpp"
--- old/src/hotspot/share/utilities/accessFlags.hpp	2018-03-27 08:33:03.122687423 -0400
+++ new/src/hotspot/share/utilities/accessFlags.hpp	2018-03-27 08:33:02.522631983 -0400
@@ -26,11 +26,12 @@
 #define SHARE_VM_UTILITIES_ACCESSFLAGS_HPP
 
 #include "jvm.h"
-#include "memory/allocation.hpp"
+#include "utilities/debug.hpp"
 #include "utilities/macros.hpp"
 
 // AccessFlags is an abstraction over Java access flags.
 
+class outputStream;
 
 enum {
   // See jvm.h for shared JVM_ACC_XXX access flags
--- old/src/hotspot/share/utilities/bitMap.hpp	2018-03-27 08:33:03.813751272 -0400
+++ new/src/hotspot/share/utilities/bitMap.hpp	2018-03-27 08:33:03.212695739 -0400
@@ -25,7 +25,6 @@
 #ifndef SHARE_VM_UTILITIES_BITMAP_HPP
 #define SHARE_VM_UTILITIES_BITMAP_HPP
 
-#include "memory/allocation.hpp"
 #include "utilities/align.hpp"
 
 // Forward decl;
--- old/src/hotspot/share/utilities/constantTag.hpp	2018-03-27 08:33:04.523816876 -0400
+++ new/src/hotspot/share/utilities/constantTag.hpp	2018-03-27 08:33:03.922761343 -0400
@@ -26,7 +26,7 @@
 #define SHARE_VM_UTILITIES_CONSTANTTAG_HPP
 
 #include "jvm.h"
-#include "memory/allocation.hpp"
+#include "utilities/globalDefinitions.hpp"
 
 // constant tags in Java .class files
 
--- old/src/hotspot/share/utilities/sizes.hpp	2018-03-27 08:33:05.211880447 -0400
+++ new/src/hotspot/share/utilities/sizes.hpp	2018-03-27 08:33:04.609824822 -0400
@@ -25,7 +25,6 @@
 #ifndef SHARE_VM_UTILITIES_SIZES_HPP
 #define SHARE_VM_UTILITIES_SIZES_HPP
 
-#include "memory/allocation.hpp"
 #include "utilities/globalDefinitions.hpp"
 
 // The following two classes are used to represent 'sizes' and 'offsets' in the VM;