--- old/src/hotspot/cpu/arm/assembler_arm.cpp	2018-04-27 16:02:18.758134818 +0200
+++ new/src/hotspot/cpu/arm/assembler_arm.cpp	2018-04-27 16:02:18.514134827 +0200
@@ -42,10 +42,6 @@
 #include "runtime/stubRoutines.hpp"
 #include "utilities/hashtable.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 0xff; // illegal instruction 0xffffffff