--- old/src/share/vm/gc/serial/defNewGeneration.cpp	2016-08-31 11:44:56.516587870 +0200
+++ new/src/share/vm/gc/serial/defNewGeneration.cpp	2016-08-31 11:44:56.376583550 +0200
@@ -569,8 +569,8 @@
 
   _tenuring_threshold = age_table()->compute_tenuring_threshold(desired_survivor_size);
 
-  GCPolicyCounters* gc_counters = GenCollectedHeap::heap()->gen_policy()->counters();
   if (UsePerfData) {
+    GCPolicyCounters* gc_counters = GenCollectedHeap::heap()->gen_policy()->counters();
     gc_counters->tenuring_threshold()->set_value(_tenuring_threshold);
     gc_counters->desired_survivor_size()->set_value(desired_survivor_size * oopSize);
   }
--- old/src/share/vm/gc/shared/ageTable.cpp	2016-08-31 11:44:57.313612461 +0200
+++ new/src/share/vm/gc/shared/ageTable.cpp	2016-08-31 11:44:57.169608018 +0200
@@ -27,7 +27,6 @@
 #include "gc/shared/ageTableTracer.hpp"
 #include "gc/shared/collectedHeap.hpp"
 #include "gc/shared/collectorPolicy.hpp"
-#include "gc/shared/gcPolicyCounters.hpp"
 #include "memory/resourceArea.hpp"
 #include "logging/log.hpp"
 #include "oops/oop.inline.hpp"
--- old/src/share/vm/gc/shared/ageTable.hpp	2016-08-31 11:44:58.142638040 +0200
+++ new/src/share/vm/gc/shared/ageTable.hpp	2016-08-31 11:44:58.000633658 +0200
@@ -29,8 +29,6 @@
 #include "oops/oop.hpp"
 #include "runtime/perfData.hpp"
 
-class GCPolicyCounters;
-
 /* Copyright (c) 1992, 2016, Oracle and/or its affiliates, and Stanford University.
    See the LICENSE file for license information. */