--- old/src/hotspot/share/gc/shared/oopStorage.inline.hpp	2018-03-12 10:02:42.230272331 -0400
+++ new/src/hotspot/share/gc/shared/oopStorage.inline.hpp	2018-03-12 10:02:41.494204505 -0400
@@ -26,10 +26,9 @@
 #define SHARE_GC_SHARED_OOPSTORAGE_INLINE_HPP
 
 #include "gc/shared/oopStorage.hpp"
-#include "memory/allocation.hpp"
 #include "metaprogramming/conditional.hpp"
 #include "metaprogramming/isConst.hpp"
-#include "oops/oop.hpp"
+
 #include "runtime/safepoint.hpp"
 #include "utilities/count_trailing_zeros.hpp"
 #include "utilities/debug.hpp"
@@ -127,7 +126,7 @@
 }
 
 template<typename Closure>
-class OopStorage::OopFn VALUE_OBJ_CLASS_SPEC {
+class OopStorage::OopFn {
 public:
   explicit OopFn(Closure* cl) : _cl(cl) {}
 
@@ -147,7 +146,7 @@
 }
 
 template<typename IsAlive, typename F>
-class OopStorage::IfAliveFn VALUE_OBJ_CLASS_SPEC {
+class OopStorage::IfAliveFn {
 public:
   IfAliveFn(IsAlive* is_alive, F f) : _is_alive(is_alive), _f(f) {}
 
@@ -175,7 +174,7 @@
 }
 
 template<typename F>
-class OopStorage::SkipNullFn VALUE_OBJ_CLASS_SPEC {
+class OopStorage::SkipNullFn {
 public:
   SkipNullFn(F f) : _f(f) {}