--- old/src/hotspot/share/gc/shared/barrierSetConfig.hpp	2018-04-27 15:29:49.122202732 +0200
+++ new/src/hotspot/share/gc/shared/barrierSetConfig.hpp	2018-04-27 15:29:48.878202740 +0200
@@ -27,12 +27,8 @@
 
 #include "utilities/macros.hpp"
 
-#if INCLUDE_ALL_GCS
 #define FOR_EACH_CONCRETE_INCLUDE_ALL_GC_BARRIER_SET_DO(f) \
-  f(G1BarrierSet)
-#else
-#define FOR_EACH_CONCRETE_INCLUDE_ALL_GC_BARRIER_SET_DO(f)
-#endif
+  G1GC_ONLY(f(G1BarrierSet))
 
 // Do something for each concrete barrier set part of the build.
 #define FOR_EACH_CONCRETE_BARRIER_SET_DO(f)          \