--- old/src/share/vm/oops/klass.hpp	2016-10-25 10:40:07.318776298 +0200
+++ new/src/share/vm/oops/klass.hpp	2016-10-25 10:40:07.270776266 +0200
@@ -33,6 +33,7 @@
 #include "oops/metadata.hpp"
 #include "oops/oop.hpp"
 #include "trace/traceMacros.hpp"
+#include "evtrace/traceMacros.hpp"
 #include "utilities/accessFlags.hpp"
 #include "utilities/macros.hpp"
 #if INCLUDE_ALL_GCS
@@ -172,6 +173,8 @@
 
   TRACE_DEFINE_KLASS_TRACE_ID;
 
+  EVTRACE_DECLARE_TRACKED_CLASS_FIELDS;
+
   // Remembered sets support for the oops in the klasses.
   jbyte _modified_oops;             // Card Table Equivalent (YC/CMS support)
   jbyte _accumulated_modified_oops; // Mod Union Equivalent (CMS support)
@@ -611,6 +614,8 @@
 
   TRACE_DEFINE_KLASS_METHODS;
 
+  EVTRACE_DEFINE_TRACKED_CLASS_METHODS;
+
   // garbage collection support
   virtual void oops_do(OopClosure* cl);