--- a/src/hotspot/share/gc/epsilon/epsilonBarrierSet.hpp	Wed May 30 14:02:58 2018 +0200
+++ b/src/hotspot/share/gc/epsilon/epsilonBarrierSet.hpp	Wed May 30 14:03:03 2018 +0200
@@ -24,7 +24,6 @@
 #ifndef SHARE_VM_GC_EPSILON_BARRIERSET_HPP
 #define SHARE_VM_GC_EPSILON_BARRIERSET_HPP
 
-#include "gc/shared/collectorPolicy.hpp"
 #include "gc/shared/barrierSetAssembler.hpp"
 #include "gc/shared/barrierSet.hpp"
 

--- a/src/hotspot/share/gc/epsilon/epsilonMemoryPool.cpp	Wed May 30 14:02:58 2018 +0200
+++ b/src/hotspot/share/gc/epsilon/epsilonMemoryPool.cpp	Wed May 30 14:03:03 2018 +0200
@@ -24,7 +24,7 @@
 
 #include "precompiled.hpp"
 #include "gc/epsilon/epsilonHeap.hpp"
-#include "epsilonMemoryPool.hpp"
+#include "gc/epsilon/epsilonMemoryPool.hpp"
 
 EpsilonMemoryPool::EpsilonMemoryPool(EpsilonHeap* heap) :
         _heap(heap),

--- a/src/hotspot/share/gc/epsilon/epsilonMemoryPool.hpp	Wed May 30 14:02:58 2018 +0200
+++ b/src/hotspot/share/gc/epsilon/epsilonMemoryPool.hpp	Wed May 30 14:03:03 2018 +0200
@@ -24,10 +24,10 @@
 #ifndef SHARE_VM_GC_EPSILON_EPSILONMEMORYPOOL_HPP
 #define SHARE_VM_GC_EPSILON_EPSILONMEMORYPOOL_HPP
 
-#include "utilities/macros.hpp"
 #include "gc/epsilon/epsilonHeap.hpp"
 #include "services/memoryPool.hpp"
 #include "services/memoryUsage.hpp"
+#include "utilities/macros.hpp"
 
 class EpsilonMemoryPool : public CollectedMemoryPool {
 private:

--- a/src/hotspot/share/gc/epsilon/epsilonThreadLocalData.hpp	Wed May 30 14:02:58 2018 +0200
+++ b/src/hotspot/share/gc/epsilon/epsilonThreadLocalData.hpp	Wed May 30 14:03:03 2018 +0200
@@ -24,6 +24,9 @@
 #ifndef SHARE_VM_GC_EPSILON_EPSILONTHREADLOCALDATA_HPP
 #define SHARE_VM_GC_EPSILON_EPSILONTHREADLOCALDATA_HPP
 
+#include "runtime/thread.hpp"
+#include "utilities/debug.hpp"
+
 class EpsilonThreadLocalData {
 private:
   size_t _ergo_tlab_size;