--- a/src/hotspot/os/aix/attachListener_aix.cpp	Thu Mar 15 21:24:10 2018 +0100
+++ b/src/hotspot/os/aix/attachListener_aix.cpp	Thu Mar 15 21:29:36 2018 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012, 2016 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -24,6 +24,7 @@
  */
 
 #include "precompiled.hpp"
+#include "logging/log.hpp"
 #include "runtime/interfaceSupport.inline.hpp"
 #include "runtime/os.inline.hpp"
 #include "services/attachListener.hpp"

--- a/src/hotspot/os/bsd/attachListener_bsd.cpp	Thu Mar 15 21:24:10 2018 +0100
+++ b/src/hotspot/os/bsd/attachListener_bsd.cpp	Thu Mar 15 21:29:36 2018 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,6 +23,7 @@
  */
 
 #include "precompiled.hpp"
+#include "logging/log.hpp"
 #include "runtime/interfaceSupport.inline.hpp"
 #include "runtime/os.inline.hpp"
 #include "services/attachListener.hpp"

--- a/src/hotspot/os/linux/attachListener_linux.cpp	Thu Mar 15 21:24:10 2018 +0100
+++ b/src/hotspot/os/linux/attachListener_linux.cpp	Thu Mar 15 21:29:36 2018 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,6 +23,7 @@
  */
 
 #include "precompiled.hpp"
+#include "logging/log.hpp"
 #include "memory/allocation.inline.hpp"
 #include "runtime/interfaceSupport.inline.hpp"
 #include "runtime/os.inline.hpp"

--- a/src/hotspot/os/solaris/attachListener_solaris.cpp	Thu Mar 15 21:24:10 2018 +0100
+++ b/src/hotspot/os/solaris/attachListener_solaris.cpp	Thu Mar 15 21:29:36 2018 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,6 +23,7 @@
  */
 
 #include "precompiled.hpp"
+#include "logging/log.hpp"
 #include "runtime/interfaceSupport.inline.hpp"
 #include "runtime/os.inline.hpp"
 #include "services/attachListener.hpp"

--- a/src/hotspot/share/ci/bcEscapeAnalyzer.cpp	Thu Mar 15 21:24:10 2018 +0100
+++ b/src/hotspot/share/ci/bcEscapeAnalyzer.cpp	Thu Mar 15 21:29:36 2018 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,8 +32,7 @@
 #include "oops/oop.inline.hpp"
 #include "utilities/align.hpp"
 #include "utilities/bitMap.inline.hpp"
-
-
+#include "utilities/copy.hpp"
 
 #ifndef PRODUCT
   #define TRACE_BCEA(level, code)                                            \

--- a/src/hotspot/share/classfile/classFileParser.cpp	Thu Mar 15 21:24:10 2018 +0100
+++ b/src/hotspot/share/classfile/classFileParser.cpp	Thu Mar 15 21:29:36 2018 +0100
@@ -69,6 +69,7 @@
 #include "trace/traceMacros.hpp"
 #include "utilities/align.hpp"
 #include "utilities/bitMap.inline.hpp"
+#include "utilities/copy.hpp"
 #include "utilities/exceptions.hpp"
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/growableArray.hpp"

--- a/src/hotspot/share/classfile/classLoader.cpp	Thu Mar 15 21:24:10 2018 +0100
+++ b/src/hotspot/share/classfile/classLoader.cpp	Thu Mar 15 21:29:36 2018 +0100
@@ -64,7 +64,7 @@
 #include "runtime/interfaceSupport.inline.hpp"
 #include "runtime/java.hpp"
 #include "runtime/javaCalls.hpp"
-#include "runtime/os.hpp"
+#include "runtime/os.inline.hpp"
 #include "runtime/threadCritical.hpp"
 #include "runtime/timer.hpp"
 #include "runtime/vm_version.hpp"

--- a/src/hotspot/share/classfile/javaClasses.cpp	Thu Mar 15 21:24:10 2018 +0100
+++ b/src/hotspot/share/classfile/javaClasses.cpp	Thu Mar 15 21:29:36 2018 +0100
@@ -33,6 +33,7 @@
 #include "code/dependencyContext.hpp"
 #include "code/pcDesc.hpp"
 #include "interpreter/interpreter.hpp"
+#include "interpreter/linkResolver.hpp"
 #include "logging/log.hpp"
 #include "logging/logStream.hpp"
 #include "memory/oopFactory.hpp"

--- a/src/hotspot/share/classfile/sharedPathsMiscInfo.cpp	Thu Mar 15 21:24:10 2018 +0100
+++ b/src/hotspot/share/classfile/sharedPathsMiscInfo.cpp	Thu Mar 15 21:29:36 2018 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,6 +32,7 @@
 #include "memory/metaspaceShared.hpp"
 #include "memory/resourceArea.hpp"
 #include "runtime/arguments.hpp"
+#include "runtime/os.inline.hpp"
 #include "utilities/ostream.hpp"
 
 SharedPathsMiscInfo::SharedPathsMiscInfo() {

--- a/src/hotspot/share/classfile/systemDictionary.cpp	Thu Mar 15 21:24:10 2018 +0100
+++ b/src/hotspot/share/classfile/systemDictionary.cpp	Thu Mar 15 21:29:36 2018 +0100
@@ -76,6 +76,7 @@
 #include "runtime/javaCalls.hpp"
 #include "runtime/mutexLocker.hpp"
 #include "runtime/orderAccess.inline.hpp"
+#include "runtime/sharedRuntime.hpp"
 #include "runtime/signature.hpp"
 #include "services/classLoadingService.hpp"
 #include "services/diagnosticCommand.hpp"

--- a/src/hotspot/share/code/oopRecorder.cpp	Thu Mar 15 21:24:10 2018 +0100
+++ b/src/hotspot/share/code/oopRecorder.cpp	Thu Mar 15 21:29:36 2018 +0100
@@ -30,6 +30,7 @@
 #include "memory/allocation.inline.hpp"
 #include "oops/oop.inline.hpp"
 #include "runtime/jniHandles.inline.hpp"
+#include "utilities/copy.hpp"
 
 #ifdef ASSERT
 template <class T> int ValueRecorder<T>::_find_index_calls = 0;
@@ -201,4 +202,3 @@
   }
   return _values.at(location).index();
 }
-

--- a/src/hotspot/share/gc/g1/g1CardLiveData.cpp	Thu Mar 15 21:24:10 2018 +0100
+++ b/src/hotspot/share/gc/g1/g1CardLiveData.cpp	Thu Mar 15 21:29:36 2018 +0100
@@ -29,6 +29,7 @@
 #include "gc/shared/suspendibleThreadSet.hpp"
 #include "gc/shared/workgroup.hpp"
 #include "logging/log.hpp"
+#include "memory/resourceArea.hpp"
 #include "memory/universe.hpp"
 #include "runtime/atomic.hpp"
 #include "runtime/globals.hpp"

--- a/src/hotspot/share/gc/shared/collectedHeap.cpp	Thu Mar 15 21:24:10 2018 +0100
+++ b/src/hotspot/share/gc/shared/collectedHeap.cpp	Thu Mar 15 21:29:36 2018 +0100
@@ -586,6 +586,41 @@
   initialize_serviceability();
 }
 
+#ifndef PRODUCT
+
+bool CollectedHeap::promotion_should_fail(volatile size_t* count) {
+  // Access to count is not atomic; the value does not have to be exact.
+  if (PromotionFailureALot) {
+    const size_t gc_num = total_collections();
+    const size_t elapsed_gcs = gc_num - _promotion_failure_alot_gc_number;
+    if (elapsed_gcs >= PromotionFailureALotInterval) {
+      // Test for unsigned arithmetic wrap-around.
+      if (++*count >= PromotionFailureALotCount) {
+        *count = 0;
+        return true;
+      }
+    }
+  }
+  return false;
+}
+
+bool CollectedHeap::promotion_should_fail() {
+  return promotion_should_fail(&_promotion_failure_alot_count);
+}
+
+void CollectedHeap::reset_promotion_should_fail(volatile size_t* count) {
+  if (PromotionFailureALot) {
+    _promotion_failure_alot_gc_number = total_collections();
+    *count = 0;
+  }
+}
+
+void CollectedHeap::reset_promotion_should_fail() {
+  reset_promotion_should_fail(&_promotion_failure_alot_count);
+}
+
+#endif  // #ifndef PRODUCT
+
 oop CollectedHeap::pin_object(JavaThread* thread, oop o) {
   Handle handle(thread, o);
   GCLocker::lock_critical(thread);

--- a/src/hotspot/share/gc/shared/collectedHeap.hpp	Thu Mar 15 21:24:10 2018 +0100
+++ b/src/hotspot/share/gc/shared/collectedHeap.hpp	Thu Mar 15 21:29:36 2018 +0100
@@ -602,13 +602,13 @@
   // Support for PromotionFailureALot.  Return true if it's time to cause a
   // promotion failure.  The no-argument version uses
   // this->_promotion_failure_alot_count as the counter.
-  inline bool promotion_should_fail(volatile size_t* count);
-  inline bool promotion_should_fail();
+  bool promotion_should_fail(volatile size_t* count);
+  bool promotion_should_fail();
 
   // Reset the PromotionFailureALot counters.  Should be called at the end of a
   // GC in which promotion failure occurred.
-  inline void reset_promotion_should_fail(volatile size_t* count);
-  inline void reset_promotion_should_fail();
+  void reset_promotion_should_fail(volatile size_t* count);
+  void reset_promotion_should_fail();
 #endif  // #ifndef PRODUCT
 
 #ifdef ASSERT

--- a/src/hotspot/share/gc/shared/collectedHeap.inline.hpp	Thu Mar 15 21:24:10 2018 +0100
+++ b/src/hotspot/share/gc/shared/collectedHeap.inline.hpp	Thu Mar 15 21:29:36 2018 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -299,39 +299,4 @@
   }
 }
 
-#ifndef PRODUCT
-
-inline bool
-CollectedHeap::promotion_should_fail(volatile size_t* count) {
-  // Access to count is not atomic; the value does not have to be exact.
-  if (PromotionFailureALot) {
-    const size_t gc_num = total_collections();
-    const size_t elapsed_gcs = gc_num - _promotion_failure_alot_gc_number;
-    if (elapsed_gcs >= PromotionFailureALotInterval) {
-      // Test for unsigned arithmetic wrap-around.
-      if (++*count >= PromotionFailureALotCount) {
-        *count = 0;
-        return true;
-      }
-    }
-  }
-  return false;
-}
-
-inline bool CollectedHeap::promotion_should_fail() {
-  return promotion_should_fail(&_promotion_failure_alot_count);
-}
-
-inline void CollectedHeap::reset_promotion_should_fail(volatile size_t* count) {
-  if (PromotionFailureALot) {
-    _promotion_failure_alot_gc_number = total_collections();
-    *count = 0;
-  }
-}
-
-inline void CollectedHeap::reset_promotion_should_fail() {
-  reset_promotion_should_fail(&_promotion_failure_alot_count);
-}
-#endif  // #ifndef PRODUCT
-
 #endif // SHARE_VM_GC_SHARED_COLLECTEDHEAP_INLINE_HPP

--- a/src/hotspot/share/interpreter/interpreterRuntime.cpp	Thu Mar 15 21:24:10 2018 +0100
+++ b/src/hotspot/share/interpreter/interpreterRuntime.cpp	Thu Mar 15 21:29:36 2018 +0100
@@ -65,6 +65,7 @@
 #include "runtime/synchronizer.hpp"
 #include "runtime/threadCritical.hpp"
 #include "utilities/align.hpp"
+#include "utilities/copy.hpp"
 #include "utilities/events.hpp"
 #ifdef COMPILER2
 #include "opto/runtime.hpp"

--- a/src/hotspot/share/jvmci/jvmciCodeInstaller.cpp	Thu Mar 15 21:24:10 2018 +0100
+++ b/src/hotspot/share/jvmci/jvmciCodeInstaller.cpp	Thu Mar 15 21:29:36 2018 +0100
@@ -43,6 +43,7 @@
 #include "runtime/javaCalls.hpp"
 #include "runtime/jniHandles.inline.hpp"
 #include "runtime/safepointMechanism.inline.hpp"
+#include "runtime/sharedRuntime.hpp"
 #include "utilities/align.hpp"
 
 // frequently used constants

--- a/src/hotspot/share/jvmci/jvmciCompilerToVM.cpp	Thu Mar 15 21:24:10 2018 +0100
+++ b/src/hotspot/share/jvmci/jvmciCompilerToVM.cpp	Thu Mar 15 21:29:36 2018 +0100
@@ -25,6 +25,7 @@
 #include "ci/ciUtilities.inline.hpp"
 #include "classfile/javaClasses.inline.hpp"
 #include "code/scopeDesc.hpp"
+#include "interpreter/linkResolver.hpp"
 #include "memory/oopFactory.hpp"
 #include "oops/cpCache.inline.hpp"
 #include "oops/generateOopMap.hpp"

--- a/src/hotspot/share/jvmci/jvmciCompilerToVMInit.cpp	Thu Mar 15 21:24:10 2018 +0100
+++ b/src/hotspot/share/jvmci/jvmciCompilerToVMInit.cpp	Thu Mar 15 21:29:36 2018 +0100
@@ -29,6 +29,7 @@
 #include "jvmci/jvmciCompilerToVM.hpp"
 #include "jvmci/vmStructs_jvmci.hpp"
 #include "runtime/handles.inline.hpp"
+#include "runtime/sharedRuntime.hpp"
 #include "utilities/resourceHash.hpp"
 
 

--- a/src/hotspot/share/memory/virtualspace.cpp	Thu Mar 15 21:24:10 2018 +0100
+++ b/src/hotspot/share/memory/virtualspace.cpp	Thu Mar 15 21:29:36 2018 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
 #include "memory/virtualspace.hpp"
 #include "oops/markOop.hpp"
 #include "oops/oop.inline.hpp"
+#include "runtime/os.inline.hpp"
 #include "services/memTracker.hpp"
 #include "utilities/align.hpp"
 

--- a/src/hotspot/share/oops/cpCache.cpp	Thu Mar 15 21:24:10 2018 +0100
+++ b/src/hotspot/share/oops/cpCache.cpp	Thu Mar 15 21:29:36 2018 +0100
@@ -27,6 +27,7 @@
 #include "interpreter/bytecodeStream.hpp"
 #include "interpreter/bytecodes.hpp"
 #include "interpreter/interpreter.hpp"
+#include "interpreter/linkResolver.hpp"
 #include "interpreter/rewriter.hpp"
 #include "logging/log.hpp"
 #include "memory/metadataFactory.hpp"

--- a/src/hotspot/share/oops/klassVtable.cpp	Thu Mar 15 21:24:10 2018 +0100
+++ b/src/hotspot/share/oops/klassVtable.cpp	Thu Mar 15 21:29:36 2018 +0100
@@ -27,6 +27,7 @@
 #include "classfile/systemDictionary.hpp"
 #include "classfile/vmSymbols.hpp"
 #include "gc/shared/gcLocker.hpp"
+#include "interpreter/linkResolver.hpp"
 #include "logging/log.hpp"
 #include "logging/logStream.hpp"
 #include "memory/metaspaceShared.hpp"

--- a/src/hotspot/share/oops/oop.inline.hpp	Thu Mar 15 21:24:10 2018 +0100
+++ b/src/hotspot/share/oops/oop.inline.hpp	Thu Mar 15 21:29:36 2018 +0100
@@ -26,8 +26,7 @@
 #define SHARE_VM_OOPS_OOP_INLINE_HPP
 
 #include "gc/shared/ageTable.hpp"
-#include "gc/shared/collectedHeap.inline.hpp"
-#include "gc/shared/genCollectedHeap.hpp"
+#include "gc/shared/collectedHeap.hpp"
 #include "gc/shared/generation.hpp"
 #include "oops/access.inline.hpp"
 #include "oops/arrayKlass.hpp"

--- a/src/hotspot/share/prims/methodComparator.cpp	Thu Mar 15 21:24:10 2018 +0100
+++ b/src/hotspot/share/prims/methodComparator.cpp	Thu Mar 15 21:29:36 2018 +0100
@@ -23,6 +23,7 @@
  */
 
 #include "precompiled.hpp"
+#include "memory/resourceArea.hpp"
 #include "oops/constantPool.inline.hpp"
 #include "oops/oop.inline.hpp"
 #include "oops/symbol.hpp"

--- a/src/hotspot/share/prims/resolvedMethodTable.cpp	Thu Mar 15 21:24:10 2018 +0100
+++ b/src/hotspot/share/prims/resolvedMethodTable.cpp	Thu Mar 15 21:29:36 2018 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,8 +23,10 @@
  */
 
 #include "precompiled.hpp"
+#include "classfile/javaClasses.hpp"
 #include "gc/shared/gcLocker.hpp"
 #include "memory/allocation.hpp"
+#include "memory/resourceArea.hpp"
 #include "oops/access.inline.hpp"
 #include "oops/oop.inline.hpp"
 #include "oops/method.hpp"

--- a/src/hotspot/share/prims/whitebox.cpp	Thu Mar 15 21:24:10 2018 +0100
+++ b/src/hotspot/share/prims/whitebox.cpp	Thu Mar 15 21:29:36 2018 +0100
@@ -61,6 +61,7 @@
 #include "runtime/thread.hpp"
 #include "runtime/threadSMR.hpp"
 #include "runtime/vm_version.hpp"
+#include "services/memoryService.hpp"
 #include "utilities/align.hpp"
 #include "utilities/debug.hpp"
 #include "utilities/elfFile.hpp"

--- a/src/hotspot/share/runtime/arguments.cpp	Thu Mar 15 21:24:10 2018 +0100
+++ b/src/hotspot/share/runtime/arguments.cpp	Thu Mar 15 21:29:36 2018 +0100
@@ -49,7 +49,7 @@
 #include "runtime/globals.hpp"
 #include "runtime/globals_extension.hpp"
 #include "runtime/java.hpp"
-#include "runtime/os.hpp"
+#include "runtime/os.inline.hpp"
 #include "runtime/safepoint.hpp"
 #include "runtime/safepointMechanism.hpp"
 #include "runtime/vm_version.hpp"

--- a/src/hotspot/share/runtime/javaCalls.cpp	Thu Mar 15 21:24:10 2018 +0100
+++ b/src/hotspot/share/runtime/javaCalls.cpp	Thu Mar 15 21:29:36 2018 +0100
@@ -40,6 +40,7 @@
 #include "runtime/jniHandles.inline.hpp"
 #include "runtime/mutexLocker.hpp"
 #include "runtime/os.inline.hpp"
+#include "runtime/sharedRuntime.hpp"
 #include "runtime/signature.hpp"
 #include "runtime/stubRoutines.hpp"
 #include "runtime/thread.inline.hpp"

--- a/src/hotspot/share/runtime/objectMonitor.cpp	Thu Mar 15 21:24:10 2018 +0100
+++ b/src/hotspot/share/runtime/objectMonitor.cpp	Thu Mar 15 21:29:36 2018 +0100
@@ -37,6 +37,7 @@
 #include "runtime/orderAccess.inline.hpp"
 #include "runtime/osThread.hpp"
 #include "runtime/safepointMechanism.inline.hpp"
+#include "runtime/sharedRuntime.hpp"
 #include "runtime/stubRoutines.hpp"
 #include "runtime/thread.inline.hpp"
 #include "services/threadService.hpp"

--- a/src/hotspot/share/runtime/os.cpp	Thu Mar 15 21:24:10 2018 +0100
+++ b/src/hotspot/share/runtime/os.cpp	Thu Mar 15 21:29:36 2018 +0100
@@ -53,6 +53,7 @@
 #include "runtime/javaCalls.hpp"
 #include "runtime/mutexLocker.hpp"
 #include "runtime/os.inline.hpp"
+#include "runtime/sharedRuntime.hpp"
 #include "runtime/stubRoutines.hpp"
 #include "runtime/thread.inline.hpp"
 #include "runtime/threadSMR.hpp"

--- a/src/hotspot/share/runtime/synchronizer.cpp	Thu Mar 15 21:24:10 2018 +0100
+++ b/src/hotspot/share/runtime/synchronizer.cpp	Thu Mar 15 21:29:36 2018 +0100
@@ -39,6 +39,7 @@
 #include "runtime/objectMonitor.hpp"
 #include "runtime/objectMonitor.inline.hpp"
 #include "runtime/osThread.hpp"
+#include "runtime/sharedRuntime.hpp"
 #include "runtime/stubRoutines.hpp"
 #include "runtime/synchronizer.hpp"
 #include "runtime/thread.inline.hpp"

--- a/src/hotspot/share/runtime/vframeArray.cpp	Thu Mar 15 21:24:10 2018 +0100
+++ b/src/hotspot/share/runtime/vframeArray.cpp	Thu Mar 15 21:29:36 2018 +0100
@@ -40,6 +40,7 @@
 #include "runtime/vframe.hpp"
 #include "runtime/vframeArray.hpp"
 #include "runtime/vframe_hp.hpp"
+#include "utilities/copy.hpp"
 #include "utilities/events.hpp"
 #ifdef COMPILER2
 #include "opto/runtime.hpp"

--- a/src/hotspot/share/services/heapDumper.cpp	Thu Mar 15 21:24:10 2018 +0100
+++ b/src/hotspot/share/services/heapDumper.cpp	Thu Mar 15 21:29:36 2018 +0100
@@ -41,7 +41,7 @@
 #include "runtime/handles.inline.hpp"
 #include "runtime/javaCalls.hpp"
 #include "runtime/jniHandles.hpp"
-#include "runtime/os.hpp"
+#include "runtime/os.inline.hpp"
 #include "runtime/reflectionUtils.hpp"
 #include "runtime/thread.inline.hpp"
 #include "runtime/threadSMR.hpp"

--- a/src/hotspot/share/services/memoryService.cpp	Thu Mar 15 21:24:10 2018 +0100
+++ b/src/hotspot/share/services/memoryService.cpp	Thu Mar 15 21:29:36 2018 +0100
@@ -29,6 +29,7 @@
 #include "logging/logConfiguration.hpp"
 #include "memory/heap.hpp"
 #include "memory/memRegion.hpp"
+#include "memory/resourceArea.hpp"
 #include "oops/oop.inline.hpp"
 #include "runtime/globals.hpp"
 #include "runtime/handles.inline.hpp"

--- a/src/hotspot/share/utilities/ostream.cpp	Thu Mar 15 21:24:10 2018 +0100
+++ b/src/hotspot/share/utilities/ostream.cpp	Thu Mar 15 21:29:36 2018 +0100
@@ -28,7 +28,7 @@
 #include "memory/allocation.inline.hpp"
 #include "oops/oop.inline.hpp"
 #include "runtime/arguments.hpp"
-#include "runtime/os.hpp"
+#include "runtime/os.inline.hpp"
 #include "runtime/vm_version.hpp"
 #include "utilities/defaultStream.hpp"
 #include "utilities/macros.hpp"