--- old/src/share/vm/memory/universe.cpp	2015-05-12 11:37:27.786235282 +0200
+++ new/src/share/vm/memory/universe.cpp	2015-05-12 11:37:27.685231076 +0200
@@ -31,18 +31,18 @@
 #include "classfile/vmSymbols.hpp"
 #include "code/codeCache.hpp"
 #include "code/dependencies.hpp"
-#include "gc_interface/collectedHeap.inline.hpp"
+#include "gc/shared/cardTableModRefBS.hpp"
+#include "gc/shared/collectedHeap.inline.hpp"
+#include "gc/shared/gcLocker.inline.hpp"
+#include "gc/shared/genCollectedHeap.hpp"
+#include "gc/shared/genRemSet.hpp"
+#include "gc/shared/generation.hpp"
+#include "gc/shared/space.hpp"
 #include "interpreter/interpreter.hpp"
-#include "memory/cardTableModRefBS.hpp"
 #include "memory/filemap.hpp"
-#include "memory/gcLocker.inline.hpp"
-#include "memory/genCollectedHeap.hpp"
-#include "memory/genRemSet.hpp"
-#include "memory/generation.hpp"
 #include "memory/metadataFactory.hpp"
 #include "memory/metaspaceShared.hpp"
 #include "memory/oopFactory.hpp"
-#include "memory/space.hpp"
 #include "memory/universe.hpp"
 #include "memory/universe.inline.hpp"
 #include "oops/constantPool.hpp"
@@ -71,14 +71,14 @@
 #include "utilities/copy.hpp"
 #include "utilities/events.hpp"
 #include "utilities/hashtable.inline.hpp"
-#include "utilities/preserveException.hpp"
 #include "utilities/macros.hpp"
+#include "utilities/preserveException.hpp"
 #if INCLUDE_ALL_GCS
-#include "gc_implementation/shared/adaptiveSizePolicy.hpp"
-#include "gc_implementation/concurrentMarkSweep/cmsCollectorPolicy.hpp"
-#include "gc_implementation/g1/g1CollectedHeap.inline.hpp"
-#include "gc_implementation/g1/g1CollectorPolicy_ext.hpp"
-#include "gc_implementation/parallelScavenge/parallelScavengeHeap.hpp"
+#include "gc/cms/cmsCollectorPolicy.hpp"
+#include "gc/g1/g1CollectedHeap.inline.hpp"
+#include "gc/g1/g1CollectorPolicy_ext.hpp"
+#include "gc/parallel/parallelScavengeHeap.hpp"
+#include "gc/shared/adaptiveSizePolicy.hpp"
 #endif // INCLUDE_ALL_GCS
 #if INCLUDE_CDS
 #include "classfile/sharedClassUtil.hpp"