diff --git a/src/search/landmarks/landmark_factory_reasonable_orders_hps.cc b/src/search/landmarks/landmark_factory_reasonable_orders_hps.cc
index 25da5572ba..fb0eea9c78 100644
--- a/src/search/landmarks/landmark_factory_reasonable_orders_hps.cc
+++ b/src/search/landmarks/landmark_factory_reasonable_orders_hps.cc
@@ -112,7 +112,6 @@ void LandmarkFactoryReasonableOrdersHPS::insert_reasonable_orderings(
 */
 void LandmarkFactoryReasonableOrdersHPS::approximate_reasonable_orderings(
     const TaskProxy &task_proxy) {
-    State initial_state = task_proxy.get_initial_state();
     for (const auto &node : *landmark_graph) {
         const Landmark &landmark = node->get_landmark();
         if (landmark.type == DISJUNCTIVE) {
diff --git a/src/search/task_proxy.h b/src/search/task_proxy.h
index f1134bedb8..d4520482f8 100644
--- a/src/search/task_proxy.h
+++ b/src/search/task_proxy.h
@@ -17,22 +17,9 @@
 #include <string>
 #include <vector>
 
-class AxiomsProxy;
-class ConditionsProxy;
-class EffectProxy;
-class EffectConditionsProxy;
-class EffectsProxy;
-class FactProxy;
-class FactsProxy;
-class GoalsProxy;
-class OperatorProxy;
-class OperatorsProxy;
-class PreconditionsProxy;
-class State;
 class StateRegistry;
 class TaskProxy;
 class VariableProxy;
-class VariablesProxy;
 
 namespace causal_graph {
 class CausalGraph;
@@ -556,8 +543,6 @@ class GoalsProxy : public ConditionsProxy {
     }
 };
 
-bool does_fire(const EffectProxy &effect, const State &state);
-
 class State {
     /*
       TODO: We want to try out two things:
@@ -640,6 +625,8 @@ class State {
     State get_unregistered_successor(const OperatorProxy &op) const;
 };
 
+bool does_fire(const EffectProxy &effect, const State &state);
+
 namespace utils {
 inline void feed(HashState &hash_state, const State &state) {
     /*