--- a/src/hotspot/share/gc/shared/oopStorage.cpp	Fri Apr 06 11:37:31 2018 +0200
+++ b/src/hotspot/share/gc/shared/oopStorage.cpp	Fri Apr 06 11:37:33 2018 +0200
@@ -687,7 +687,6 @@
 }
 
 // Parallel iteration support
-#if INCLUDE_ALL_GCS
 
 static char* not_started_marker_dummy = NULL;
 static void* const not_started_marker = &not_started_marker_dummy;
@@ -737,8 +736,6 @@
   return static_cast<Block*>(next);
 }
 
-#endif // INCLUDE_ALL_GCS
-
 const char* OopStorage::name() const { return _name; }
 
 #ifndef PRODUCT

--- a/src/hotspot/share/gc/shared/oopStorage.hpp	Fri Apr 06 11:37:31 2018 +0200
+++ b/src/hotspot/share/gc/shared/oopStorage.hpp	Fri Apr 06 11:37:33 2018 +0200
@@ -146,11 +146,9 @@
   template<typename IsAliveClosure, typename Closure>
   inline void weak_oops_do(IsAliveClosure* is_alive, Closure* closure);
 
-#if INCLUDE_ALL_GCS
   // Parallel iteration is for the exclusive use of the GC.
   // Other clients must use serial iteration.
   template<bool concurrent, bool is_const> class ParState;
-#endif // INCLUDE_ALL_GCS
 
   // Block cleanup functions are for the exclusive use of the GC.
   // Both stop deleting if there is an in-progress concurrent iteration.
@@ -244,10 +242,8 @@
   template<typename F, typename Storage>
   static bool iterate_impl(F f, Storage* storage);
 
-#if INCLUDE_ALL_GCS
   // Implementation support for parallel iteration
   class BasicParState;
-#endif // INCLUDE_ALL_GCS
 
   // Wrapper for OopClosure-style function, so it can be used with
   // iterate.  Assume p is of type oop*.  Then cl->do_oop(p) must be a

--- a/src/hotspot/share/gc/shared/oopStorageParState.hpp	Fri Apr 06 11:37:31 2018 +0200
+++ b/src/hotspot/share/gc/shared/oopStorageParState.hpp	Fri Apr 06 11:37:33 2018 +0200
@@ -28,8 +28,6 @@
 #include "gc/shared/oopStorage.hpp"
 #include "utilities/macros.hpp"
 
-#if INCLUDE_ALL_GCS
-
 //////////////////////////////////////////////////////////////////////////////
 // Support for parallel and optionally concurrent state iteration.
 //
@@ -192,6 +190,4 @@
   void weak_oops_do(IsAliveClosure* is_alive, Closure* cl);
 };
 
-#endif // INCLUDE_ALL_GCS
-
 #endif // SHARE_GC_SHARED_OOPSTORAGEPARSTATE_HPP

--- a/src/hotspot/share/gc/shared/oopStorageParState.inline.hpp	Fri Apr 06 11:37:31 2018 +0200
+++ b/src/hotspot/share/gc/shared/oopStorageParState.inline.hpp	Fri Apr 06 11:37:33 2018 +0200
@@ -30,8 +30,6 @@
 #include "metaprogramming/conditional.hpp"
 #include "utilities/macros.hpp"
 
-#if INCLUDE_ALL_GCS
-
 template<typename F>
 class OopStorage::BasicParState::AlwaysTrueFn {
   F _f;
@@ -86,6 +84,4 @@
   this->iterate(if_alive_fn(is_alive, oop_fn(cl)));
 }
 
-#endif // INCLUDE_ALL_GCS
-
 #endif // SHARE_GC_SHARED_OOPSTORAGEPARSTATE_INLINE_HPP

--- a/test/hotspot/gtest/gc/shared/test_oopStorage.cpp	Fri Apr 06 11:37:31 2018 +0200
+++ b/test/hotspot/gtest/gc/shared/test_oopStorage.cpp	Fri Apr 06 11:37:33 2018 +0200
@@ -856,9 +856,6 @@
   vstate.check();
 }
 
-// Parallel iteration not available unless INCLUDE_ALL_GCS
-#if INCLUDE_ALL_GCS
-
 class OopStorageTestParIteration : public OopStorageTestIteration {
 public:
   WorkGang* workers();
@@ -1017,8 +1014,6 @@
   vstate.check();
 }
 
-#endif // INCLUDE_ALL_GCS
-
 TEST_VM_F(OopStorageTestWithAllocation, delete_empty_blocks_safepoint) {
   TestAccess::BlockList& active_list = TestAccess::active_list(_storage);
 
@@ -1384,4 +1379,3 @@
   }
   EXPECT_EQ(NULL_BLOCK, active_block);
 }
-