--- a/src/hotspot/share/gc/epsilon/epsilonArguments.cpp	Wed May 30 09:49:56 2018 +0200
+++ b/src/hotspot/share/gc/epsilon/epsilonArguments.cpp	Wed May 30 10:05:17 2018 +0200
@@ -45,7 +45,6 @@
     FLAG_SET_DEFAULT(ExitOnOutOfMemoryError, true);
   }
 
-#if INCLUDE_EPSILONGC
   if (EpsilonMaxTLABSize < MinTLABSize) {
     warning("EpsilonMaxTLABSize < MinTLABSize, adjusting it to " SIZE_FORMAT, MinTLABSize);
     EpsilonMaxTLABSize = MinTLABSize;
@@ -55,7 +54,6 @@
     warning("Disabling EpsilonElasticTLABDecay because EpsilonElasticTLAB is disabled");
     FLAG_SET_DEFAULT(EpsilonElasticTLABDecay, false);
   }
-#endif
 
 #ifdef COMPILER2
   // Enable loop strip mining: there are still non-GC safepoints, no need to make it worse

--- a/src/hotspot/share/gc/epsilon/epsilonMemoryPool.hpp	Wed May 30 09:49:56 2018 +0200
+++ b/src/hotspot/share/gc/epsilon/epsilonMemoryPool.hpp	Wed May 30 10:05:17 2018 +0200
@@ -25,11 +25,9 @@
 #define SHARE_VM_GC_EPSILON_EPSILONMEMORYPOOL_HPP
 
 #include "utilities/macros.hpp"
-#if INCLUDE_EPSILONGC
 #include "gc/epsilon/epsilonHeap.hpp"
 #include "services/memoryPool.hpp"
 #include "services/memoryUsage.hpp"
-#endif // INCLUDE_EPSILONGC
 
 class EpsilonMemoryPool : public CollectedMemoryPool {
 private: