diff --git a/src/core/mainloop/connection.c b/src/core/mainloop/connection.c
index c5f474e033..766d5d6b6b 100644
--- a/src/core/mainloop/connection.c
+++ b/src/core/mainloop/connection.c
@@ -91,7 +91,6 @@
 #include "feature/dirauth/authmode.h"
 #include "feature/dircache/dirserv.h"
 #include "feature/dircommon/directory.h"
-#include "feature/dirparse/routerparse.h"
 #include "feature/hibernate/hibernate.h"
 #include "feature/hs/hs_common.h"
 #include "feature/hs/hs_ident.h"
diff --git a/src/core/or/circuitbuild.c b/src/core/or/circuitbuild.c
index 2943b7e803..a69457571e 100644
--- a/src/core/or/circuitbuild.c
+++ b/src/core/or/circuitbuild.c
@@ -61,7 +61,6 @@
 #include "feature/nodelist/node_select.h"
 #include "feature/nodelist/nodelist.h"
 #include "feature/nodelist/routerlist.h"
-#include "feature/dirparse/routerparse.h"
 #include "feature/nodelist/routerset.h"
 #include "feature/relay/router.h"
 #include "feature/relay/routermode.h"
diff --git a/src/core/or/policies.c b/src/core/or/policies.c
index a236618511..0eda93c5f3 100644
--- a/src/core/or/policies.c
+++ b/src/core/or/policies.c
@@ -22,7 +22,6 @@
 #include "app/config/config.h"
 #include "core/or/policies.h"
 #include "feature/dirparse/policy_parse.h"
-#include "feature/dirparse/routerparse.h"
 #include "feature/nodelist/microdesc.h"
 #include "feature/nodelist/networkstatus.h"
 #include "feature/nodelist/nodelist.h"
diff --git a/src/core/or/relay.c b/src/core/or/relay.c
index dafc6effd3..510d96c648 100644
--- a/src/core/or/relay.c
+++ b/src/core/or/relay.c
@@ -79,7 +79,6 @@
 #include "feature/rend/rendcommon.h"
 #include "feature/nodelist/describe.h"
 #include "feature/nodelist/routerlist.h"
-#include "feature/dirparse/routerparse.h"
 #include "core/or/scheduler.h"
 #include "feature/stats/rephist.h"
 
diff --git a/src/feature/client/entrynodes.c b/src/feature/client/entrynodes.c
index 230b517158..20208ef613 100644
--- a/src/feature/client/entrynodes.c
+++ b/src/feature/client/entrynodes.c
@@ -130,7 +130,6 @@
 #include "feature/client/transports.h"
 #include "feature/control/control.h"
 #include "feature/dircommon/directory.h"
-#include "feature/dirparse/routerparse.h"
 #include "feature/nodelist/describe.h"
 #include "feature/nodelist/microdesc.h"
 #include "feature/nodelist/networkstatus.h"
diff --git a/src/feature/nodelist/microdesc.c b/src/feature/nodelist/microdesc.c
index 3716513f05..146c772daf 100644
--- a/src/feature/nodelist/microdesc.c
+++ b/src/feature/nodelist/microdesc.c
@@ -20,7 +20,6 @@
 #include "feature/dirclient/dlstatus.h"
 #include "feature/dircommon/directory.h"
 #include "feature/dirparse/microdesc_parse.h"
-#include "feature/dirparse/routerparse.h"
 #include "feature/nodelist/dirlist.h"
 #include "feature/nodelist/microdesc.h"
 #include "feature/nodelist/networkstatus.h"
diff --git a/src/feature/nodelist/nodelist.c b/src/feature/nodelist/nodelist.c
index 29150d931e..600dfcf56c 100644
--- a/src/feature/nodelist/nodelist.c
+++ b/src/feature/nodelist/nodelist.c
@@ -61,7 +61,6 @@
 #include "feature/nodelist/node_select.h"
 #include "feature/nodelist/nodelist.h"
 #include "feature/nodelist/routerlist.h"
-#include "feature/dirparse/routerparse.h"
 #include "feature/nodelist/routerset.h"
 #include "feature/nodelist/torcert.h"
 #include "feature/rend/rendservice.h"
diff --git a/src/feature/rend/rendcache.c b/src/feature/rend/rendcache.c
index 4c8afbfca4..848386b97d 100644
--- a/src/feature/rend/rendcache.c
+++ b/src/feature/rend/rendcache.c
@@ -12,7 +12,6 @@
 #include "app/config/config.h"
 #include "feature/stats/rephist.h"
 #include "feature/nodelist/routerlist.h"
-#include "feature/dirparse/routerparse.h"
 #include "feature/rend/rendcommon.h"
 #include "feature/rend/rendparse.h"
 
diff --git a/src/feature/rend/rendcommon.c b/src/feature/rend/rendcommon.c
index 458b92f510..15e4534fca 100644
--- a/src/feature/rend/rendcommon.c
+++ b/src/feature/rend/rendcommon.c
@@ -31,7 +31,6 @@
 #include "feature/hs_common/replaycache.h"
 #include "feature/relay/router.h"
 #include "feature/nodelist/routerlist.h"
-#include "feature/dirparse/routerparse.h"
 #include "feature/dirparse/signing.h"
 
 #include "core/or/cpath_build_state_st.h"
diff --git a/src/feature/rend/rendservice.c b/src/feature/rend/rendservice.c
index e70694b788..bae9da3fe5 100644
--- a/src/feature/rend/rendservice.c
+++ b/src/feature/rend/rendservice.c
@@ -22,7 +22,6 @@
 #include "feature/control/control.h"
 #include "feature/dirclient/dirclient.h"
 #include "feature/dircommon/directory.h"
-#include "feature/dirparse/routerparse.h"
 #include "feature/hs/hs_common.h"
 #include "feature/hs/hs_config.h"
 #include "feature/hs_common/replaycache.h"
diff --git a/src/test/fuzz/fuzz_hsdescv3.c b/src/test/fuzz/fuzz_hsdescv3.c
index 871fbefa49..d5ddcc2e27 100644
--- a/src/test/fuzz/fuzz_hsdescv3.c
+++ b/src/test/fuzz/fuzz_hsdescv3.c
@@ -7,7 +7,6 @@
 #include "trunnel/ed25519_cert.h" /* Trunnel interface. */
 #include "lib/crypt_ops/crypto_ed25519.h"
 #include "feature/hs/hs_descriptor.h"
-#include "feature/dirparse/routerparse.h"
 #include "feature/dirparse/unparseable.h"
 
 #include "test/fuzz/fuzzing.h"
diff --git a/src/test/test.c b/src/test/test.c
index 2198de7970..70d91e3967 100644
--- a/src/test/test.c
+++ b/src/test/test.c
@@ -55,7 +55,6 @@
 #include "core/crypto/onion_tap.h"
 #include "core/or/policies.h"
 #include "feature/stats/rephist.h"
-#include "feature/dirparse/routerparse.h"
 #include "app/config/statefile.h"
 #include "lib/crypt_ops/crypto_curve25519.h"
 
diff --git a/src/test/test_dir_common.h b/src/test/test_dir_common.h
index 9bcabc7bdf..1e958a21ff 100644
--- a/src/test/test_dir_common.h
+++ b/src/test/test_dir_common.h
@@ -5,7 +5,6 @@
 
 #include "core/or/or.h"
 #include "feature/nodelist/networkstatus.h"
-#include "feature/dirparse/routerparse.h"
 
 #define TEST_DIR_ROUTER_ID_1 3
 #define TEST_DIR_ROUTER_ID_2 5
diff --git a/src/test/test_dir_handle_get.c b/src/test/test_dir_handle_get.c
index 7cae45f131..1d4a36d7fc 100644
--- a/src/test/test_dir_handle_get.c
+++ b/src/test/test_dir_handle_get.c
@@ -30,7 +30,6 @@
 #include "feature/nodelist/nodelist.h"
 #include "feature/client/entrynodes.h"
 #include "feature/dirparse/authcert_parse.h"
-#include "feature/dirparse/routerparse.h"
 #include "feature/nodelist/networkstatus.h"
 #include "core/proto/proto_http.h"
 #include "lib/geoip/geoip.h"
diff --git a/src/test/test_entrynodes.c b/src/test/test_entrynodes.c
index 295586c69f..b67c9fae53 100644
--- a/src/test/test_entrynodes.c
+++ b/src/test/test_entrynodes.c
@@ -26,7 +26,6 @@
 #include "feature/nodelist/networkstatus.h"
 #include "core/or/policies.h"
 #include "feature/nodelist/routerlist.h"
-#include "feature/dirparse/routerparse.h"
 #include "feature/nodelist/routerset.h"
 #include "app/config/statefile.h"
 
diff --git a/src/test/test_routerlist.c b/src/test/test_routerlist.c
index b386ad5298..67af2fd484 100644
--- a/src/test/test_routerlist.c
+++ b/src/test/test_routerlist.c
@@ -34,7 +34,6 @@
 #include "feature/nodelist/routerlist.h"
 #include "feature/nodelist/routerset.h"
 #include "feature/dirparse/authcert_parse.h"
-#include "feature/dirparse/routerparse.h"
 #include "feature/dirparse/ns_parse.h"
 #include "feature/dirauth/shared_random.h"
 #include "app/config/statefile.h"
diff --git a/src/test/test_shared_random.c b/src/test/test_shared_random.c
index 397a4ceb55..8a7fb95cc1 100644
--- a/src/test/test_shared_random.c
+++ b/src/test/test_shared_random.c
@@ -20,7 +20,6 @@
 #include "feature/nodelist/authcert.h"
 #include "feature/nodelist/dirlist.h"
 #include "feature/dirparse/authcert_parse.h"
-#include "feature/dirparse/routerparse.h"
 #include "feature/hs_common/shared_random_client.h"
 #include "feature/dircommon/voting_schedule.h"