--- old/src/hotspot/cpu/s390/assembler_s390.cpp	2018-04-27 16:02:20.674134751 +0200
+++ new/src/hotspot/cpu/s390/assembler_s390.cpp	2018-04-27 16:02:20.430134760 +0200
@@ -38,10 +38,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
 
 // Convention: Use Z_R0 and Z_R1 instead of Z_scratch_* in all
 // assembler_s390.* files.