--- old/src/hotspot/os_cpu/linux_x86/zBackingFile_linux_x86.hpp	2018-03-14 08:46:50.989268996 +0100
+++ new/src/hotspot/os_cpu/linux_x86/zBackingFile_linux_x86.hpp	2018-03-14 08:46:50.817261628 +0100
@@ -26,7 +26,7 @@
 
 #include "memory/allocation.hpp"
 
-class ZBackingFile VALUE_OBJ_CLASS_SPEC {
+class ZBackingFile {
 private:
   int      _fd;
   uint64_t _filesystem;
--- old/src/hotspot/os_cpu/linux_x86/zPhysicalMemoryBacking_linux_x86.hpp	2018-03-14 08:46:51.217278764 +0100
+++ new/src/hotspot/os_cpu/linux_x86/zPhysicalMemoryBacking_linux_x86.hpp	2018-03-14 08:46:51.058271953 +0100
@@ -31,7 +31,7 @@
 class ZErrno;
 class ZPhysicalMemory;
 
-class ZPhysicalMemoryBacking VALUE_OBJ_CLASS_SPEC {
+class ZPhysicalMemoryBacking {
 private:
   ZMemoryManager _manager;
   ZBackingFile   _file;
--- old/src/hotspot/share/gc/z/zAddressRangeMap.hpp	2018-03-14 08:46:51.446288575 +0100
+++ new/src/hotspot/share/gc/z/zAddressRangeMap.hpp	2018-03-14 08:46:51.286281720 +0100
@@ -30,7 +30,7 @@
 class ZAddressRangeMapIterator;
 
 template <typename T, size_t AddressRangeShift>
-class ZAddressRangeMap VALUE_OBJ_CLASS_SPEC {
+class ZAddressRangeMap {
   friend class VMStructs;
   friend class ZAddressRangeMapIterator<T, AddressRangeShift>;
 
--- old/src/hotspot/share/gc/z/zAllocationFlags.hpp	2018-03-14 08:46:51.685298814 +0100
+++ new/src/hotspot/share/gc/z/zAllocationFlags.hpp	2018-03-14 08:46:51.515291531 +0100
@@ -49,7 +49,7 @@
 //  * 7-5 Unused (3-bits)
 //
 
-class ZAllocationFlags VALUE_OBJ_CLASS_SPEC {
+class ZAllocationFlags {
 private:
   typedef ZBitField<uint8_t, bool, 0, 1> field_java_thread;
   typedef ZBitField<uint8_t, bool, 1, 1> field_worker_thread;
--- old/src/hotspot/share/gc/z/zArray.hpp	2018-03-14 08:46:51.928309225 +0100
+++ new/src/hotspot/share/gc/z/zArray.hpp	2018-03-14 08:46:51.758301942 +0100
@@ -27,7 +27,7 @@
 #include "memory/allocation.hpp"
 
 template <typename T>
-class ZArray VALUE_OBJ_CLASS_SPEC {
+class ZArray {
 private:
   static const size_t initial_capacity = 32;
 
--- old/src/hotspot/share/gc/z/zForwardingTable.hpp	2018-03-14 08:46:52.167319464 +0100
+++ new/src/hotspot/share/gc/z/zForwardingTable.hpp	2018-03-14 08:46:51.998312224 +0100
@@ -29,7 +29,7 @@
 
 typedef size_t ZForwardingTableCursor;
 
-class ZForwardingTable VALUE_OBJ_CLASS_SPEC {
+class ZForwardingTable {
   friend class VMStructs;
   friend class ZForwardingTableTest;
 
--- old/src/hotspot/share/gc/z/zForwardingTableEntry.hpp	2018-03-14 08:46:52.395329232 +0100
+++ new/src/hotspot/share/gc/z/zForwardingTableEntry.hpp	2018-03-14 08:46:52.235322377 +0100
@@ -43,7 +43,7 @@
 //  * 63-42 From Object Index (22-bits)
 //
 
-class ZForwardingTableEntry VALUE_OBJ_CLASS_SPEC {
+class ZForwardingTableEntry {
   friend struct PrimitiveConversions;
 
 private:
--- old/src/hotspot/share/gc/z/zFuture.hpp	2018-03-14 08:46:52.624339043 +0100
+++ new/src/hotspot/share/gc/z/zFuture.hpp	2018-03-14 08:46:52.463332145 +0100
@@ -28,7 +28,7 @@
 #include "runtime/semaphore.hpp"
 
 template <typename T>
-class ZFuture VALUE_OBJ_CLASS_SPEC {
+class ZFuture {
 private:
   SemaphoreSafepointAware _sema;
   T                       _value;
--- old/src/hotspot/share/gc/z/zHeap.hpp	2018-03-14 08:46:52.864349325 +0100
+++ new/src/hotspot/share/gc/z/zHeap.hpp	2018-03-14 08:46:52.692341956 +0100
@@ -45,7 +45,7 @@
 #include "gc/z/zWorkers.hpp"
 #include "memory/allocation.hpp"
 
-class ZHeap VALUE_OBJ_CLASS_SPEC {
+class ZHeap {
   friend class VMStructs;
 
 private:
--- old/src/hotspot/share/gc/z/zInitialize.hpp	2018-03-14 08:46:53.105359650 +0100
+++ new/src/hotspot/share/gc/z/zInitialize.hpp	2018-03-14 08:46:52.935352367 +0100
@@ -26,7 +26,7 @@
 
 #include "memory/allocation.hpp"
 
-class ZInitialize VALUE_OBJ_CLASS_SPEC {
+class ZInitialize {
 public:
   ZInitialize();
 };
--- old/src/hotspot/share/gc/z/zList.hpp	2018-03-14 08:46:53.342369803 +0100
+++ new/src/hotspot/share/gc/z/zList.hpp	2018-03-14 08:46:53.170362434 +0100
@@ -31,7 +31,7 @@
 
 // Element in a double linked list
 template <typename T>
-class ZListNode VALUE_OBJ_CLASS_SPEC {
+class ZListNode {
   friend class ZList<T>;
 
 private:
@@ -63,7 +63,7 @@
 
 // Double-linked list
 template <typename T>
-class ZList VALUE_OBJ_CLASS_SPEC {
+class ZList {
 private:
   ZListNode<T> _head;
   size_t       _size;
--- old/src/hotspot/share/gc/z/zLiveMap.hpp	2018-03-14 08:46:53.581380042 +0100
+++ new/src/hotspot/share/gc/z/zLiveMap.hpp	2018-03-14 08:46:53.408372631 +0100
@@ -29,7 +29,7 @@
 
 class ObjectClosure;
 
-class ZLiveMap VALUE_OBJ_CLASS_SPEC {
+class ZLiveMap {
   friend class ZLiveMapTest;
 
 private:
--- old/src/hotspot/share/gc/z/zLock.hpp	2018-03-14 08:46:53.821390324 +0100
+++ new/src/hotspot/share/gc/z/zLock.hpp	2018-03-14 08:46:53.649382956 +0100
@@ -27,7 +27,7 @@
 #include "memory/allocation.hpp"
 #include <pthread.h>
 
-class ZLock VALUE_OBJ_CLASS_SPEC {
+class ZLock {
 private:
   pthread_mutex_t _lock;
 
--- old/src/hotspot/share/gc/z/zMark.hpp	2018-03-14 08:46:54.060400564 +0100
+++ new/src/hotspot/share/gc/z/zMark.hpp	2018-03-14 08:46:53.886393109 +0100
@@ -34,7 +34,7 @@
 class ZPageTable;
 class ZWorkers;
 
-class ZMark VALUE_OBJ_CLASS_SPEC {
+class ZMark {
   friend class ZMarkRootsTask;
   friend class ZMarkTask;
   friend class ZMarkTryCompleteTask;
--- old/src/hotspot/share/gc/z/zMarkCache.hpp	2018-03-14 08:46:54.292410503 +0100
+++ new/src/hotspot/share/gc/z/zMarkCache.hpp	2018-03-14 08:46:54.131403605 +0100
@@ -29,7 +29,7 @@
 
 class ZPage;
 
-class ZMarkCacheEntry VALUE_OBJ_CLASS_SPEC {
+class ZMarkCacheEntry {
 private:
   ZPage*   _page;
   uint32_t _objects;
--- old/src/hotspot/share/gc/z/zMarkStack.hpp	2018-03-14 08:46:54.520420271 +0100
+++ new/src/hotspot/share/gc/z/zMarkStack.hpp	2018-03-14 08:46:54.360413416 +0100
@@ -52,7 +52,7 @@
 };
 
 template <typename T>
-class ZStackList VALUE_OBJ_CLASS_SPEC {
+class ZStackList {
 private:
   T* volatile _head;
 
@@ -73,7 +73,7 @@
 typedef ZStack<ZMarkStack*, ZMarkStackMagazineSlots> ZMarkStackMagazine;
 typedef ZStackList<ZMarkStackMagazine>               ZMarkStackMagazineList;
 
-class ZMarkStackSpace VALUE_OBJ_CLASS_SPEC {
+class ZMarkStackSpace {
 private:
   ZLock              _expand_lock;
   volatile uintptr_t _top;
@@ -92,7 +92,7 @@
   uintptr_t alloc(size_t size);
 };
 
-class ZMarkStackAllocator VALUE_OBJ_CLASS_SPEC {
+class ZMarkStackAllocator {
 private:
   ZMarkStackMagazineList _freelist ATTRIBUTE_ALIGNED(DEFAULT_CACHE_LINE_SIZE);
   ZMarkStackSpace        _space    ATTRIBUTE_ALIGNED(DEFAULT_CACHE_LINE_SIZE);
@@ -109,7 +109,7 @@
   void free_magazine(ZMarkStackMagazine* magazine);
 };
 
-class ZMarkStripe VALUE_OBJ_CLASS_SPEC {
+class ZMarkStripe {
 private:
   ZMarkStackList _published  ATTRIBUTE_ALIGNED(DEFAULT_CACHE_LINE_SIZE);
   ZMarkStackList _overflowed ATTRIBUTE_ALIGNED(DEFAULT_CACHE_LINE_SIZE);
@@ -123,7 +123,7 @@
   ZMarkStack* steal_stack();
 };
 
-class ZMarkStripeSet VALUE_OBJ_CLASS_SPEC {
+class ZMarkStripeSet {
 private:
   size_t      _nstripes;
   size_t      _nstripes_mask;
@@ -144,7 +144,7 @@
   ZMarkStripe* stripe_for_addr(uintptr_t addr);
 };
 
-class ZMarkThreadLocalStacks VALUE_OBJ_CLASS_SPEC {
+class ZMarkThreadLocalStacks {
 private:
   ZMarkStackMagazine* _magazine;
   ZMarkStack*         _stacks[ZMarkStripesMax];
--- old/src/hotspot/share/gc/z/zMarkStackEntry.hpp	2018-03-14 08:46:54.765430767 +0100
+++ new/src/hotspot/share/gc/z/zMarkStackEntry.hpp	2018-03-14 08:46:54.591423313 +0100
@@ -65,7 +65,7 @@
 //  * 63-32 Partial Array Address Offset (32-bits)
 //
 
-class ZMarkStackEntry VALUE_OBJ_CLASS_SPEC  {
+class ZMarkStackEntry  {
 private:
   typedef ZBitField<uint64_t, bool,      0,  1>  field_finalizable;
   typedef ZBitField<uint64_t, bool,      1,  1>  field_partial_array;
--- old/src/hotspot/share/gc/z/zMarkTerminate.hpp	2018-03-14 08:46:54.995440621 +0100
+++ new/src/hotspot/share/gc/z/zMarkTerminate.hpp	2018-03-14 08:46:54.835433766 +0100
@@ -27,7 +27,7 @@
 #include "memory/allocation.hpp"
 #include "utilities/globalDefinitions.hpp"
 
-class ZMarkTerminate VALUE_OBJ_CLASS_SPEC {
+class ZMarkTerminate {
 private:
   uint          _nworkers;
   volatile uint _nworking_stage0 ATTRIBUTE_ALIGNED(DEFAULT_CACHE_LINE_SIZE);
--- old/src/hotspot/share/gc/z/zMemory.hpp	2018-03-14 08:46:55.223450389 +0100
+++ new/src/hotspot/share/gc/z/zMemory.hpp	2018-03-14 08:46:55.062443491 +0100
@@ -48,7 +48,7 @@
   void grow_from_back(size_t size);
 };
 
-class ZMemoryManager VALUE_OBJ_CLASS_SPEC {
+class ZMemoryManager {
 private:
   ZList<ZMemory> _freelist;
 
--- old/src/hotspot/share/gc/z/zMessagePort.hpp	2018-03-14 08:46:55.448460028 +0100
+++ new/src/hotspot/share/gc/z/zMessagePort.hpp	2018-03-14 08:46:55.290453259 +0100
@@ -32,7 +32,7 @@
 template <typename T> class ZMessageRequest;
 
 template <typename T>
-class ZMessagePort VALUE_OBJ_CLASS_SPEC {
+class ZMessagePort {
 private:
   typedef ZMessageRequest<T> Request;
 
@@ -52,7 +52,7 @@
   void ack();
 };
 
-class ZRendezvousPort VALUE_OBJ_CLASS_SPEC {
+class ZRendezvousPort {
 private:
   ZMessagePort<bool> _port;
 
--- old/src/hotspot/share/gc/z/zNMethodTable.cpp	2018-03-14 08:46:55.673469667 +0100
+++ new/src/hotspot/share/gc/z/zNMethodTable.cpp	2018-03-14 08:46:55.515462898 +0100
@@ -34,7 +34,7 @@
 #include "runtime/atomic.hpp"
 #include "utilities/debug.hpp"
 
-class ZNMethodWithImmediateOops VALUE_OBJ_CLASS_SPEC {
+class ZNMethodWithImmediateOops {
 private:
   nmethod* const _nm;
   const size_t   _nimmediate_oops;
--- old/src/hotspot/share/gc/z/zObjectAllocator.hpp	2018-03-14 08:46:55.903479521 +0100
+++ new/src/hotspot/share/gc/z/zObjectAllocator.hpp	2018-03-14 08:46:55.744472709 +0100
@@ -29,7 +29,7 @@
 #include "gc/z/zValue.hpp"
 #include "memory/allocation.hpp"
 
-class ZObjectAllocator VALUE_OBJ_CLASS_SPEC {
+class ZObjectAllocator {
 private:
   const uint         _nworkers;
   ZPerCPU<size_t>    _used;
--- old/src/hotspot/share/gc/z/zPageAllocator.hpp	2018-03-14 08:46:56.129489203 +0100
+++ new/src/hotspot/share/gc/z/zPageAllocator.hpp	2018-03-14 08:46:55.971482434 +0100
@@ -35,7 +35,7 @@
 
 class ZPageAllocRequest;
 
-class ZPageAllocator VALUE_OBJ_CLASS_SPEC {
+class ZPageAllocator {
   friend class VMStructs;
 
 private:
--- old/src/hotspot/share/gc/z/zPageCache.hpp	2018-03-14 08:46:56.355498886 +0100
+++ new/src/hotspot/share/gc/z/zPageCache.hpp	2018-03-14 08:46:56.197492117 +0100
@@ -29,7 +29,7 @@
 #include "gc/z/zValue.hpp"
 #include "memory/allocation.hpp"
 
-class ZPageCache VALUE_OBJ_CLASS_SPEC {
+class ZPageCache {
 private:
   size_t                  _available;
 
--- old/src/hotspot/share/gc/z/zPageTable.hpp	2018-03-14 08:46:56.581508568 +0100
+++ new/src/hotspot/share/gc/z/zPageTable.hpp	2018-03-14 08:46:56.423501799 +0100
@@ -31,7 +31,7 @@
 
 class ZPage;
 
-class ZPageTable VALUE_OBJ_CLASS_SPEC {
+class ZPageTable {
   friend class VMStructs;
   friend class ZPageTableIterator;
 
--- old/src/hotspot/share/gc/z/zPageTableEntry.hpp	2018-03-14 08:46:56.810518379 +0100
+++ new/src/hotspot/share/gc/z/zPageTableEntry.hpp	2018-03-14 08:46:56.650511524 +0100
@@ -46,7 +46,7 @@
 
 class ZPage;
 
-class ZPageTableEntry VALUE_OBJ_CLASS_SPEC {
+class ZPageTableEntry {
 private:
   typedef ZBitField<uint64_t, bool,   0, 1>     field_relocating;
   typedef ZBitField<uint64_t, ZPage*, 1, 63, 1> field_page;
--- old/src/hotspot/share/gc/z/zPhysicalMemory.hpp	2018-03-14 08:46:57.052528746 +0100
+++ new/src/hotspot/share/gc/z/zPhysicalMemory.hpp	2018-03-14 08:46:56.878521292 +0100
@@ -27,7 +27,7 @@
 #include "memory/allocation.hpp"
 #include OS_CPU_HEADER(zPhysicalMemoryBacking)
 
-class ZPhysicalMemorySegment VALUE_OBJ_CLASS_SPEC {
+class ZPhysicalMemorySegment {
 private:
   uintptr_t _start;
   uintptr_t _end;
@@ -43,7 +43,7 @@
   ZPhysicalMemorySegment split(size_t size);
 };
 
-class ZPhysicalMemory VALUE_OBJ_CLASS_SPEC {
+class ZPhysicalMemory {
 private:
   size_t                  _nsegments;
   ZPhysicalMemorySegment* _segments;
@@ -64,7 +64,7 @@
   void clear();
 };
 
-class ZPhysicalMemoryManager VALUE_OBJ_CLASS_SPEC {
+class ZPhysicalMemoryManager {
   friend class VMStructs;
 
 private:
--- old/src/hotspot/share/gc/z/zPreMappedMemory.hpp	2018-03-14 08:46:57.280538514 +0100
+++ new/src/hotspot/share/gc/z/zPreMappedMemory.hpp	2018-03-14 08:46:57.121531702 +0100
@@ -30,7 +30,7 @@
 
 class ZPage;
 
-class ZPreMappedMemory VALUE_OBJ_CLASS_SPEC {
+class ZPreMappedMemory {
 private:
   ZVirtualMemory  _vmem;
   ZPhysicalMemory _pmem;
--- old/src/hotspot/share/gc/z/zRelocate.hpp	2018-03-14 08:46:57.520548796 +0100
+++ new/src/hotspot/share/gc/z/zRelocate.hpp	2018-03-14 08:46:57.347541385 +0100
@@ -28,7 +28,7 @@
 #include "gc/z/zWorkers.hpp"
 #include "memory/allocation.hpp"
 
-class ZRelocate VALUE_OBJ_CLASS_SPEC {
+class ZRelocate {
   friend class ZRelocateTask;
 
 private:
--- old/src/hotspot/share/gc/z/zRelocationSet.hpp	2018-03-14 08:46:57.750558650 +0100
+++ new/src/hotspot/share/gc/z/zRelocationSet.hpp	2018-03-14 08:46:57.590551795 +0100
@@ -28,7 +28,7 @@
 
 class ZPage;
 
-class ZRelocationSet VALUE_OBJ_CLASS_SPEC {
+class ZRelocationSet {
   template <bool> friend class ZRelocationSetIteratorImpl;
 
 private:
--- old/src/hotspot/share/gc/z/zRelocationSetSelector.hpp	2018-03-14 08:46:57.989568889 +0100
+++ new/src/hotspot/share/gc/z/zRelocationSetSelector.hpp	2018-03-14 08:46:57.815561435 +0100
@@ -30,7 +30,7 @@
 class ZPage;
 class ZRelocationSet;
 
-class ZRelocationSetSelectorGroup VALUE_OBJ_CLASS_SPEC {
+class ZRelocationSetSelectorGroup {
 private:
   const char* const    _name;
   const size_t         _page_size;
--- old/src/hotspot/share/gc/z/zRootsIterator.hpp	2018-03-14 08:46:58.214578529 +0100
+++ new/src/hotspot/share/gc/z/zRootsIterator.hpp	2018-03-14 08:46:58.055571717 +0100
@@ -30,7 +30,7 @@
 #include "utilities/globalDefinitions.hpp"
 
 template <typename T, void (T::*F)(OopClosure*)>
-class ZSerialOopsDo VALUE_OBJ_CLASS_SPEC {
+class ZSerialOopsDo {
 private:
   T* const      _iter;
   volatile bool _claimed;
@@ -41,7 +41,7 @@
 };
 
 template <typename T, void (T::*F)(OopClosure*)>
-class ZParallelOopsDo VALUE_OBJ_CLASS_SPEC {
+class ZParallelOopsDo {
 private:
   T* const      _iter;
   volatile bool _completed;
@@ -52,7 +52,7 @@
 };
 
 template <typename T, void (T::*F)(BoolObjectClosure*, OopClosure*)>
-class ZSerialUnlinkOrOopsDo VALUE_OBJ_CLASS_SPEC {
+class ZSerialUnlinkOrOopsDo {
 private:
   T* const      _iter;
   volatile bool _claimed;
@@ -63,7 +63,7 @@
 };
 
 template <typename T, void (T::*F)(BoolObjectClosure*, OopClosure*)>
-class ZParallelUnlinkOrOopsDo VALUE_OBJ_CLASS_SPEC {
+class ZParallelUnlinkOrOopsDo {
 private:
   T* const      _iter;
   volatile bool _completed;
@@ -73,7 +73,7 @@
   void unlink_or_oops_do(BoolObjectClosure* is_alive, OopClosure* cl);
 };
 
-class ZRootsIterator VALUE_OBJ_CLASS_SPEC {
+class ZRootsIterator {
 private:
   void do_universe(OopClosure* cl);
   void do_jni_handles(OopClosure* cl);
@@ -110,7 +110,7 @@
   void oops_do(OopClosure* cl, bool visit_jvmti_weak_export = false);
 };
 
-class ZWeakRootsIterator VALUE_OBJ_CLASS_SPEC {
+class ZWeakRootsIterator {
 private:
   void do_jni_weak_handles(BoolObjectClosure* is_alive, OopClosure* cl);
   void do_jvmti_weak_export(BoolObjectClosure* is_alive, OopClosure* cl);
@@ -132,7 +132,7 @@
   void oops_do(OopClosure* cl);
 };
 
-class ZConcurrentWeakRootsIterator VALUE_OBJ_CLASS_SPEC {
+class ZConcurrentWeakRootsIterator {
 private:
   OopStorage::ParState<true /* concurrent */, false /* is_const */> _par_state;
 
@@ -146,7 +146,7 @@
   void oops_do(OopClosure* cl);
 };
 
-class ZThreadRootsIterator VALUE_OBJ_CLASS_SPEC {
+class ZThreadRootsIterator {
 private:
   void do_threads(OopClosure* cl);
 
--- 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();
--- old/src/hotspot/share/gc/z/zStat.cpp	2018-03-14 08:46:58.682598578 +0100
+++ new/src/hotspot/share/gc/z/zStat.cpp	2018-03-14 08:46:58.523591767 +0100
@@ -70,7 +70,7 @@
 // Stat sampler history
 //
 template <size_t size>
-class ZStatSamplerHistoryInterval VALUE_OBJ_CLASS_SPEC {
+class ZStatSamplerHistoryInterval {
 private:
   size_t           _next;
   ZStatSamplerData _samples[size];
--- old/src/hotspot/share/gc/z/zStat.hpp	2018-03-14 08:46:58.923608903 +0100
+++ new/src/hotspot/share/gc/z/zStat.hpp	2018-03-14 08:46:58.765602134 +0100
@@ -52,7 +52,7 @@
 //
 // Stat value
 //
-class ZStatValue VALUE_OBJ_CLASS_SPEC {
+class ZStatValue {
 private:
   static uintptr_t _base;
   static uint32_t  _cpu_offset;
@@ -158,7 +158,7 @@
 //
 // Stat MMU (Mimimum Mutator Utilization)
 //
-class ZStatMMUPause VALUE_OBJ_CLASS_SPEC {
+class ZStatMMUPause {
 private:
   double _start;
   double _end;
@@ -171,7 +171,7 @@
   double overlap(double start, double end) const;
 };
 
-class ZStatMMU VALUE_OBJ_CLASS_SPEC {
+class ZStatMMU {
 private:
   static size_t        _next;
   static size_t        _npauses;
@@ -196,7 +196,7 @@
 //
 // Stat phases
 //
-class ZStatPhase VALUE_OBJ_CLASS_SPEC {
+class ZStatPhase {
 private:
   static ConcurrentGCTimer _timer;
 
--- old/src/hotspot/share/gc/z/zVirtualMemory.hpp	2018-03-14 08:46:59.160619057 +0100
+++ new/src/hotspot/share/gc/z/zVirtualMemory.hpp	2018-03-14 08:46:58.998612116 +0100
@@ -27,7 +27,7 @@
 #include "gc/z/zMemory.hpp"
 #include "memory/allocation.hpp"
 
-class ZVirtualMemory VALUE_OBJ_CLASS_SPEC {
+class ZVirtualMemory {
   friend class VMStructs;
 
 private:
@@ -46,7 +46,7 @@
   void clear();
 };
 
-class ZVirtualMemoryManager VALUE_OBJ_CLASS_SPEC {
+class ZVirtualMemoryManager {
 private:
   ZMemoryManager _manager;
   bool           _initialized;
--- old/src/hotspot/share/gc/z/zWorkers.hpp	2018-03-14 08:46:59.434630796 +0100
+++ new/src/hotspot/share/gc/z/zWorkers.hpp	2018-03-14 08:46:59.234622227 +0100
@@ -29,7 +29,7 @@
 
 class ZTask;
 
-class ZWorkers VALUE_OBJ_CLASS_SPEC {
+class ZWorkers {
 private:
   bool     _boost;
   WorkGang _workers;