--- old/src/share/vm/runtime/timer.cpp	2015-02-18 13:26:50.178354965 +0100
+++ new/src/share/vm/runtime/timer.cpp	2015-02-18 13:26:50.117353165 +0100
@@ -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
@@ -26,9 +26,6 @@
 #include "oops/oop.inline.hpp"
 #include "runtime/timer.hpp"
 #include "utilities/ostream.hpp"
-#ifdef INCLUDE_ALL_GCS
-#include "gc_implementation/g1/g1GCPhaseTimes.hpp"
-#endif
 
 double TimeHelper::counter_to_seconds(jlong counter) {
   double count = (double) counter;
@@ -143,7 +140,7 @@
   }
 }
 
-TrackPhaseTime::TrackPhaseTime(GCPhaseTimeTracker *data, uint phase) :
+TrackPhaseTime::TrackPhaseTime(PhaseTimeData *data, uint phase) :
   _data(data), _phase(phase) {
   if (_data != NULL && _data->active()) {
     _last = os::elapsed_counter();