--- a/hotspot/src/share/vm/services/memoryPool.cpp	Mon May 11 16:30:26 2015 +0200
+++ b/hotspot/src/share/vm/services/memoryPool.cpp	Wed May 13 15:16:06 2015 +0200
@@ -25,9 +25,9 @@
 #include "precompiled.hpp"
 #include "classfile/systemDictionary.hpp"
 #include "classfile/vmSymbols.hpp"
-#include "memory/defNewGeneration.hpp"
+#include "gc/serial/defNewGeneration.hpp"
+#include "gc/shared/space.hpp"
 #include "memory/metaspace.hpp"
-#include "memory/space.hpp"
 #include "oops/oop.inline.hpp"
 #include "runtime/handles.inline.hpp"
 #include "runtime/javaCalls.hpp"
@@ -39,7 +39,7 @@
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/macros.hpp"
 #if INCLUDE_ALL_GCS
-#include "gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.hpp"
+#include "gc/cms/compactibleFreeListSpace.hpp"
 #endif
 
 MemoryPool::MemoryPool(const char* name,