--- old/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp	2018-04-27 16:02:17.914134847 +0200
+++ new/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp	2018-04-27 16:02:17.670134856 +0200
@@ -49,11 +49,6 @@
 #include "runtime/jniHandles.inline.hpp"
 #include "runtime/sharedRuntime.hpp"
 #include "runtime/thread.hpp"
-#if INCLUDE_ALL_GCS
-#include "gc/g1/g1BarrierSet.hpp"
-#include "gc/g1/g1CardTable.hpp"
-#include "gc/g1/heapRegion.hpp"
-#endif
 
 #ifdef PRODUCT
 #define BLOCK_COMMENT(str) /* nothing */