--- a/hotspot/src/share/vm/opto/type.cpp	Mon May 11 16:30:26 2015 +0200
+++ b/hotspot/src/share/vm/opto/type.cpp	Wed May 13 15:16:06 2015 +0200
@@ -28,8 +28,8 @@
 #include "classfile/symbolTable.hpp"
 #include "classfile/systemDictionary.hpp"
 #include "compiler/compileLog.hpp"
+#include "gc/shared/gcLocker.hpp"
 #include "libadt/dict.hpp"
-#include "memory/gcLocker.hpp"
 #include "memory/oopFactory.hpp"
 #include "memory/resourceArea.hpp"
 #include "oops/instanceKlass.hpp"