--- old/src/share/vm/runtime/os.cpp 2015-05-12 11:52:54.707929311 +0200 +++ new/src/share/vm/runtime/os.cpp 2015-05-12 11:52:54.606925089 +0200 @@ -30,7 +30,7 @@ #include "code/codeCache.hpp" #include "code/icBuffer.hpp" #include "code/vtableStubs.hpp" -#include "gc_implementation/shared/vmGCOperations.hpp" +#include "gc/shared/vmGCOperations.hpp" #include "interpreter/interpreter.hpp" #include "memory/allocation.inline.hpp" #ifdef ASSERT @@ -52,9 +52,9 @@ #include "runtime/thread.inline.hpp" #include "runtime/vm_version.hpp" #include "services/attachListener.hpp" -#include "services/nmtCommon.hpp" #include "services/mallocTracker.hpp" #include "services/memTracker.hpp" +#include "services/nmtCommon.hpp" #include "services/threadService.hpp" #include "utilities/defaultStream.hpp" #include "utilities/events.hpp"