--- old/src/hotspot/cpu/zero/assembler_zero.cpp	2018-04-27 16:02:21.558134720 +0200
+++ new/src/hotspot/cpu/zero/assembler_zero.cpp	2018-04-27 16:02:21.318134729 +0200
@@ -37,10 +37,6 @@
 #include "runtime/sharedRuntime.hpp"
 #include "runtime/stubRoutines.hpp"
 #include "utilities/macros.hpp"
-#if INCLUDE_ALL_GCS
-#include "gc/g1/g1BarrierSet.hpp"
-#include "gc/g1/heapRegion.hpp"
-#endif // INCLUDE_ALL_GCS
 
 int AbstractAssembler::code_fill_byte() {
   return 0;