--- a/src/hotspot/share/jvmci/vmStructs_jvmci.cpp	Tue Mar 06 13:08:59 2018 +0100
+++ b/src/hotspot/share/jvmci/vmStructs_jvmci.cpp	Tue Mar 06 08:36:44 2018 +0100
@@ -41,7 +41,8 @@
 #include "runtime/vm_version.hpp"
 
 #if INCLUDE_ALL_GCS
-#include "gc/g1/g1SATBCardTableModRefBS.hpp"
+#include "gc/g1/g1BarrierSet.hpp"
+#include "gc/g1/g1CardTable.hpp"
 #include "gc/g1/heapRegion.hpp"
 #endif