--- old/src/hotspot/share/gc/z/zServiceability.hpp	2018-03-14 08:46:58.455588853 +0100
+++ new/src/hotspot/share/gc/z/zServiceability.hpp	2018-03-14 08:46:58.283581485 +0100
@@ -44,7 +44,7 @@
   ZServiceabilityMemoryManager(ZServiceabilityMemoryPool* pool);
 };
 
-class ZServiceability VALUE_OBJ_CLASS_SPEC {
+class ZServiceability {
 private:
   const size_t                 _min_capacity;
   const size_t                 _max_capacity;
@@ -62,12 +62,12 @@
   ZServiceabilityCounters* counters();
 };
 
-class ZServiceabilityMemoryUsageTracker VALUE_OBJ_CLASS_SPEC {
+class ZServiceabilityMemoryUsageTracker {
 public:
   ~ZServiceabilityMemoryUsageTracker();
 };
 
-class ZServiceabilityManagerStatsTracer VALUE_OBJ_CLASS_SPEC {
+class ZServiceabilityManagerStatsTracer {
 private:
   TraceMemoryManagerStats _stats;
 
@@ -75,7 +75,7 @@
   ZServiceabilityManagerStatsTracer(bool is_gc_begin, bool is_gc_end);
 };
 
-class ZServiceabilityCountersTracer VALUE_OBJ_CLASS_SPEC {
+class ZServiceabilityCountersTracer {
 public:
   ZServiceabilityCountersTracer();
   ~ZServiceabilityCountersTracer();