--- a/src/hotspot/share/gc/shared/barrierSetConfig.hpp	Thu May 03 22:30:08 2018 +0200
+++ b/src/hotspot/share/gc/shared/barrierSetConfig.hpp	Fri May 04 19:16:56 2018 +0200
@@ -27,18 +27,11 @@
 
 #include "utilities/macros.hpp"
 
-#if INCLUDE_ALL_GCS
-#define FOR_EACH_CONCRETE_INCLUDE_ALL_GC_BARRIER_SET_DO(f) \
-  f(G1BarrierSet)                                          \
-  f(Epsilon)
-#else
-#define FOR_EACH_CONCRETE_INCLUDE_ALL_GC_BARRIER_SET_DO(f)
-#endif
-
 // Do something for each concrete barrier set part of the build.
 #define FOR_EACH_CONCRETE_BARRIER_SET_DO(f)          \
   f(CardTableBarrierSet)                             \
-  FOR_EACH_CONCRETE_INCLUDE_ALL_GC_BARRIER_SET_DO(f)
+  G1GC_ONLY(f(G1BarrierSet))                         \
+  EPSILONGC_ONLY(f(EpsilonBarrierSet))
 
 #define FOR_EACH_ABSTRACT_BARRIER_SET_DO(f)          \
   f(ModRef)