--- a/src/hotspot/share/asm/codeBuffer.cpp	Thu Mar 15 21:29:36 2018 +0100
+++ b/src/hotspot/share/asm/codeBuffer.cpp	Fri Mar 23 18:54:12 2018 +0100
@@ -25,10 +25,10 @@
 #include "precompiled.hpp"
 #include "asm/codeBuffer.hpp"
 #include "compiler/disassembler.hpp"
-#include "gc/shared/gcLocker.hpp"
 #include "oops/methodData.hpp"
 #include "oops/oop.inline.hpp"
 #include "runtime/icache.hpp"
+#include "runtime/safepointVerifiers.hpp"
 #include "utilities/align.hpp"
 #include "utilities/copy.hpp"
 #include "utilities/xmlstream.hpp"