--- old/src/cpu/x86/vm/assembler_x86.cpp	2017-04-25 16:43:48.135176825 +0200
+++ new/src/cpu/x86/vm/assembler_x86.cpp	2017-04-25 16:43:47.999176830 +0200
@@ -37,11 +37,6 @@
 #include "runtime/sharedRuntime.hpp"
 #include "runtime/stubRoutines.hpp"
 #include "utilities/macros.hpp"
-#if INCLUDE_ALL_GCS
-#include "gc/g1/g1CollectedHeap.inline.hpp"
-#include "gc/g1/g1SATBCardTableModRefBS.hpp"
-#include "gc/g1/heapRegion.hpp"
-#endif // INCLUDE_ALL_GCS
 
 #ifdef PRODUCT
 #define BLOCK_COMMENT(str) /* nothing */