--- old/src/share/vm/runtime/globals.cpp	2015-05-13 13:53:28.770732614 +0200
+++ new/src/share/vm/runtime/globals.cpp	2015-05-13 13:53:28.607725850 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,11 +30,11 @@
 #include "runtime/globals_extension.hpp"
 #include "runtime/os.hpp"
 #include "trace/tracing.hpp"
-#include "utilities/ostream.hpp"
 #include "utilities/macros.hpp"
+#include "utilities/ostream.hpp"
 #include "utilities/top.hpp"
 #if INCLUDE_ALL_GCS
-#include "gc_implementation/g1/g1_globals.hpp"
+#include "gc/g1/g1_globals.hpp"
 #endif // INCLUDE_ALL_GCS
 #ifdef COMPILER1
 #include "c1/c1_globals.hpp"