--- a/src/hotspot/share/oops/oopsHierarchy.cpp	Thu Oct 17 20:27:44 2019 +0100
+++ b/src/hotspot/share/oops/oopsHierarchy.cpp	Thu Oct 17 20:53:35 2019 +0100
@@ -23,9 +23,6 @@
  */
 
 #include "precompiled.hpp"
-#include "gc/shared/barrierSet.hpp"
-#include "gc/shared/collectedHeap.hpp"
-#include "gc/shared/collectedHeap.inline.hpp"
 #include "memory/universe.hpp"
 #include "oops/oopsHierarchy.hpp"
 #include "runtime/thread.inline.hpp"
@@ -56,14 +53,4 @@
   }
 }
 
-bool oop::operator==(const oop o) const {
-  assert(BarrierSet::barrier_set()->oop_equals_operator_allowed(), "Not allowed");
-  return obj() == o.obj();
-}
-
-bool oop::operator!=(const volatile oop o) const {
-  assert(BarrierSet::barrier_set()->oop_equals_operator_allowed(), "Not allowed");
-  return obj() != o.obj();
-}
-
 #endif // CHECK_UNHANDLED_OOPS