--- 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 */
--- old/src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp	2018-04-27 16:02:18.374134831 +0200
+++ new/src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp	2018-04-27 16:02:18.130134840 +0200
@@ -781,23 +781,6 @@
 
   void resolve_jobject(Register value, Register thread, Register tmp);
 
-#if INCLUDE_ALL_GCS
-
-  void g1_write_barrier_pre(Register obj,
-                            Register pre_val,
-                            Register thread,
-                            Register tmp,
-                            bool tosca_live,
-                            bool expand_call);
-
-  void g1_write_barrier_post(Register store_addr,
-                             Register new_val,
-                             Register thread,
-                             Register tmp,
-                             Register tmp2);
-
-#endif // INCLUDE_ALL_GCS
-
   // oop manipulations
   void load_klass(Register dst, Register src);
   void store_klass(Register dst, Register src);
--- old/src/hotspot/cpu/arm/assembler_arm.cpp	2018-04-27 16:02:18.758134818 +0200
+++ new/src/hotspot/cpu/arm/assembler_arm.cpp	2018-04-27 16:02:18.514134827 +0200
@@ -42,10 +42,6 @@
 #include "runtime/stubRoutines.hpp"
 #include "utilities/hashtable.hpp"
 #include "utilities/macros.hpp"
-#if INCLUDE_ALL_GCS
-#include "gc/g1/g1BarrierSet.hpp"
-#include "gc/g1/heapRegion.hpp"
-#endif // INCLUDE_ALL_GCS
 
 int AbstractAssembler::code_fill_byte() {
   return 0xff; // illegal instruction 0xffffffff
--- old/src/hotspot/cpu/arm/assembler_arm_32.cpp	2018-04-27 16:02:19.130134805 +0200
+++ new/src/hotspot/cpu/arm/assembler_arm_32.cpp	2018-04-27 16:02:18.890134813 +0200
@@ -42,10 +42,6 @@
 #include "runtime/stubRoutines.hpp"
 #include "utilities/hashtable.hpp"
 #include "utilities/macros.hpp"
-#if INCLUDE_ALL_GCS
-#include "gc/g1/g1BarrierSet.hpp"
-#include "gc/g1/heapRegion.hpp"
-#endif // INCLUDE_ALL_GCS
 
 #ifdef COMPILER2
 // Convert the raw encoding form into the form expected by the
--- old/src/hotspot/cpu/arm/assembler_arm_64.cpp	2018-04-27 16:02:19.498134792 +0200
+++ new/src/hotspot/cpu/arm/assembler_arm_64.cpp	2018-04-27 16:02:19.254134801 +0200
@@ -42,10 +42,6 @@
 #include "runtime/stubRoutines.hpp"
 #include "utilities/hashtable.hpp"
 #include "utilities/macros.hpp"
-#if INCLUDE_ALL_GCS
-#include "gc/g1/g1BarrierSet.hpp"
-#include "gc/g1/heapRegion.hpp"
-#endif // INCLUDE_ALL_GCS
 
 // Returns whether given imm has equal bit fields <0:size-1> and <size:2*size-1>.
 inline bool Assembler::LogicalImmediate::has_equal_subpatterns(uintx imm, int size) {
--- old/src/hotspot/cpu/arm/interp_masm_arm.cpp	2018-04-27 16:02:19.870134779 +0200
+++ new/src/hotspot/cpu/arm/interp_masm_arm.cpp	2018-04-27 16:02:19.630134788 +0200
@@ -43,11 +43,6 @@
 #include "runtime/frame.inline.hpp"
 #include "runtime/sharedRuntime.hpp"
 
-#if INCLUDE_ALL_GCS
-#include "gc/g1/g1BarrierSet.hpp"
-#include "gc/g1/heapRegion.hpp"
-#endif // INCLUDE_ALL_GCS
-
 //--------------------------------------------------------------------
 // Implementation of InterpreterMacroAssembler
 
--- old/src/hotspot/cpu/ppc/assembler_ppc.cpp	2018-04-27 16:02:20.286134765 +0200
+++ new/src/hotspot/cpu/ppc/assembler_ppc.cpp	2018-04-27 16:02:20.042134773 +0200
@@ -37,10 +37,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
--- old/src/hotspot/cpu/s390/assembler_s390.cpp	2018-04-27 16:02:20.674134751 +0200
+++ new/src/hotspot/cpu/s390/assembler_s390.cpp	2018-04-27 16:02:20.430134760 +0200
@@ -38,10 +38,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
 
 // Convention: Use Z_R0 and Z_R1 instead of Z_scratch_* in all
 // assembler_s390.* files.
--- old/src/hotspot/cpu/x86/assembler_x86.cpp	2018-04-27 16:02:21.050134738 +0200
+++ new/src/hotspot/cpu/x86/assembler_x86.cpp	2018-04-27 16:02:20.806134747 +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 */
--- old/src/hotspot/cpu/zero/assembler_zero.cpp	2018-04-27 16:02:21.558134720 +0200
+++ new/src/hotspot/cpu/zero/assembler_zero.cpp	2018-04-27 16:02:21.318134729 +0200
@@ -37,10 +37,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
 
 int AbstractAssembler::code_fill_byte() {
   return 0;