--- old/src/hotspot/os/posix/os_posix.cpp	2018-03-07 23:25:48.991445674 +0100
+++ new/src/hotspot/os/posix/os_posix.cpp	2018-03-07 23:25:48.771438164 +0100
@@ -23,10 +23,12 @@
  */
 
 #include "jvm.h"
+#include "memory/allocation.inline.hpp"
 #include "utilities/globalDefinitions.hpp"
 #include "runtime/frame.inline.hpp"
 #include "runtime/interfaceSupport.hpp"
 #include "runtime/os.hpp"
+#include "services/memTracker.hpp"
 #include "utilities/align.hpp"
 #include "utilities/macros.hpp"
 #include "utilities/vmError.hpp"
--- old/src/hotspot/share/aot/aotCodeHeap.cpp	2018-03-07 23:25:49.331457280 +0100
+++ new/src/hotspot/share/aot/aotCodeHeap.cpp	2018-03-07 23:25:49.111449770 +0100
@@ -34,6 +34,7 @@
 #include "interpreter/abstractInterpreter.hpp"
 #include "jvmci/compilerRuntime.hpp"
 #include "jvmci/jvmciRuntime.hpp"
+#include "memory/allocation.inline.hpp"
 #include "oops/method.inline.hpp"
 #include "runtime/os.hpp"
 #include "runtime/sharedRuntime.hpp"
--- old/src/hotspot/share/aot/aotLoader.cpp	2018-03-07 23:25:49.659468475 +0100
+++ new/src/hotspot/share/aot/aotLoader.cpp	2018-03-07 23:25:49.443461103 +0100
@@ -27,6 +27,7 @@
 #include "aot/aotCodeHeap.hpp"
 #include "aot/aotLoader.inline.hpp"
 #include "jvmci/jvmciRuntime.hpp"
+#include "memory/allocation.inline.hpp"
 #include "oops/method.hpp"
 #include "runtime/os.hpp"
 #include "runtime/timerTrace.hpp"
--- old/src/hotspot/share/classfile/classLoaderData.cpp	2018-03-07 23:25:49.999480081 +0100
+++ new/src/hotspot/share/classfile/classLoaderData.cpp	2018-03-07 23:25:49.763472026 +0100
@@ -59,6 +59,7 @@
 #include "gc/shared/gcLocker.hpp"
 #include "logging/log.hpp"
 #include "logging/logStream.hpp"
+#include "memory/allocation.inline.hpp"
 #include "memory/metadataFactory.hpp"
 #include "memory/metaspaceShared.hpp"
 #include "memory/oopFactory.hpp"
--- old/src/hotspot/share/classfile/vmSymbols.cpp	2018-03-07 23:25:50.355492233 +0100
+++ new/src/hotspot/share/classfile/vmSymbols.cpp	2018-03-07 23:25:50.115484041 +0100
@@ -26,6 +26,7 @@
 #include "jvm.h"
 #include "classfile/vmSymbols.hpp"
 #include "compiler/compilerDirectives.hpp"
+#include "memory/allocation.inline.hpp"
 #include "memory/oopFactory.hpp"
 #include "memory/metaspaceClosure.hpp"
 #include "oops/oop.inline.hpp"
--- old/src/hotspot/share/compiler/compilerDirectives.cpp	2018-03-07 23:25:50.711504384 +0100
+++ new/src/hotspot/share/compiler/compilerDirectives.cpp	2018-03-07 23:25:50.471496192 +0100
@@ -28,6 +28,7 @@
 #include "compiler/abstractCompiler.hpp"
 #include "compiler/compilerDirectives.hpp"
 #include "compiler/compilerOracle.hpp"
+#include "memory/allocation.inline.hpp"
 #include "memory/resourceArea.hpp"
 
 CompilerDirectives::CompilerDirectives() :_match(NULL), _next(NULL), _ref_count(0) {
--- old/src/hotspot/share/gc/parallel/mutableNUMASpace.cpp	2018-03-07 23:25:51.059516263 +0100
+++ new/src/hotspot/share/gc/parallel/mutableNUMASpace.cpp	2018-03-07 23:25:50.823508208 +0100
@@ -26,6 +26,7 @@
 #include "gc/parallel/mutableNUMASpace.hpp"
 #include "gc/shared/collectedHeap.hpp"
 #include "gc/shared/spaceDecorator.hpp"
+#include "memory/allocation.inline.hpp"
 #include "oops/oop.inline.hpp"
 #include "runtime/atomic.hpp"
 #include "runtime/thread.inline.hpp"
--- old/src/hotspot/share/gc/shared/referencePolicy.hpp	2018-03-07 23:25:51.403528006 +0100
+++ new/src/hotspot/share/gc/shared/referencePolicy.hpp	2018-03-07 23:25:51.171520086 +0100
@@ -25,6 +25,8 @@
 #ifndef SHARE_VM_GC_SHARED_REFERENCEPOLICY_HPP
 #define SHARE_VM_GC_SHARED_REFERENCEPOLICY_HPP
 
+#include "oops/oopsHierarchy.hpp"
+
 // referencePolicy is used to determine when soft reference objects
 // should be cleared.
 
--- old/src/hotspot/share/gc/shared/referenceProcessor.cpp	2018-03-07 23:25:51.759540157 +0100
+++ new/src/hotspot/share/gc/shared/referenceProcessor.cpp	2018-03-07 23:25:51.523532102 +0100
@@ -32,7 +32,7 @@
 #include "gc/shared/referencePolicy.hpp"
 #include "gc/shared/referenceProcessor.inline.hpp"
 #include "logging/log.hpp"
-#include "memory/allocation.hpp"
+#include "memory/allocation.inline.hpp"
 #include "memory/resourceArea.hpp"
 #include "oops/access.inline.hpp"
 #include "oops/oop.inline.hpp"
--- old/src/hotspot/share/gc/shared/referenceProcessorPhaseTimes.cpp	2018-03-07 23:25:52.123552582 +0100
+++ new/src/hotspot/share/gc/shared/referenceProcessorPhaseTimes.cpp	2018-03-07 23:25:51.879544253 +0100
@@ -26,8 +26,10 @@
 #include "gc/shared/gcTimer.hpp"
 #include "gc/shared/referenceProcessorPhaseTimes.hpp"
 #include "gc/shared/referenceProcessor.inline.hpp"
+#include "gc/shared/workerDataArray.inline.hpp"
 #include "logging/log.hpp"
 #include "logging/logStream.hpp"
+#include "memory/allocation.inline.hpp"
 
 RefProcWorkerTimeTracker::RefProcWorkerTimeTracker(ReferenceProcessorPhaseTimes::RefProcPhaseNumbers number,
                                                    ReferenceProcessorPhaseTimes* phase_times,
--- old/src/hotspot/share/gc/shared/referenceProcessorPhaseTimes.hpp	2018-03-07 23:25:52.471564460 +0100
+++ new/src/hotspot/share/gc/shared/referenceProcessorPhaseTimes.hpp	2018-03-07 23:25:52.231556268 +0100
@@ -26,7 +26,7 @@
 #define SHARE_VM_GC_SHARED_REFERENCEPROCESSORPHASETIMES_HPP
 
 #include "gc/shared/referenceProcessorStats.hpp"
-#include "gc/shared/workerDataArray.inline.hpp"
+#include "gc/shared/workerDataArray.hpp"
 #include "memory/referenceType.hpp"
 #include "utilities/ticks.hpp"
 
--- old/src/hotspot/share/jvmci/jvmciCodeInstaller.cpp	2018-03-07 23:25:52.755574155 +0100
+++ new/src/hotspot/share/jvmci/jvmciCodeInstaller.cpp	2018-03-07 23:25:52.551567191 +0100
@@ -34,6 +34,7 @@
 #include "jvmci/jvmciJavaClasses.hpp"
 #include "jvmci/jvmciCompilerToVM.hpp"
 #include "jvmci/jvmciRuntime.hpp"
+#include "memory/allocation.inline.hpp"
 #include "oops/arrayOop.inline.hpp"
 #include "oops/oop.inline.hpp"
 #include "oops/objArrayOop.inline.hpp"
--- old/src/hotspot/share/jvmci/jvmciRuntime.cpp	2018-03-07 23:25:53.111586307 +0100
+++ new/src/hotspot/share/jvmci/jvmciRuntime.cpp	2018-03-07 23:25:52.875578251 +0100
@@ -34,6 +34,7 @@
 #include "jvmci/jvmciJavaClasses.hpp"
 #include "jvmci/jvmciEnv.hpp"
 #include "logging/log.hpp"
+#include "memory/allocation.inline.hpp"
 #include "memory/oopFactory.hpp"
 #include "memory/resourceArea.hpp"
 #include "oops/oop.inline.hpp"
--- old/src/hotspot/share/libadt/dict.hpp	2018-03-07 23:25:53.451597912 +0100
+++ new/src/hotspot/share/libadt/dict.hpp	2018-03-07 23:25:53.223590129 +0100
@@ -27,7 +27,7 @@
 
 // Dictionaries - An Abstract Data Type
 
-#include "memory/allocation.inline.hpp"
+#include "memory/allocation.hpp"
 #include "memory/resourceArea.hpp"
 #include "runtime/thread.hpp"
 
--- old/src/hotspot/share/oops/constantPool.cpp	2018-03-07 23:25:53.787609382 +0100
+++ new/src/hotspot/share/oops/constantPool.cpp	2018-03-07 23:25:53.555601462 +0100
@@ -2533,6 +2533,17 @@
 }
 
 
+SymbolHashMap::~SymbolHashMap() {
+  SymbolHashMapEntry* next;
+  for (int i = 0; i < _table_size; i++) {
+    for (SymbolHashMapEntry* cur = bucket(i); cur != NULL; cur = next) {
+      next = cur->next();
+      delete(cur);
+    }
+  }
+  FREE_C_HEAP_ARRAY(SymbolHashMapBucket, _buckets);
+}
+
 void SymbolHashMap::add_entry(Symbol* sym, u2 value) {
   char *str = sym->as_utf8();
   unsigned int hash = compute_hash(str, sym->utf8_length());
--- old/src/hotspot/share/oops/constantPool.hpp	2018-03-07 23:25:54.159622079 +0100
+++ new/src/hotspot/share/oops/constantPool.hpp	2018-03-07 23:25:53.923614023 +0100
@@ -25,7 +25,7 @@
 #ifndef SHARE_VM_OOPS_CONSTANTPOOLOOP_HPP
 #define SHARE_VM_OOPS_CONSTANTPOOLOOP_HPP
 
-#include "memory/allocation.inline.hpp"
+#include "memory/allocation.hpp"
 #include "oops/arrayOop.hpp"
 #include "oops/cpCache.hpp"
 #include "oops/objArrayOop.hpp"
@@ -1023,16 +1023,7 @@
     return (entry == NULL) ? 0 : entry->value();
   }
 
-  ~SymbolHashMap() {
-    SymbolHashMapEntry* next;
-    for (int i = 0; i < _table_size; i++) {
-      for (SymbolHashMapEntry* cur = bucket(i); cur != NULL; cur = next) {
-        next = cur->next();
-        delete(cur);
-      }
-    }
-    FREE_C_HEAP_ARRAY(SymbolHashMapBucket, _buckets);
-  }
+  ~SymbolHashMap();
 }; // End SymbolHashMap class
 
 #endif // SHARE_VM_OOPS_CONSTANTPOOLOOP_HPP
--- old/src/hotspot/share/oops/instanceKlass.cpp	2018-03-07 23:25:54.507633958 +0100
+++ new/src/hotspot/share/oops/instanceKlass.cpp	2018-03-07 23:25:54.275626039 +0100
@@ -44,6 +44,7 @@
 #include "logging/log.hpp"
 #include "logging/logMessage.hpp"
 #include "logging/logStream.hpp"
+#include "memory/allocation.inline.hpp"
 #include "memory/heapInspection.hpp"
 #include "memory/iterator.inline.hpp"
 #include "memory/metadataFactory.hpp"
--- old/src/hotspot/share/oops/method.cpp	2018-03-07 23:25:54.887646929 +0100
+++ new/src/hotspot/share/oops/method.cpp	2018-03-07 23:25:54.663639283 +0100
@@ -35,6 +35,7 @@
 #include "interpreter/bytecodes.hpp"
 #include "interpreter/interpreter.hpp"
 #include "interpreter/oopMapCache.hpp"
+#include "memory/allocation.inline.hpp"
 #include "memory/heapInspection.hpp"
 #include "memory/metadataFactory.hpp"
 #include "memory/metaspaceClosure.hpp"
--- old/src/hotspot/share/prims/cdsoffsets.cpp	2018-03-07 23:25:55.251659354 +0100
+++ new/src/hotspot/share/prims/cdsoffsets.cpp	2018-03-07 23:25:55.019651435 +0100
@@ -31,6 +31,13 @@
 #include "memory/allocation.inline.hpp"
 #include "prims/cdsoffsets.hpp"
 
+CDSOffsets::CDSOffsets(const char* name, int offset, CDSOffsets* next) {
+  _name = NEW_C_HEAP_ARRAY(char, strlen(name) + 1, mtInternal);
+  strcpy(_name, name);
+  _offset = offset;
+  _next = next;
+}
+
 CDSOffsets* CDSOffsets::_all = NULL;
 #define ADD_NEXT(list, name, value) \
   list->add_end(new CDSOffsets(name, value, NULL))
--- old/src/hotspot/share/prims/cdsoffsets.hpp	2018-03-07 23:25:55.575670413 +0100
+++ new/src/hotspot/share/prims/cdsoffsets.hpp	2018-03-07 23:25:55.355662904 +0100
@@ -24,6 +24,7 @@
 
 #ifndef SHARE_PRIMS_CDSOFFSETS_HPP
 #define SHARE_PRIMS_CDSOFFSETS_HPP
+
 class CDSOffsets: public CHeapObj<mtInternal> {
  private:
   char* _name;
@@ -31,12 +32,7 @@
   CDSOffsets* _next;
   static CDSOffsets* _all;  // sole list for cds
  public:
-  CDSOffsets(const char* name, int offset, CDSOffsets* next) {
-     _name = NEW_C_HEAP_ARRAY(char, strlen(name) + 1, mtInternal);
-     strcpy(_name, name);
-     _offset = offset;
-     _next = next;
-  }
+  CDSOffsets(const char* name, int offset, CDSOffsets* next);
 
   char* get_name() const { return _name; }
   int   get_offset() const { return _offset; }
@@ -45,4 +41,5 @@
 
   static int find_offset(const char* name);
 };
+
 #endif // SHARE_PRIMS_CDSOFFSETS_HPP
--- old/src/hotspot/share/prims/jniCheck.cpp	2018-03-07 23:25:55.903681610 +0100
+++ new/src/hotspot/share/prims/jniCheck.cpp	2018-03-07 23:25:55.671673691 +0100
@@ -28,6 +28,7 @@
 #include "classfile/javaClasses.inline.hpp"
 #include "classfile/systemDictionary.hpp"
 #include "classfile/vmSymbols.hpp"
+#include "memory/allocation.inline.hpp"
 #include "memory/guardedMemory.hpp"
 #include "oops/instanceKlass.hpp"
 #include "oops/oop.inline.hpp"
--- old/src/hotspot/share/prims/jvmtiCodeBlobEvents.cpp	2018-03-07 23:25:56.267694035 +0100
+++ new/src/hotspot/share/prims/jvmtiCodeBlobEvents.cpp	2018-03-07 23:25:56.035686115 +0100
@@ -27,6 +27,7 @@
 #include "code/codeCache.hpp"
 #include "code/scopeDesc.hpp"
 #include "code/vtableStubs.hpp"
+#include "memory/allocation.inline.hpp"
 #include "memory/resourceArea.hpp"
 #include "oops/oop.inline.hpp"
 #include "prims/jvmtiCodeBlobEvents.hpp"
--- old/src/hotspot/share/prims/jvmtiExport.cpp	2018-03-07 23:25:56.607705640 +0100
+++ new/src/hotspot/share/prims/jvmtiExport.cpp	2018-03-07 23:25:56.371697585 +0100
@@ -31,6 +31,7 @@
 #include "jvmtifiles/jvmtiEnv.hpp"
 #include "logging/log.hpp"
 #include "logging/logStream.hpp"
+#include "memory/allocation.inline.hpp"
 #include "memory/resourceArea.hpp"
 #include "oops/objArrayKlass.hpp"
 #include "oops/objArrayOop.hpp"
--- old/src/hotspot/share/prims/jvmtiImpl.cpp	2018-03-07 23:25:56.971718066 +0100
+++ new/src/hotspot/share/prims/jvmtiImpl.cpp	2018-03-07 23:25:56.743710283 +0100
@@ -29,6 +29,7 @@
 #include "jvmtifiles/jvmtiEnv.hpp"
 #include "logging/log.hpp"
 #include "logging/logStream.hpp"
+#include "memory/allocation.inline.hpp"
 #include "memory/resourceArea.hpp"
 #include "oops/instanceKlass.hpp"
 #include "oops/oop.inline.hpp"
--- old/src/hotspot/share/prims/jvmtiRawMonitor.cpp	2018-03-07 23:25:57.263728033 +0100
+++ new/src/hotspot/share/prims/jvmtiRawMonitor.cpp	2018-03-07 23:25:57.059721069 +0100
@@ -23,6 +23,7 @@
  */
 
 #include "precompiled.hpp"
+#include "memory/allocation.inline.hpp"
 #include "prims/jvmtiRawMonitor.hpp"
 #include "runtime/atomic.hpp"
 #include "runtime/interfaceSupport.hpp"
@@ -421,4 +422,3 @@
   SimpleNotify (THREAD, true) ;
   return OM_OK;
 }
-
--- old/src/hotspot/share/prims/jvmtiTagMap.cpp	2018-03-07 23:25:57.595739365 +0100
+++ new/src/hotspot/share/prims/jvmtiTagMap.cpp	2018-03-07 23:25:57.355731173 +0100
@@ -29,6 +29,7 @@
 #include "classfile/vmSymbols.hpp"
 #include "code/codeCache.hpp"
 #include "jvmtifiles/jvmtiEnv.hpp"
+#include "memory/allocation.inline.hpp"
 #include "memory/resourceArea.hpp"
 #include "oops/access.inline.hpp"
 #include "oops/arrayOop.inline.hpp"
--- old/src/hotspot/share/runtime/perfData.cpp	2018-03-07 23:25:57.979752473 +0100
+++ new/src/hotspot/share/runtime/perfData.cpp	2018-03-07 23:25:57.743744417 +0100
@@ -26,6 +26,7 @@
 #include "jvm.h"
 #include "classfile/vmSymbols.hpp"
 #include "logging/log.hpp"
+#include "memory/allocation.inline.hpp"
 #include "oops/oop.inline.hpp"
 #include "runtime/handles.inline.hpp"
 #include "runtime/java.hpp"
--- old/src/hotspot/share/runtime/sweeper.cpp	2018-03-07 23:25:58.331764488 +0100
+++ new/src/hotspot/share/runtime/sweeper.cpp	2018-03-07 23:25:58.087756160 +0100
@@ -30,6 +30,7 @@
 #include "compiler/compileBroker.hpp"
 #include "logging/log.hpp"
 #include "logging/logStream.hpp"
+#include "memory/allocation.inline.hpp"
 #include "memory/resourceArea.hpp"
 #include "oops/method.hpp"
 #include "runtime/atomic.hpp"
--- old/src/hotspot/share/runtime/synchronizer.cpp	2018-03-07 23:25:58.683776504 +0100
+++ new/src/hotspot/share/runtime/synchronizer.cpp	2018-03-07 23:25:58.451768585 +0100
@@ -25,6 +25,7 @@
 #include "precompiled.hpp"
 #include "classfile/vmSymbols.hpp"
 #include "logging/log.hpp"
+#include "memory/allocation.inline.hpp"
 #include "memory/metaspaceShared.hpp"
 #include "memory/padded.hpp"
 #include "memory/resourceArea.hpp"
--- old/src/hotspot/share/runtime/thread.cpp	2018-03-07 23:25:59.051789065 +0100
+++ new/src/hotspot/share/runtime/thread.cpp	2018-03-07 23:25:58.811780873 +0100
@@ -43,6 +43,7 @@
 #include "logging/log.hpp"
 #include "logging/logConfiguration.hpp"
 #include "logging/logStream.hpp"
+#include "memory/allocation.inline.hpp"
 #include "memory/metaspaceShared.hpp"
 #include "memory/oopFactory.hpp"
 #include "memory/resourceArea.hpp"
--- old/src/hotspot/share/services/heapDumper.cpp	2018-03-07 23:25:59.387800535 +0100
+++ new/src/hotspot/share/services/heapDumper.cpp	2018-03-07 23:25:59.183793571 +0100
@@ -30,6 +30,7 @@
 #include "gc/shared/gcLocker.inline.hpp"
 #include "gc/shared/genCollectedHeap.hpp"
 #include "gc/shared/vmGCOperations.hpp"
+#include "memory/allocation.inline.hpp"
 #include "memory/resourceArea.hpp"
 #include "memory/universe.hpp"
 #include "oops/objArrayKlass.hpp"
--- old/src/hotspot/share/services/management.cpp	2018-03-07 23:25:59.727812140 +0100
+++ new/src/hotspot/share/services/management.cpp	2018-03-07 23:25:59.507804630 +0100
@@ -26,6 +26,7 @@
 #include "jmm.h"
 #include "classfile/systemDictionary.hpp"
 #include "compiler/compileBroker.hpp"
+#include "memory/allocation.inline.hpp"
 #include "memory/iterator.hpp"
 #include "memory/oopFactory.hpp"
 #include "memory/resourceArea.hpp"
--- old/src/hotspot/share/services/memoryManager.cpp	2018-03-07 23:26:00.095824702 +0100
+++ new/src/hotspot/share/services/memoryManager.cpp	2018-03-07 23:25:59.859816646 +0100
@@ -25,6 +25,7 @@
 #include "precompiled.hpp"
 #include "classfile/systemDictionary.hpp"
 #include "classfile/vmSymbols.hpp"
+#include "memory/allocation.inline.hpp"
 #include "oops/oop.inline.hpp"
 #include "runtime/handles.inline.hpp"
 #include "runtime/javaCalls.hpp"
--- old/src/hotspot/share/services/writeableFlags.cpp	2018-03-07 23:26:00.431836172 +0100
+++ new/src/hotspot/share/services/writeableFlags.cpp	2018-03-07 23:26:00.195828116 +0100
@@ -24,6 +24,7 @@
 
 #include "precompiled.hpp"
 #include "classfile/javaClasses.hpp"
+#include "memory/allocation.inline.hpp"
 #include "runtime/arguments.hpp"
 #include "runtime/commandLineFlagRangeList.hpp"
 #include "runtime/java.hpp"
--- old/src/hotspot/share/utilities/ostream.cpp	2018-03-07 23:26:00.771847777 +0100
+++ new/src/hotspot/share/utilities/ostream.cpp	2018-03-07 23:26:00.527839448 +0100
@@ -25,6 +25,7 @@
 #include "precompiled.hpp"
 #include "jvm.h"
 #include "compiler/compileLog.hpp"
+#include "memory/allocation.inline.hpp"
 #include "oops/oop.inline.hpp"
 #include "runtime/arguments.hpp"
 #include "runtime/os.hpp"
--- old/src/hotspot/share/utilities/stack.inline.hpp	2018-03-07 23:26:01.115859520 +0100
+++ new/src/hotspot/share/utilities/stack.inline.hpp	2018-03-07 23:26:00.883851600 +0100
@@ -25,6 +25,7 @@
 #ifndef SHARE_VM_UTILITIES_STACK_INLINE_HPP
 #define SHARE_VM_UTILITIES_STACK_INLINE_HPP
 
+#include "memory/allocation.inline.hpp"
 #include "utilities/align.hpp"
 #include "utilities/stack.hpp"
 #include "utilities/copy.hpp"
--- old/test/hotspot/gtest/logging/logTestFixture.cpp	2018-03-07 23:26:01.459871261 +0100
+++ new/test/hotspot/gtest/logging/logTestFixture.cpp	2018-03-07 23:26:01.219863070 +0100
@@ -27,6 +27,7 @@
 #include "logTestUtils.inline.hpp"
 #include "logging/logConfiguration.hpp"
 #include "logging/logOutput.hpp"
+#include "memory/allocation.inline.hpp"
 #include "memory/resourceArea.hpp"
 #include "unittest.hpp"
 #include "utilities/ostream.hpp"