--- old/src/hotspot/cpu/x86/assembler_x86.cpp	2018-04-27 15:30:38.846201000 +0200
+++ new/src/hotspot/cpu/x86/assembler_x86.cpp	2018-04-27 15:30:38.590201009 +0200
@@ -36,10 +36,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
 
 #ifdef PRODUCT
 #define BLOCK_COMMENT(str) /* nothing */