diff --git a/db/view/view.cc b/db/view/view.cc
index c2eb127140..8c82fdedea 100644
--- a/db/view/view.cc
+++ b/db/view/view.cc
@@ -1169,7 +1169,7 @@ void view_update_builder::generate_update(clustering_row&& update, std::optional
     }
 
     auto dk = dht::decorate_key(*_schema, _key);
-    auto gc_state = tombstone_gc_state(); // FIXME: for now
+    const auto& gc_state = _base.get_compaction_manager().get_tombstone_gc_state();
     auto gc_before = gc_state.get_gc_before_for_key(_schema, dk, _now);
 
     // We allow existing to be disengaged, which we treat the same as an empty row.
diff --git a/db/view/view.hh b/db/view/view.hh
index 21aa6a15b9..1eb1321a21 100644
--- a/db/view/view.hh
+++ b/db/view/view.hh
@@ -206,10 +206,7 @@ private:
 };
 
 class view_update_builder {
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wunused-private-field"
     const replica::table& _base;
-#pragma GCC diagnostic pop
     schema_ptr _schema; // The base schema
     std::vector<view_updates> _view_updates;
     flat_mutation_reader_v2 _updates;