--- a/src/hotspot/share/interpreter/templateTable.hpp	Mon Oct 08 14:57:07 2018 -0400
+++ b/src/hotspot/share/interpreter/templateTable.hpp	Fri Oct 05 23:45:02 2018 +0200
@@ -36,6 +36,7 @@
 // and the snippet generator, a template is assigned to each bytecode which can be
 // used to generate the bytecode's implementation if needed.
 
+class BarrierSet;
 class InterpreterMacroAssembler;
 
 // A Template describes the properties of a code template for a given bytecode

--- a/src/hotspot/share/oops/oop.hpp	Mon Oct 08 14:57:07 2018 -0400
+++ b/src/hotspot/share/oops/oop.hpp	Fri Oct 05 23:45:02 2018 +0200
@@ -46,7 +46,6 @@
 class ScanClosure;
 class FastScanClosure;
 class FilteringClosure;
-class BarrierSet;
 class CMSIsAliveClosure;
 
 class PSPromotionManager;