--- a/src/hotspot/cpu/x86/assembler_x86.cpp	Fri May 04 09:29:14 2018 +0200
+++ b/src/hotspot/cpu/x86/assembler_x86.cpp	Fri May 04 11:41:35 2018 +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 */