--- old/src/share/vm/memory/metaspace.cpp	2015-05-13 13:52:52.592231474 +0200
+++ new/src/share/vm/memory/metaspace.cpp	2015-05-13 13:52:52.497227532 +0200
@@ -22,14 +22,13 @@
  *
  */
 #include "precompiled.hpp"
-#include "gc_interface/collectedHeap.hpp"
+#include "gc/shared/collectedHeap.hpp"
+#include "gc/shared/collectorPolicy.hpp"
+#include "gc/shared/gcLocker.hpp"
 #include "memory/allocation.hpp"
 #include "memory/binaryTreeDictionary.hpp"
-#include "memory/freeList.hpp"
-#include "memory/collectorPolicy.hpp"
 #include "memory/filemap.hpp"
 #include "memory/freeList.hpp"
-#include "memory/gcLocker.hpp"
 #include "memory/metachunk.hpp"
 #include "memory/metaspace.hpp"
 #include "memory/metaspaceGCThresholdUpdater.hpp"