--- a/src/hotspot/share/gc/shared/oopStorageParState.hpp	Wed Mar 14 07:07:18 2018 -0400
+++ b/src/hotspot/share/gc/shared/oopStorageParState.hpp	Wed Mar 14 07:27:19 2018 -0400
@@ -26,7 +26,6 @@
 #define SHARE_GC_SHARED_OOPSTORAGEPARSTATE_HPP
 
 #include "gc/shared/oopStorage.hpp"
-#include "memory/allocation.hpp"
 #include "utilities/macros.hpp"
 
 #if INCLUDE_ALL_GCS
@@ -140,7 +139,7 @@
 //   If is_alive->do_object_b(*p) is false, then cl will not be
 //   invoked on p.
 
-class OopStorage::BasicParState VALUE_OBJ_CLASS_SPEC {
+class OopStorage::BasicParState {
   OopStorage* _storage;
   void* volatile _next_block;
   bool _concurrent;
@@ -164,7 +163,7 @@
 };
 
 template<bool concurrent, bool is_const>
-class OopStorage::ParState VALUE_OBJ_CLASS_SPEC {
+class OopStorage::ParState {
   BasicParState _basic_state;
 
 public:
@@ -178,7 +177,7 @@
 };
 
 template<>
-class OopStorage::ParState<false, false> VALUE_OBJ_CLASS_SPEC {
+class OopStorage::ParState<false, false> {
   BasicParState _basic_state;
 
 public: