--- a/hotspot/src/share/vm/services/memBaseline.hpp	Wed Apr 17 08:20:02 2013 -0400
+++ b/hotspot/src/share/vm/services/memBaseline.hpp	Thu Apr 18 10:04:44 2013 -0400
@@ -133,7 +133,7 @@
 
 
 // This class aggregates malloc'd records by memory type
-class MallocMem : public _ValueObj {
+class MallocMem VALUE_OBJ_CLASS_SPEC {
  private:
   MEMFLAGS       _type;
 
@@ -211,7 +211,7 @@
 };
 
 // This class aggregates virtual memory by its memory type
-class VMMem : public _ValueObj {
+class VMMem VALUE_OBJ_CLASS_SPEC {
  private:
   MEMFLAGS       _type;
 
@@ -296,7 +296,7 @@
  * aggregates memory usage by callsites when detail tracking
  * is on.
  */
-class MemBaseline : public _ValueObj {
+class MemBaseline VALUE_OBJ_CLASS_SPEC {
   friend class BaselineReporter;
   friend class BaselineComparisonReporter;
 

--- a/hotspot/src/share/vm/services/memPtr.hpp	Wed Apr 17 08:20:02 2013 -0400
+++ b/hotspot/src/share/vm/services/memPtr.hpp	Thu Apr 18 10:04:44 2013 -0400
@@ -89,7 +89,7 @@
  * the memory pointer either points to a malloc'd
  * memory block, or a mmap'd memory block
  */
-class MemPointer : public _ValueObj {
+class MemPointer VALUE_OBJ_CLASS_SPEC {
  public:
   MemPointer(): _addr(0) { }
   MemPointer(address addr): _addr(addr) { }

--- a/hotspot/src/share/vm/services/memSnapshot.hpp	Wed Apr 17 08:20:02 2013 -0400
+++ b/hotspot/src/share/vm/services/memSnapshot.hpp	Thu Apr 18 10:04:44 2013 -0400
@@ -308,7 +308,7 @@
   }
 };
 
-class StagingArea : public _ValueObj {
+class StagingArea VALUE_OBJ_CLASS_SPEC {
  private:
   MemPointerArray*   _malloc_data;
   MemPointerArray*   _vm_data;

--- a/hotspot/src/share/vm/services/memTrackWorker.hpp	Wed Apr 17 08:20:02 2013 -0400
+++ b/hotspot/src/share/vm/services/memTrackWorker.hpp	Thu Apr 18 10:04:44 2013 -0400
@@ -32,7 +32,7 @@
 // Maximum MAX_GENERATIONS generation data can be tracked.
 #define MAX_GENERATIONS  512
 
-class GenerationData : public _ValueObj {
+class GenerationData VALUE_OBJ_CLASS_SPEC {
  private:
   int           _number_of_classes;
   MemRecorder*  _recorder_list;