Move literally everything out of src/or

This commit won't build yet -- it just puts everything in a slightly
more logical place.

The reasoning here is that "src/core" will hold the stuff that every (or
nearly every) tor instance will need in order to do onion routing.
Other features (including some necessary ones) will live in
"src/feature".  The "src/app" directory will hold the stuff needed
to have Tor be an application you can actually run.

This commit DOES NOT refactor the former contents of src/or into a
logical set of acyclic libraries, or change any code at all.  That
will have to come in the future.

We will continue to move things around and split them in the future,
but I hope this lays a reasonable groundwork for doing so.

256 files changed, 3 insertions, 82 deletions

diff --git a/src/or/auth_dirs.inc b/src/app/config/auth_dirs.inc
index e0937541ea..e0937541ea 100644
--- a/src/or/auth_dirs.inc
+++ b/src/app/config/auth_dirs.inc
diff --git a/src/or/config.c b/src/app/config/config.c
index 9b2706982a..9b2706982a 100644
--- a/src/or/config.c
+++ b/src/app/config/config.c
diff --git a/src/or/config.h b/src/app/config/config.h
index 6d2feb5f43..6d2feb5f43 100644
--- a/src/or/config.h
+++ b/src/app/config/config.h
diff --git a/src/or/confparse.c b/src/app/config/confparse.c
index 87405c6e7d..87405c6e7d 100644
--- a/src/or/confparse.c
+++ b/src/app/config/confparse.c
diff --git a/src/or/confparse.h b/src/app/config/confparse.h
index cbd2ea88e2..cbd2ea88e2 100644
--- a/src/or/confparse.h
+++ b/src/app/config/confparse.h
diff --git a/src/or/fallback_dirs.inc b/src/app/config/fallback_dirs.inc
index c446152e6a..c446152e6a 100644
--- a/src/or/fallback_dirs.inc
+++ b/src/app/config/fallback_dirs.inc
diff --git a/src/or/or_options_st.h b/src/app/config/or_options_st.h
index 0c0c5d32bb..0c0c5d32bb 100644
--- a/src/or/or_options_st.h
+++ b/src/app/config/or_options_st.h
diff --git a/src/or/or_state_st.h b/src/app/config/or_state_st.h
index f1d5f981f1..f1d5f981f1 100644
--- a/src/or/or_state_st.h
+++ b/src/app/config/or_state_st.h
diff --git a/src/or/statefile.c b/src/app/config/statefile.c
index e9db1ff069..e9db1ff069 100644
--- a/src/or/statefile.c
+++ b/src/app/config/statefile.c
diff --git a/src/or/statefile.h b/src/app/config/statefile.h
index e996d5b6e6..e996d5b6e6 100644
--- a/src/or/statefile.h
+++ b/src/app/config/statefile.h
diff --git a/src/app/include.am b/src/app/include.am
index bbbffb3e59..8e86bbeeb5 100644
--- a/src/app/include.am
+++ b/src/app/include.am
@@ -6,11 +6,11 @@ noinst_PROGRAMS+= src/app/tor-cov
 endif
 
 noinst_HEADERS += \
-	src/app/ntmain.h
+	src/app/main/ntmain.h
 
-src_app_tor_SOURCES = src/app/tor_main.c
+src_app_tor_SOURCES = src/app/main/tor_main.c
 if BUILD_NT_SERVICES
-src_app_tor_SOURCES += src/app/ntmain.c
+src_app_tor_SOURCES += src/app/main/ntmain.c
 endif
 
 # -L flags need to go in LDFLAGS. -l flags need to go in LDADD.
diff --git a/src/app/ntmain.c b/src/app/main/ntmain.c
index 63d82f686e..63d82f686e 100644
--- a/src/app/ntmain.c
+++ b/src/app/main/ntmain.c
diff --git a/src/app/ntmain.h b/src/app/main/ntmain.h
index 223d9e318b..223d9e318b 100644
--- a/src/app/ntmain.h
+++ b/src/app/main/ntmain.h
diff --git a/src/app/tor_main.c b/src/app/main/tor_main.c
index 8c497fff8a..8c497fff8a 100644
--- a/src/app/tor_main.c
+++ b/src/app/main/tor_main.c
diff --git a/src/or/hs_ntor.c b/src/core/crypto/hs_ntor.c
index b5007545db..b5007545db 100644
--- a/src/or/hs_ntor.c
+++ b/src/core/crypto/hs_ntor.c
diff --git a/src/or/hs_ntor.h b/src/core/crypto/hs_ntor.h
index 67a9573436..67a9573436 100644
--- a/src/or/hs_ntor.h
+++ b/src/core/crypto/hs_ntor.h
diff --git a/src/or/onion.c b/src/core/crypto/onion.c
index 80d8e1a8b1..80d8e1a8b1 100644
--- a/src/or/onion.c
+++ b/src/core/crypto/onion.c
diff --git a/src/or/onion.h b/src/core/crypto/onion.h
index ff70f299d5..ff70f299d5 100644
--- a/src/or/onion.h
+++ b/src/core/crypto/onion.h
diff --git a/src/or/onion_fast.c b/src/core/crypto/onion_fast.c
index 6e834ccf95..6e834ccf95 100644
--- a/src/or/onion_fast.c
+++ b/src/core/crypto/onion_fast.c
diff --git a/src/or/onion_fast.h b/src/core/crypto/onion_fast.h
index a7b6ec53f4..a7b6ec53f4 100644
--- a/src/or/onion_fast.h
+++ b/src/core/crypto/onion_fast.h
diff --git a/src/or/onion_ntor.c b/src/core/crypto/onion_ntor.c
index 59c923cb97..59c923cb97 100644
--- a/src/or/onion_ntor.c
+++ b/src/core/crypto/onion_ntor.c
diff --git a/src/or/onion_ntor.h b/src/core/crypto/onion_ntor.h
index 0ba4abe49e..0ba4abe49e 100644
--- a/src/or/onion_ntor.h
+++ b/src/core/crypto/onion_ntor.h
diff --git a/src/or/onion_tap.c b/src/core/crypto/onion_tap.c
index 05bcce2e87..05bcce2e87 100644
--- a/src/or/onion_tap.c
+++ b/src/core/crypto/onion_tap.c
diff --git a/src/or/onion_tap.h b/src/core/crypto/onion_tap.h
index 9a3df684d6..9a3df684d6 100644
--- a/src/or/onion_tap.h
+++ b/src/core/crypto/onion_tap.h
diff --git a/src/or/relay_crypto.c b/src/core/crypto/relay_crypto.c
index 1fcfae0b3a..1fcfae0b3a 100644
--- a/src/or/relay_crypto.c
+++ b/src/core/crypto/relay_crypto.c
diff --git a/src/or/relay_crypto.h b/src/core/crypto/relay_crypto.h
index 67da93344f..67da93344f 100644
--- a/src/or/relay_crypto.h
+++ b/src/core/crypto/relay_crypto.h
diff --git a/src/or/connection.c b/src/core/mainloop/connection.c
index 6fd8fbf771..6fd8fbf771 100644
--- a/src/or/connection.c
+++ b/src/core/mainloop/connection.c
diff --git a/src/or/connection.h b/src/core/mainloop/connection.h
index 3419ee65e8..3419ee65e8 100644
--- a/src/or/connection.h
+++ b/src/core/mainloop/connection.h
diff --git a/src/or/cpuworker.c b/src/core/mainloop/cpuworker.c
index 8b58e4c68c..8b58e4c68c 100644
--- a/src/or/cpuworker.c
+++ b/src/core/mainloop/cpuworker.c
diff --git a/src/or/cpuworker.h b/src/core/mainloop/cpuworker.h
index 50812b2dab..50812b2dab 100644
--- a/src/or/cpuworker.h
+++ b/src/core/mainloop/cpuworker.h
diff --git a/src/or/main.c b/src/core/mainloop/main.c
index 2a57aa587a..2a57aa587a 100644
--- a/src/or/main.c
+++ b/src/core/mainloop/main.c
diff --git a/src/or/main.h b/src/core/mainloop/main.h
index 90146f4bd4..90146f4bd4 100644
--- a/src/or/main.h
+++ b/src/core/mainloop/main.h
diff --git a/src/or/periodic.c b/src/core/mainloop/periodic.c
index 041b2d287b..041b2d287b 100644
--- a/src/or/periodic.c
+++ b/src/core/mainloop/periodic.c
diff --git a/src/or/periodic.h b/src/core/mainloop/periodic.h
index 4c8c3c96cc..4c8c3c96cc 100644
--- a/src/or/periodic.h
+++ b/src/core/mainloop/periodic.h
diff --git a/src/or/addr_policy_st.h b/src/core/or/addr_policy_st.h
index be3e9d8f01..be3e9d8f01 100644
--- a/src/or/addr_policy_st.h
+++ b/src/core/or/addr_policy_st.h
diff --git a/src/or/address_set.c b/src/core/or/address_set.c
index 927a5597c0..927a5597c0 100644
--- a/src/or/address_set.c
+++ b/src/core/or/address_set.c
diff --git a/src/or/address_set.h b/src/core/or/address_set.h
index 2efa1cb03b..2efa1cb03b 100644
--- a/src/or/address_set.h
+++ b/src/core/or/address_set.h
diff --git a/src/or/cell_queue_st.h b/src/core/or/cell_queue_st.h
index 40110019bc..40110019bc 100644
--- a/src/or/cell_queue_st.h
+++ b/src/core/or/cell_queue_st.h
diff --git a/src/or/cell_st.h b/src/core/or/cell_st.h
index 6728e783b9..6728e783b9 100644
--- a/src/or/cell_st.h
+++ b/src/core/or/cell_st.h
diff --git a/src/or/channel.c b/src/core/or/channel.c
index e6d717f111..e6d717f111 100644
--- a/src/or/channel.c
+++ b/src/core/or/channel.c
diff --git a/src/or/channel.h b/src/core/or/channel.h
index 7f25056769..7f25056769 100644
--- a/src/or/channel.h
+++ b/src/core/or/channel.h
diff --git a/src/or/channelpadding.c b/src/core/or/channelpadding.c
index 504f6f8f83..504f6f8f83 100644
--- a/src/or/channelpadding.c
+++ b/src/core/or/channelpadding.c
diff --git a/src/or/channelpadding.h b/src/core/or/channelpadding.h
index 7eddbdbe2d..7eddbdbe2d 100644
--- a/src/or/channelpadding.h
+++ b/src/core/or/channelpadding.h
diff --git a/src/or/channeltls.c b/src/core/or/channeltls.c
index 85dfe0c0f1..85dfe0c0f1 100644
--- a/src/or/channeltls.c
+++ b/src/core/or/channeltls.c
diff --git a/src/or/channeltls.h b/src/core/or/channeltls.h
index 1ab899af96..1ab899af96 100644
--- a/src/or/channeltls.h
+++ b/src/core/or/channeltls.h
diff --git a/src/or/circuit_st.h b/src/core/or/circuit_st.h
index 8453efa633..8453efa633 100644
--- a/src/or/circuit_st.h
+++ b/src/core/or/circuit_st.h
diff --git a/src/or/circuitbuild.c b/src/core/or/circuitbuild.c
index 39ae7ebf48..39ae7ebf48 100644
--- a/src/or/circuitbuild.c
+++ b/src/core/or/circuitbuild.c
diff --git a/src/or/circuitbuild.h b/src/core/or/circuitbuild.h
index 9f5d99c2a5..9f5d99c2a5 100644
--- a/src/or/circuitbuild.h
+++ b/src/core/or/circuitbuild.h
diff --git a/src/or/circuitlist.c b/src/core/or/circuitlist.c
index d9d12db9b4..d9d12db9b4 100644
--- a/src/or/circuitlist.c
+++ b/src/core/or/circuitlist.c
diff --git a/src/or/circuitlist.h b/src/core/or/circuitlist.h
index 7c9bc0199a..7c9bc0199a 100644
--- a/src/or/circuitlist.h
+++ b/src/core/or/circuitlist.h
diff --git a/src/or/circuitmux.c b/src/core/or/circuitmux.c
index 9e0126b8f1..9e0126b8f1 100644
--- a/src/or/circuitmux.c
+++ b/src/core/or/circuitmux.c
diff --git a/src/or/circuitmux.h b/src/core/or/circuitmux.h
index e94cc354c7..e94cc354c7 100644
--- a/src/or/circuitmux.h
+++ b/src/core/or/circuitmux.h
diff --git a/src/or/circuitmux_ewma.c b/src/core/or/circuitmux_ewma.c
index d600602a7e..d600602a7e 100644
--- a/src/or/circuitmux_ewma.c
+++ b/src/core/or/circuitmux_ewma.c
diff --git a/src/or/circuitmux_ewma.h b/src/core/or/circuitmux_ewma.h
index 1214b0264b..1214b0264b 100644
--- a/src/or/circuitmux_ewma.h
+++ b/src/core/or/circuitmux_ewma.h
diff --git a/src/or/circuitstats.c b/src/core/or/circuitstats.c
index d275399e97..d275399e97 100644
--- a/src/or/circuitstats.c
+++ b/src/core/or/circuitstats.c
diff --git a/src/or/circuitstats.h b/src/core/or/circuitstats.h
index 174730d035..174730d035 100644
--- a/src/or/circuitstats.h
+++ b/src/core/or/circuitstats.h
diff --git a/src/or/circuituse.c b/src/core/or/circuituse.c
index a3a69dc354..a3a69dc354 100644
--- a/src/or/circuituse.c
+++ b/src/core/or/circuituse.c
diff --git a/src/or/circuituse.h b/src/core/or/circuituse.h
index b65e85d170..b65e85d170 100644
--- a/src/or/circuituse.h
+++ b/src/core/or/circuituse.h
diff --git a/src/or/command.c b/src/core/or/command.c
index c2d6e2bb26..c2d6e2bb26 100644
--- a/src/or/command.c
+++ b/src/core/or/command.c
diff --git a/src/or/command.h b/src/core/or/command.h
index 864a5b2fd0..864a5b2fd0 100644
--- a/src/or/command.h
+++ b/src/core/or/command.h
diff --git a/src/or/connection_edge.c b/src/core/or/connection_edge.c
index 13d957a937..13d957a937 100644
--- a/src/or/connection_edge.c
+++ b/src/core/or/connection_edge.c
diff --git a/src/or/connection_edge.h b/src/core/or/connection_edge.h
index 24968b2778..24968b2778 100644
--- a/src/or/connection_edge.h
+++ b/src/core/or/connection_edge.h
diff --git a/src/or/connection_or.c b/src/core/or/connection_or.c
index 71ab905942..71ab905942 100644
--- a/src/or/connection_or.c
+++ b/src/core/or/connection_or.c
diff --git a/src/or/connection_or.h b/src/core/or/connection_or.h
index 2d95fdea18..2d95fdea18 100644
--- a/src/or/connection_or.h
+++ b/src/core/or/connection_or.h
diff --git a/src/or/connection_st.h b/src/core/or/connection_st.h
index 6c22478689..6c22478689 100644
--- a/src/or/connection_st.h
+++ b/src/core/or/connection_st.h
diff --git a/src/or/cpath_build_state_st.h b/src/core/or/cpath_build_state_st.h
index 1db7251132..1db7251132 100644
--- a/src/or/cpath_build_state_st.h
+++ b/src/core/or/cpath_build_state_st.h
diff --git a/src/or/crypt_path_reference_st.h b/src/core/or/crypt_path_reference_st.h
index bb0e519233..bb0e519233 100644
--- a/src/or/crypt_path_reference_st.h
+++ b/src/core/or/crypt_path_reference_st.h
diff --git a/src/or/crypt_path_st.h b/src/core/or/crypt_path_st.h
index 0fde1fab0e..0fde1fab0e 100644
--- a/src/or/crypt_path_st.h
+++ b/src/core/or/crypt_path_st.h
diff --git a/src/or/destroy_cell_queue_st.h b/src/core/or/destroy_cell_queue_st.h
index 2839b0bd11..2839b0bd11 100644
--- a/src/or/destroy_cell_queue_st.h
+++ b/src/core/or/destroy_cell_queue_st.h
diff --git a/src/or/dos.c b/src/core/or/dos.c
index d86ede02cb..d86ede02cb 100644
--- a/src/or/dos.c
+++ b/src/core/or/dos.c
diff --git a/src/or/dos.h b/src/core/or/dos.h
index 760ef11057..760ef11057 100644
--- a/src/or/dos.h
+++ b/src/core/or/dos.h
diff --git a/src/or/edge_connection_st.h b/src/core/or/edge_connection_st.h
index d58e1c2b8c..d58e1c2b8c 100644
--- a/src/or/edge_connection_st.h
+++ b/src/core/or/edge_connection_st.h
diff --git a/src/or/entry_connection_st.h b/src/core/or/entry_connection_st.h
index 2f9676088c..2f9676088c 100644
--- a/src/or/entry_connection_st.h
+++ b/src/core/or/entry_connection_st.h
diff --git a/src/or/entry_port_cfg_st.h b/src/core/or/entry_port_cfg_st.h
index 9b07ccb067..9b07ccb067 100644
--- a/src/or/entry_port_cfg_st.h
+++ b/src/core/or/entry_port_cfg_st.h
diff --git a/src/or/extend_info_st.h b/src/core/or/extend_info_st.h
index 277766c4d6..277766c4d6 100644
--- a/src/or/extend_info_st.h
+++ b/src/core/or/extend_info_st.h
diff --git a/src/or/git_revision.c b/src/core/or/git_revision.c
index be6f67423c..be6f67423c 100644
--- a/src/or/git_revision.c
+++ b/src/core/or/git_revision.c
diff --git a/src/or/git_revision.h b/src/core/or/git_revision.h
index 02070cfd5e..02070cfd5e 100644
--- a/src/or/git_revision.h
+++ b/src/core/or/git_revision.h
diff --git a/src/or/listener_connection_st.h b/src/core/or/listener_connection_st.h
index 7b5aafcb58..7b5aafcb58 100644
--- a/src/or/listener_connection_st.h
+++ b/src/core/or/listener_connection_st.h
diff --git a/src/or/or.h b/src/core/or/or.h
index 826e81e468..826e81e468 100644
--- a/src/or/or.h
+++ b/src/core/or/or.h
diff --git a/src/or/or_circuit_st.h b/src/core/or/or_circuit_st.h
index 158a5314ef..158a5314ef 100644
--- a/src/or/or_circuit_st.h
+++ b/src/core/or/or_circuit_st.h
diff --git a/src/or/or_connection_st.h b/src/core/or/or_connection_st.h
index 8c2c1f89c6..8c2c1f89c6 100644
--- a/src/or/or_connection_st.h
+++ b/src/core/or/or_connection_st.h
diff --git a/src/or/or_handshake_certs_st.h b/src/core/or/or_handshake_certs_st.h
index 38e798b5e2..38e798b5e2 100644
--- a/src/or/or_handshake_certs_st.h
+++ b/src/core/or/or_handshake_certs_st.h
diff --git a/src/or/or_handshake_state_st.h b/src/core/or/or_handshake_state_st.h
index 4ee095d9af..4ee095d9af 100644
--- a/src/or/or_handshake_state_st.h
+++ b/src/core/or/or_handshake_state_st.h
diff --git a/src/or/origin_circuit_st.h b/src/core/or/origin_circuit_st.h
index b885725edb..b885725edb 100644
--- a/src/or/origin_circuit_st.h
+++ b/src/core/or/origin_circuit_st.h
diff --git a/src/or/policies.c b/src/core/or/policies.c
index 53e00e8083..53e00e8083 100644
--- a/src/or/policies.c
+++ b/src/core/or/policies.c
diff --git a/src/or/policies.h b/src/core/or/policies.h
index 7da3ba031f..7da3ba031f 100644
--- a/src/or/policies.h
+++ b/src/core/or/policies.h
diff --git a/src/or/port_cfg_st.h b/src/core/or/port_cfg_st.h
index 86a3b963bc..86a3b963bc 100644
--- a/src/or/port_cfg_st.h
+++ b/src/core/or/port_cfg_st.h
diff --git a/src/or/reasons.c b/src/core/or/reasons.c
index 7d8dcf374c..7d8dcf374c 100644
--- a/src/or/reasons.c
+++ b/src/core/or/reasons.c
diff --git a/src/or/reasons.h b/src/core/or/reasons.h
index 837b4a0f1a..837b4a0f1a 100644
--- a/src/or/reasons.h
+++ b/src/core/or/reasons.h
diff --git a/src/or/relay.c b/src/core/or/relay.c
index e8e1762b40..e8e1762b40 100644
--- a/src/or/relay.c
+++ b/src/core/or/relay.c
diff --git a/src/or/relay.h b/src/core/or/relay.h
index db7f17b96c..db7f17b96c 100644
--- a/src/or/relay.h
+++ b/src/core/or/relay.h
diff --git a/src/or/relay_crypto_st.h b/src/core/or/relay_crypto_st.h
index f186e182f0..f186e182f0 100644
--- a/src/or/relay_crypto_st.h
+++ b/src/core/or/relay_crypto_st.h
diff --git a/src/or/scheduler.c b/src/core/or/scheduler.c
index b8eaca3dca..b8eaca3dca 100644
--- a/src/or/scheduler.c
+++ b/src/core/or/scheduler.c
diff --git a/src/or/scheduler.h b/src/core/or/scheduler.h
index 856923f9a7..856923f9a7 100644
--- a/src/or/scheduler.h
+++ b/src/core/or/scheduler.h
diff --git a/src/or/scheduler_kist.c b/src/core/or/scheduler_kist.c
index 5a45ccab88..5a45ccab88 100644
--- a/src/or/scheduler_kist.c
+++ b/src/core/or/scheduler_kist.c
diff --git a/src/or/scheduler_vanilla.c b/src/core/or/scheduler_vanilla.c
index e05bebb37c..e05bebb37c 100644
--- a/src/or/scheduler_vanilla.c
+++ b/src/core/or/scheduler_vanilla.c
diff --git a/src/or/server_port_cfg_st.h b/src/core/or/server_port_cfg_st.h
index e1a9ca496a..e1a9ca496a 100644
--- a/src/or/server_port_cfg_st.h
+++ b/src/core/or/server_port_cfg_st.h
diff --git a/src/or/socks_request_st.h b/src/core/or/socks_request_st.h
index d7b979c3eb..d7b979c3eb 100644
--- a/src/or/socks_request_st.h
+++ b/src/core/or/socks_request_st.h
diff --git a/src/or/status.c b/src/core/or/status.c
index 2259b3aae7..2259b3aae7 100644
--- a/src/or/status.c
+++ b/src/core/or/status.c
diff --git a/src/or/status.h b/src/core/or/status.h
index 7258ed5939..7258ed5939 100644
--- a/src/or/status.h
+++ b/src/core/or/status.h
diff --git a/src/or/tor_version_st.h b/src/core/or/tor_version_st.h
index 5950c5d5c4..5950c5d5c4 100644
--- a/src/or/tor_version_st.h
+++ b/src/core/or/tor_version_st.h
diff --git a/src/or/var_cell_st.h b/src/core/or/var_cell_st.h
index 514afc44b1..514afc44b1 100644
--- a/src/or/var_cell_st.h
+++ b/src/core/or/var_cell_st.h
diff --git a/src/or/proto_cell.c b/src/core/proto/proto_cell.c
index 41554bd1b0..41554bd1b0 100644
--- a/src/or/proto_cell.c
+++ b/src/core/proto/proto_cell.c
diff --git a/src/or/proto_cell.h b/src/core/proto/proto_cell.h
index b29645e41d..b29645e41d 100644
--- a/src/or/proto_cell.h
+++ b/src/core/proto/proto_cell.h
diff --git a/src/or/proto_control0.c b/src/core/proto/proto_control0.c
index 34e7ddb8d9..34e7ddb8d9 100644
--- a/src/or/proto_control0.c
+++ b/src/core/proto/proto_control0.c
diff --git a/src/or/proto_control0.h b/src/core/proto/proto_control0.h
index b80dc6c8f8..b80dc6c8f8 100644
--- a/src/or/proto_control0.h
+++ b/src/core/proto/proto_control0.h
diff --git a/src/or/proto_ext_or.c b/src/core/proto/proto_ext_or.c
index f30d876231..f30d876231 100644
--- a/src/or/proto_ext_or.c
+++ b/src/core/proto/proto_ext_or.c
diff --git a/src/or/proto_ext_or.h b/src/core/proto/proto_ext_or.h
index 708a45974b..708a45974b 100644
--- a/src/or/proto_ext_or.h
+++ b/src/core/proto/proto_ext_or.h
diff --git a/src/or/proto_http.c b/src/core/proto/proto_http.c
index ecc669e3a4..ecc669e3a4 100644
--- a/src/or/proto_http.c
+++ b/src/core/proto/proto_http.c
diff --git a/src/or/proto_http.h b/src/core/proto/proto_http.h
index 587e435ede..587e435ede 100644
--- a/src/or/proto_http.h
+++ b/src/core/proto/proto_http.h
diff --git a/src/or/proto_socks.c b/src/core/proto/proto_socks.c
index f5e6ce581b..f5e6ce581b 100644
--- a/src/or/proto_socks.c
+++ b/src/core/proto/proto_socks.c
diff --git a/src/or/proto_socks.h b/src/core/proto/proto_socks.h
index 53de288f65..53de288f65 100644
--- a/src/or/proto_socks.h
+++ b/src/core/proto/proto_socks.h
diff --git a/src/or/protover.c b/src/core/proto/protover.c
index f63c134565..f63c134565 100644
--- a/src/or/protover.c
+++ b/src/core/proto/protover.c
diff --git a/src/or/protover.h b/src/core/proto/protover.h
index 7319d2f8c4..7319d2f8c4 100644
--- a/src/or/protover.h
+++ b/src/core/proto/protover.h
diff --git a/src/or/protover_rust.c b/src/core/proto/protover_rust.c
index bd2f88b98e..bd2f88b98e 100644
--- a/src/or/protover_rust.c
+++ b/src/core/proto/protover_rust.c
diff --git a/src/or/tor_api.c b/src/feature/api/tor_api.c
index efedf2dc78..efedf2dc78 100644
--- a/src/or/tor_api.c
+++ b/src/feature/api/tor_api.c
diff --git a/src/or/tor_api.h b/src/feature/api/tor_api.h
index ead9493c1f..ead9493c1f 100644
--- a/src/or/tor_api.h
+++ b/src/feature/api/tor_api.h
diff --git a/src/or/tor_api_internal.h b/src/feature/api/tor_api_internal.h
index 2c392a68de..2c392a68de 100644
--- a/src/or/tor_api_internal.h
+++ b/src/feature/api/tor_api_internal.h
diff --git a/src/or/addressmap.c b/src/feature/client/addressmap.c
index ba78a5f908..ba78a5f908 100644
--- a/src/or/addressmap.c
+++ b/src/feature/client/addressmap.c
diff --git a/src/or/addressmap.h b/src/feature/client/addressmap.h
index b0db5c8b4e..b0db5c8b4e 100644
--- a/src/or/addressmap.h
+++ b/src/feature/client/addressmap.h
diff --git a/src/or/bridges.c b/src/feature/client/bridges.c
index ca0a13f2a0..ca0a13f2a0 100644
--- a/src/or/bridges.c
+++ b/src/feature/client/bridges.c
diff --git a/src/or/bridges.h b/src/feature/client/bridges.h
index 70588c1b91..70588c1b91 100644
--- a/src/or/bridges.h
+++ b/src/feature/client/bridges.h
diff --git a/src/or/circpathbias.c b/src/feature/client/circpathbias.c
index 32b3212d3f..32b3212d3f 100644
--- a/src/or/circpathbias.c
+++ b/src/feature/client/circpathbias.c
diff --git a/src/or/circpathbias.h b/src/feature/client/circpathbias.h
index c99d1277bb..c99d1277bb 100644
--- a/src/or/circpathbias.h
+++ b/src/feature/client/circpathbias.h
diff --git a/src/or/dnsserv.c b/src/feature/client/dnsserv.c
index 6e75254239..6e75254239 100644
--- a/src/or/dnsserv.c
+++ b/src/feature/client/dnsserv.c
diff --git a/src/or/dnsserv.h b/src/feature/client/dnsserv.h
index afdde3a342..afdde3a342 100644
--- a/src/or/dnsserv.h
+++ b/src/feature/client/dnsserv.h
diff --git a/src/or/entrynodes.c b/src/feature/client/entrynodes.c
index ba9c30f8b3..ba9c30f8b3 100644
--- a/src/or/entrynodes.c
+++ b/src/feature/client/entrynodes.c
diff --git a/src/or/entrynodes.h b/src/feature/client/entrynodes.h
index 5f9b5bdcba..5f9b5bdcba 100644
--- a/src/or/entrynodes.h
+++ b/src/feature/client/entrynodes.h
diff --git a/src/or/transports.c b/src/feature/client/transports.c
index 1d3cb7b951..1d3cb7b951 100644
--- a/src/or/transports.c
+++ b/src/feature/client/transports.c
diff --git a/src/or/transports.h b/src/feature/client/transports.h
index d304dcd485..d304dcd485 100644
--- a/src/or/transports.h
+++ b/src/feature/client/transports.h
diff --git a/src/or/control.c b/src/feature/control/control.c
index aa43fccff0..aa43fccff0 100644
--- a/src/or/control.c
+++ b/src/feature/control/control.c
diff --git a/src/or/control.h b/src/feature/control/control.h
index 5c5fe8a917..5c5fe8a917 100644
--- a/src/or/control.h
+++ b/src/feature/control/control.h
diff --git a/src/or/control_connection_st.h b/src/feature/control/control_connection_st.h
index 4f8ab25d99..4f8ab25d99 100644
--- a/src/or/control_connection_st.h
+++ b/src/feature/control/control_connection_st.h
diff --git a/src/or/dirauth/dircollate.c b/src/feature/dirauth/dircollate.c
index 246977dcc8..246977dcc8 100644
--- a/src/or/dirauth/dircollate.c
+++ b/src/feature/dirauth/dircollate.c
diff --git a/src/or/dirauth/dircollate.h b/src/feature/dirauth/dircollate.h
index aae7829786..aae7829786 100644
--- a/src/or/dirauth/dircollate.h
+++ b/src/feature/dirauth/dircollate.h
diff --git a/src/or/dirauth/dirvote.c b/src/feature/dirauth/dirvote.c
index 15f8378744..15f8378744 100644
--- a/src/or/dirauth/dirvote.c
+++ b/src/feature/dirauth/dirvote.c
diff --git a/src/or/dirauth/dirvote.h b/src/feature/dirauth/dirvote.h
index 7ce8e4a699..7ce8e4a699 100644
--- a/src/or/dirauth/dirvote.h
+++ b/src/feature/dirauth/dirvote.h
diff --git a/src/or/keypin.c b/src/feature/dirauth/keypin.c
index a2f3654b82..a2f3654b82 100644
--- a/src/or/keypin.c
+++ b/src/feature/dirauth/keypin.c
diff --git a/src/or/keypin.h b/src/feature/dirauth/keypin.h
index 73a76be563..73a76be563 100644
--- a/src/or/keypin.h
+++ b/src/feature/dirauth/keypin.h
diff --git a/src/or/dirauth/mode.h b/src/feature/dirauth/mode.h
index 17c35aff64..17c35aff64 100644
--- a/src/or/dirauth/mode.h
+++ b/src/feature/dirauth/mode.h
diff --git a/src/or/ns_detached_signatures_st.h b/src/feature/dirauth/ns_detached_signatures_st.h
index 26ceec84b9..26ceec84b9 100644
--- a/src/or/ns_detached_signatures_st.h
+++ b/src/feature/dirauth/ns_detached_signatures_st.h
diff --git a/src/or/dirauth/shared_random.c b/src/feature/dirauth/shared_random.c
index d122690129..d122690129 100644
--- a/src/or/dirauth/shared_random.c
+++ b/src/feature/dirauth/shared_random.c
diff --git a/src/or/dirauth/shared_random.h b/src/feature/dirauth/shared_random.h
index 93bab99f71..93bab99f71 100644
--- a/src/or/dirauth/shared_random.h
+++ b/src/feature/dirauth/shared_random.h
diff --git a/src/or/dirauth/shared_random_state.c b/src/feature/dirauth/shared_random_state.c
index 87ddcc0736..87ddcc0736 100644
--- a/src/or/dirauth/shared_random_state.c
+++ b/src/feature/dirauth/shared_random_state.c
diff --git a/src/or/dirauth/shared_random_state.h b/src/feature/dirauth/shared_random_state.h
index f99874872b..f99874872b 100644
--- a/src/or/dirauth/shared_random_state.h
+++ b/src/feature/dirauth/shared_random_state.h
diff --git a/src/or/vote_microdesc_hash_st.h b/src/feature/dirauth/vote_microdesc_hash_st.h
index 31fc98040e..31fc98040e 100644
--- a/src/or/vote_microdesc_hash_st.h
+++ b/src/feature/dirauth/vote_microdesc_hash_st.h
diff --git a/src/or/cached_dir_st.h b/src/feature/dircache/cached_dir_st.h
index 38ae86d975..38ae86d975 100644
--- a/src/or/cached_dir_st.h
+++ b/src/feature/dircache/cached_dir_st.h
diff --git a/src/or/conscache.c b/src/feature/dircache/conscache.c
index bc5928ff23..bc5928ff23 100644
--- a/src/or/conscache.c
+++ b/src/feature/dircache/conscache.c
diff --git a/src/or/conscache.h b/src/feature/dircache/conscache.h
index c274a60393..c274a60393 100644
--- a/src/or/conscache.h
+++ b/src/feature/dircache/conscache.h
diff --git a/src/or/consdiffmgr.c b/src/feature/dircache/consdiffmgr.c
index 6d5183f934..6d5183f934 100644
--- a/src/or/consdiffmgr.c
+++ b/src/feature/dircache/consdiffmgr.c
diff --git a/src/or/consdiffmgr.h b/src/feature/dircache/consdiffmgr.h
index 66c3d65002..66c3d65002 100644
--- a/src/or/consdiffmgr.h
+++ b/src/feature/dircache/consdiffmgr.h
diff --git a/src/or/directory.c b/src/feature/dircache/directory.c
index 8f2bd8d3a7..8f2bd8d3a7 100644
--- a/src/or/directory.c
+++ b/src/feature/dircache/directory.c
diff --git a/src/or/directory.h b/src/feature/dircache/directory.h
index 992ff618fb..992ff618fb 100644
--- a/src/or/directory.h
+++ b/src/feature/dircache/directory.h
diff --git a/src/or/dirserv.c b/src/feature/dircache/dirserv.c
index 2980d63f0a..2980d63f0a 100644
--- a/src/or/dirserv.c
+++ b/src/feature/dircache/dirserv.c
diff --git a/src/or/dirserv.h b/src/feature/dircache/dirserv.h
index 3b4a646094..3b4a646094 100644
--- a/src/or/dirserv.h
+++ b/src/feature/dircache/dirserv.h
diff --git a/src/or/dir_server_st.h b/src/feature/dirclient/dir_server_st.h
index fe1f5c3d5f..fe1f5c3d5f 100644
--- a/src/or/dir_server_st.h
+++ b/src/feature/dirclient/dir_server_st.h
diff --git a/src/or/download_status_st.h b/src/feature/dirclient/download_status_st.h
index 3f18f754a1..3f18f754a1 100644
--- a/src/or/download_status_st.h
+++ b/src/feature/dirclient/download_status_st.h
diff --git a/src/or/consdiff.c b/src/feature/dircommon/consdiff.c
index 88edda716e..88edda716e 100644
--- a/src/or/consdiff.c
+++ b/src/feature/dircommon/consdiff.c
diff --git a/src/or/consdiff.h b/src/feature/dircommon/consdiff.h
index 1cae59a1a5..1cae59a1a5 100644
--- a/src/or/consdiff.h
+++ b/src/feature/dircommon/consdiff.h
diff --git a/src/or/dir_connection_st.h b/src/feature/dircommon/dir_connection_st.h
index 1282f82d64..1282f82d64 100644
--- a/src/or/dir_connection_st.h
+++ b/src/feature/dircommon/dir_connection_st.h
diff --git a/src/or/fp_pair.c b/src/feature/dircommon/fp_pair.c
index 1d7b751c23..1d7b751c23 100644
--- a/src/or/fp_pair.c
+++ b/src/feature/dircommon/fp_pair.c
diff --git a/src/or/fp_pair.h b/src/feature/dircommon/fp_pair.h
index 500c7c9928..500c7c9928 100644
--- a/src/or/fp_pair.h
+++ b/src/feature/dircommon/fp_pair.h
diff --git a/src/or/vote_timing_st.h b/src/feature/dircommon/vote_timing_st.h
index 14c13eed28..14c13eed28 100644
--- a/src/or/vote_timing_st.h
+++ b/src/feature/dircommon/vote_timing_st.h
diff --git a/src/or/voting_schedule.c b/src/feature/dircommon/voting_schedule.c
index 6edde3f229..6edde3f229 100644
--- a/src/or/voting_schedule.c
+++ b/src/feature/dircommon/voting_schedule.c
diff --git a/src/or/voting_schedule.h b/src/feature/dircommon/voting_schedule.h
index 0f27d36d52..0f27d36d52 100644
--- a/src/or/voting_schedule.h
+++ b/src/feature/dircommon/voting_schedule.h
diff --git a/src/or/hibernate.c b/src/feature/hibernate/hibernate.c
index 55de64c13e..55de64c13e 100644
--- a/src/or/hibernate.c
+++ b/src/feature/hibernate/hibernate.c
diff --git a/src/or/hibernate.h b/src/feature/hibernate/hibernate.h
index bfd8571cd6..bfd8571cd6 100644
--- a/src/or/hibernate.h
+++ b/src/feature/hibernate/hibernate.h
diff --git a/src/or/hs_cache.c b/src/feature/hs/hs_cache.c
index 3772e0c0ed..3772e0c0ed 100644
--- a/src/or/hs_cache.c
+++ b/src/feature/hs/hs_cache.c
diff --git a/src/or/hs_cache.h b/src/feature/hs/hs_cache.h
index 1e479700fa..1e479700fa 100644
--- a/src/or/hs_cache.h
+++ b/src/feature/hs/hs_cache.h
diff --git a/src/or/hs_cell.c b/src/feature/hs/hs_cell.c
index f8b76c5133..f8b76c5133 100644
--- a/src/or/hs_cell.c
+++ b/src/feature/hs/hs_cell.c
diff --git a/src/or/hs_cell.h b/src/feature/hs/hs_cell.h
index 4a522810c6..4a522810c6 100644
--- a/src/or/hs_cell.h
+++ b/src/feature/hs/hs_cell.h
diff --git a/src/or/hs_circuit.c b/src/feature/hs/hs_circuit.c
index 5a2c7e4e42..5a2c7e4e42 100644
--- a/src/or/hs_circuit.c
+++ b/src/feature/hs/hs_circuit.c
diff --git a/src/or/hs_circuit.h b/src/feature/hs/hs_circuit.h
index 425070f4ca..425070f4ca 100644
--- a/src/or/hs_circuit.h
+++ b/src/feature/hs/hs_circuit.h
diff --git a/src/or/hs_circuitmap.c b/src/feature/hs/hs_circuitmap.c
index c4bf9fab43..c4bf9fab43 100644
--- a/src/or/hs_circuitmap.c
+++ b/src/feature/hs/hs_circuitmap.c
diff --git a/src/or/hs_circuitmap.h b/src/feature/hs/hs_circuitmap.h
index c39a37c052..c39a37c052 100644
--- a/src/or/hs_circuitmap.h
+++ b/src/feature/hs/hs_circuitmap.h
diff --git a/src/or/hs_client.c b/src/feature/hs/hs_client.c
index cc461e368d..cc461e368d 100644
--- a/src/or/hs_client.c
+++ b/src/feature/hs/hs_client.c
diff --git a/src/or/hs_client.h b/src/feature/hs/hs_client.h
index 8083910747..8083910747 100644
--- a/src/or/hs_client.h
+++ b/src/feature/hs/hs_client.h
diff --git a/src/or/hs_common.c b/src/feature/hs/hs_common.c
index d91f45a639..d91f45a639 100644
--- a/src/or/hs_common.c
+++ b/src/feature/hs/hs_common.c
diff --git a/src/or/hs_common.h b/src/feature/hs/hs_common.h
index 24f5f3a20f..24f5f3a20f 100644
--- a/src/or/hs_common.h
+++ b/src/feature/hs/hs_common.h
diff --git a/src/or/hs_config.c b/src/feature/hs/hs_config.c
index cb55faa9d5..cb55faa9d5 100644
--- a/src/or/hs_config.c
+++ b/src/feature/hs/hs_config.c
diff --git a/src/or/hs_config.h b/src/feature/hs/hs_config.h
index 461d58d384..461d58d384 100644
--- a/src/or/hs_config.h
+++ b/src/feature/hs/hs_config.h
diff --git a/src/or/hs_control.c b/src/feature/hs/hs_control.c
index be456e8da4..be456e8da4 100644
--- a/src/or/hs_control.c
+++ b/src/feature/hs/hs_control.c
diff --git a/src/or/hs_control.h b/src/feature/hs/hs_control.h
index 040ce4a793..040ce4a793 100644
--- a/src/or/hs_control.h
+++ b/src/feature/hs/hs_control.h
diff --git a/src/or/hs_descriptor.c b/src/feature/hs/hs_descriptor.c
index 5fd8971dc0..5fd8971dc0 100644
--- a/src/or/hs_descriptor.c
+++ b/src/feature/hs/hs_descriptor.c
diff --git a/src/or/hs_descriptor.h b/src/feature/hs/hs_descriptor.h
index 7a4010cd3b..7a4010cd3b 100644
--- a/src/or/hs_descriptor.h
+++ b/src/feature/hs/hs_descriptor.h
diff --git a/src/or/hs_ident.c b/src/feature/hs/hs_ident.c
index 20539ca878..20539ca878 100644
--- a/src/or/hs_ident.c
+++ b/src/feature/hs/hs_ident.c
diff --git a/src/or/hs_ident.h b/src/feature/hs/hs_ident.h
index 8c53b9dbeb..8c53b9dbeb 100644
--- a/src/or/hs_ident.h
+++ b/src/feature/hs/hs_ident.h
diff --git a/src/or/hs_intropoint.c b/src/feature/hs/hs_intropoint.c
index 2594058679..2594058679 100644
--- a/src/or/hs_intropoint.c
+++ b/src/feature/hs/hs_intropoint.c
diff --git a/src/or/hs_intropoint.h b/src/feature/hs/hs_intropoint.h
index 5f82920991..5f82920991 100644
--- a/src/or/hs_intropoint.h
+++ b/src/feature/hs/hs_intropoint.h
diff --git a/src/or/hs_service.c b/src/feature/hs/hs_service.c
index 6cb01b57c9..6cb01b57c9 100644
--- a/src/or/hs_service.c
+++ b/src/feature/hs/hs_service.c
diff --git a/src/or/hs_service.h b/src/feature/hs/hs_service.h
index 4676042b54..4676042b54 100644
--- a/src/or/hs_service.h
+++ b/src/feature/hs/hs_service.h
diff --git a/src/or/hs_stats.c b/src/feature/hs/hs_stats.c
index c8a99b19d4..c8a99b19d4 100644
--- a/src/or/hs_stats.c
+++ b/src/feature/hs/hs_stats.c
diff --git a/src/or/hs_stats.h b/src/feature/hs/hs_stats.h
index a946ad75e5..a946ad75e5 100644
--- a/src/or/hs_stats.h
+++ b/src/feature/hs/hs_stats.h
diff --git a/src/or/hsdir_index_st.h b/src/feature/hs/hsdir_index_st.h
index de5cc9bd16..de5cc9bd16 100644
--- a/src/or/hsdir_index_st.h
+++ b/src/feature/hs/hsdir_index_st.h
diff --git a/src/or/replaycache.c b/src/feature/hs_common/replaycache.c
index b5cc6a2823..b5cc6a2823 100644
--- a/src/or/replaycache.c
+++ b/src/feature/hs_common/replaycache.c
diff --git a/src/or/replaycache.h b/src/feature/hs_common/replaycache.h
index 3118a88a1a..3118a88a1a 100644
--- a/src/or/replaycache.h
+++ b/src/feature/hs_common/replaycache.h
diff --git a/src/or/shared_random_client.c b/src/feature/hs_common/shared_random_client.c
index 42a5b42f60..42a5b42f60 100644
--- a/src/or/shared_random_client.c
+++ b/src/feature/hs_common/shared_random_client.c
diff --git a/src/or/shared_random_client.h b/src/feature/hs_common/shared_random_client.h
index 079829496c..079829496c 100644
--- a/src/or/shared_random_client.h
+++ b/src/feature/hs_common/shared_random_client.h
diff --git a/src/or/authority_cert_st.h b/src/feature/nodelist/authority_cert_st.h
index 19c3fda2de..19c3fda2de 100644
--- a/src/or/authority_cert_st.h
+++ b/src/feature/nodelist/authority_cert_st.h
diff --git a/src/or/desc_store_st.h b/src/feature/nodelist/desc_store_st.h
index 168a83b230..168a83b230 100644
--- a/src/or/desc_store_st.h
+++ b/src/feature/nodelist/desc_store_st.h
diff --git a/src/or/document_signature_st.h b/src/feature/nodelist/document_signature_st.h
index 0291e099bf..0291e099bf 100644
--- a/src/or/document_signature_st.h
+++ b/src/feature/nodelist/document_signature_st.h
diff --git a/src/or/extrainfo_st.h b/src/feature/nodelist/extrainfo_st.h
index f91bba7b68..f91bba7b68 100644
--- a/src/or/extrainfo_st.h
+++ b/src/feature/nodelist/extrainfo_st.h
diff --git a/src/or/microdesc.c b/src/feature/nodelist/microdesc.c
index 95c5e8b6f7..95c5e8b6f7 100644
--- a/src/or/microdesc.c
+++ b/src/feature/nodelist/microdesc.c
diff --git a/src/or/microdesc.h b/src/feature/nodelist/microdesc.h
index f11b841cf1..f11b841cf1 100644
--- a/src/or/microdesc.h
+++ b/src/feature/nodelist/microdesc.h
diff --git a/src/or/microdesc_st.h b/src/feature/nodelist/microdesc_st.h
index e9dc3e0174..e9dc3e0174 100644
--- a/src/or/microdesc_st.h
+++ b/src/feature/nodelist/microdesc_st.h
diff --git a/src/or/networkstatus.c b/src/feature/nodelist/networkstatus.c
index f91e46cdd7..f91e46cdd7 100644
--- a/src/or/networkstatus.c
+++ b/src/feature/nodelist/networkstatus.c
diff --git a/src/or/networkstatus.h b/src/feature/nodelist/networkstatus.h
index cc6badf0b2..cc6badf0b2 100644
--- a/src/or/networkstatus.h
+++ b/src/feature/nodelist/networkstatus.h
diff --git a/src/or/networkstatus_sr_info_st.h b/src/feature/nodelist/networkstatus_sr_info_st.h
index 6c937a75f5..6c937a75f5 100644
--- a/src/or/networkstatus_sr_info_st.h
+++ b/src/feature/nodelist/networkstatus_sr_info_st.h
diff --git a/src/or/networkstatus_st.h b/src/feature/nodelist/networkstatus_st.h
index 4a193ad149..4a193ad149 100644
--- a/src/or/networkstatus_st.h
+++ b/src/feature/nodelist/networkstatus_st.h
diff --git a/src/or/networkstatus_voter_info_st.h b/src/feature/nodelist/networkstatus_voter_info_st.h
index 93ff3cd418..93ff3cd418 100644
--- a/src/or/networkstatus_voter_info_st.h
+++ b/src/feature/nodelist/networkstatus_voter_info_st.h
diff --git a/src/or/node_st.h b/src/feature/nodelist/node_st.h
index d56ce27884..d56ce27884 100644
--- a/src/or/node_st.h
+++ b/src/feature/nodelist/node_st.h
diff --git a/src/or/nodelist.c b/src/feature/nodelist/nodelist.c
index 51fd0015df..51fd0015df 100644
--- a/src/or/nodelist.c
+++ b/src/feature/nodelist/nodelist.c
diff --git a/src/or/nodelist.h b/src/feature/nodelist/nodelist.h
index ed3a542971..ed3a542971 100644
--- a/src/or/nodelist.h
+++ b/src/feature/nodelist/nodelist.h
diff --git a/src/or/parsecommon.c b/src/feature/nodelist/parsecommon.c
index 4340f28225..4340f28225 100644
--- a/src/or/parsecommon.c
+++ b/src/feature/nodelist/parsecommon.c
diff --git a/src/or/parsecommon.h b/src/feature/nodelist/parsecommon.h
index d0f3810c0b..d0f3810c0b 100644
--- a/src/or/parsecommon.h
+++ b/src/feature/nodelist/parsecommon.h
diff --git a/src/or/routerinfo_st.h b/src/feature/nodelist/routerinfo_st.h
index 89a7702b30..89a7702b30 100644
--- a/src/or/routerinfo_st.h
+++ b/src/feature/nodelist/routerinfo_st.h
diff --git a/src/or/routerlist.c b/src/feature/nodelist/routerlist.c
index 76a236ff20..76a236ff20 100644
--- a/src/or/routerlist.c
+++ b/src/feature/nodelist/routerlist.c
diff --git a/src/or/routerlist.h b/src/feature/nodelist/routerlist.h
index 4b7406364f..4b7406364f 100644
--- a/src/or/routerlist.h
+++ b/src/feature/nodelist/routerlist.h
diff --git a/src/or/routerlist_st.h b/src/feature/nodelist/routerlist_st.h
index 0b94a4dfcd..0b94a4dfcd 100644
--- a/src/or/routerlist_st.h
+++ b/src/feature/nodelist/routerlist_st.h
diff --git a/src/or/routerparse.c b/src/feature/nodelist/routerparse.c
index 273666046b..273666046b 100644
--- a/src/or/routerparse.c
+++ b/src/feature/nodelist/routerparse.c
diff --git a/src/or/routerparse.h b/src/feature/nodelist/routerparse.h
index 87c2a75aa5..87c2a75aa5 100644
--- a/src/or/routerparse.h
+++ b/src/feature/nodelist/routerparse.h
diff --git a/src/or/routerset.c b/src/feature/nodelist/routerset.c
index 285ef9d821..285ef9d821 100644
--- a/src/or/routerset.c
+++ b/src/feature/nodelist/routerset.c
diff --git a/src/or/routerset.h b/src/feature/nodelist/routerset.h
index 8a13ca042a..8a13ca042a 100644
--- a/src/or/routerset.h
+++ b/src/feature/nodelist/routerset.h
diff --git a/src/or/routerstatus_st.h b/src/feature/nodelist/routerstatus_st.h
index 3de4a40ae4..3de4a40ae4 100644
--- a/src/or/routerstatus_st.h
+++ b/src/feature/nodelist/routerstatus_st.h
diff --git a/src/or/signed_descriptor_st.h b/src/feature/nodelist/signed_descriptor_st.h
index 90cd4a2703..90cd4a2703 100644
--- a/src/or/signed_descriptor_st.h
+++ b/src/feature/nodelist/signed_descriptor_st.h
diff --git a/src/or/torcert.c b/src/feature/nodelist/torcert.c
index 39c6605c65..39c6605c65 100644
--- a/src/or/torcert.c
+++ b/src/feature/nodelist/torcert.c
diff --git a/src/or/torcert.h b/src/feature/nodelist/torcert.h
index 5fa97679df..5fa97679df 100644
--- a/src/or/torcert.h
+++ b/src/feature/nodelist/torcert.h
diff --git a/src/or/vote_routerstatus_st.h b/src/feature/nodelist/vote_routerstatus_st.h
index 1b85737df8..1b85737df8 100644
--- a/src/or/vote_routerstatus_st.h
+++ b/src/feature/nodelist/vote_routerstatus_st.h
diff --git a/src/or/dns.c b/src/feature/relay/dns.c
index 4ac58552f4..4ac58552f4 100644
--- a/src/or/dns.c
+++ b/src/feature/relay/dns.c
diff --git a/src/or/dns.h b/src/feature/relay/dns.h
index 12853205ff..12853205ff 100644
--- a/src/or/dns.h
+++ b/src/feature/relay/dns.h
diff --git a/src/or/dns_structs.h b/src/feature/relay/dns_structs.h
index 28c48ca0bc..28c48ca0bc 100644
--- a/src/or/dns_structs.h
+++ b/src/feature/relay/dns_structs.h
diff --git a/src/or/ext_orport.c b/src/feature/relay/ext_orport.c
index 7342a66e06..7342a66e06 100644
--- a/src/or/ext_orport.c
+++ b/src/feature/relay/ext_orport.c
diff --git a/src/or/ext_orport.h b/src/feature/relay/ext_orport.h
index 7eebfdb25b..7eebfdb25b 100644
--- a/src/or/ext_orport.h
+++ b/src/feature/relay/ext_orport.h
diff --git a/src/or/router.c b/src/feature/relay/router.c
index 44af1e3108..44af1e3108 100644
--- a/src/or/router.c
+++ b/src/feature/relay/router.c
diff --git a/src/or/router.h b/src/feature/relay/router.h
index 51ac365798..51ac365798 100644
--- a/src/or/router.h
+++ b/src/feature/relay/router.h
diff --git a/src/or/routerkeys.c b/src/feature/relay/routerkeys.c
index bb04a8b220..bb04a8b220 100644
--- a/src/or/routerkeys.c
+++ b/src/feature/relay/routerkeys.c
diff --git a/src/or/routerkeys.h b/src/feature/relay/routerkeys.h
index a6f06f6e20..a6f06f6e20 100644
--- a/src/or/routerkeys.h
+++ b/src/feature/relay/routerkeys.h
diff --git a/src/or/rend_authorized_client_st.h b/src/feature/rend/rend_authorized_client_st.h
index 7ccf9771e1..7ccf9771e1 100644
--- a/src/or/rend_authorized_client_st.h
+++ b/src/feature/rend/rend_authorized_client_st.h
diff --git a/src/or/rend_encoded_v2_service_descriptor_st.h b/src/feature/rend/rend_encoded_v2_service_descriptor_st.h
index 0555ef6728..0555ef6728 100644
--- a/src/or/rend_encoded_v2_service_descriptor_st.h
+++ b/src/feature/rend/rend_encoded_v2_service_descriptor_st.h
diff --git a/src/or/rend_intro_point_st.h b/src/feature/rend/rend_intro_point_st.h
index 89fe5ef2b3..89fe5ef2b3 100644
--- a/src/or/rend_intro_point_st.h
+++ b/src/feature/rend/rend_intro_point_st.h
diff --git a/src/or/rend_service_descriptor_st.h b/src/feature/rend/rend_service_descriptor_st.h
index 8ea8a62305..8ea8a62305 100644
--- a/src/or/rend_service_descriptor_st.h
+++ b/src/feature/rend/rend_service_descriptor_st.h
diff --git a/src/or/rendcache.c b/src/feature/rend/rendcache.c
index c18920154e..c18920154e 100644
--- a/src/or/rendcache.c
+++ b/src/feature/rend/rendcache.c
diff --git a/src/or/rendcache.h b/src/feature/rend/rendcache.h
index bb075409ec..bb075409ec 100644
--- a/src/or/rendcache.h
+++ b/src/feature/rend/rendcache.h
diff --git a/src/or/rendclient.c b/src/feature/rend/rendclient.c
index d4262f2f38..d4262f2f38 100644
--- a/src/or/rendclient.c
+++ b/src/feature/rend/rendclient.c
diff --git a/src/or/rendclient.h b/src/feature/rend/rendclient.h
index 77395d6cb8..77395d6cb8 100644
--- a/src/or/rendclient.h
+++ b/src/feature/rend/rendclient.h
diff --git a/src/or/rendcommon.c b/src/feature/rend/rendcommon.c
index 928dda0128..928dda0128 100644
--- a/src/or/rendcommon.c
+++ b/src/feature/rend/rendcommon.c
diff --git a/src/or/rendcommon.h b/src/feature/rend/rendcommon.h
index 4ea35f88c2..4ea35f88c2 100644
--- a/src/or/rendcommon.h
+++ b/src/feature/rend/rendcommon.h
diff --git a/src/or/rendmid.c b/src/feature/rend/rendmid.c
index 38c1c52e43..38c1c52e43 100644
--- a/src/or/rendmid.c
+++ b/src/feature/rend/rendmid.c
diff --git a/src/or/rendmid.h b/src/feature/rend/rendmid.h
index 907a0c6a73..907a0c6a73 100644
--- a/src/or/rendmid.h
+++ b/src/feature/rend/rendmid.h
diff --git a/src/or/rendservice.c b/src/feature/rend/rendservice.c
index 8e094b593c..8e094b593c 100644
--- a/src/or/rendservice.c
+++ b/src/feature/rend/rendservice.c
diff --git a/src/or/rendservice.h b/src/feature/rend/rendservice.h
index 35962df7f3..35962df7f3 100644
--- a/src/or/rendservice.h
+++ b/src/feature/rend/rendservice.h
diff --git a/src/or/geoip.c b/src/feature/stats/geoip.c
index 3e6f20ea3f..3e6f20ea3f 100644
--- a/src/or/geoip.c
+++ b/src/feature/stats/geoip.c
diff --git a/src/or/geoip.h b/src/feature/stats/geoip.h
index fd19b7560a..fd19b7560a 100644
--- a/src/or/geoip.h
+++ b/src/feature/stats/geoip.h
diff --git a/src/or/rephist.c b/src/feature/stats/rephist.c
index 6607c25964..6607c25964 100644
--- a/src/or/rephist.c
+++ b/src/feature/stats/rephist.c
diff --git a/src/or/rephist.h b/src/feature/stats/rephist.h
index 06a5e48211..06a5e48211 100644
--- a/src/or/rephist.h
+++ b/src/feature/stats/rephist.h
diff --git a/src/or/Makefile.nmake b/src/or/Makefile.nmake
deleted file mode 100644
index 429ae67858..0000000000
--- a/src/or/Makefile.nmake
+++ /dev/null
@@ -1,79 +0,0 @@
-all: tor.exe
-
-CFLAGS = /O2 /MT /I ..\win32 /I ..\..\..\build-alpha\include /I ..\common \
-    /I ..\ext
-
-LIBS = ..\..\..\build-alpha\lib\libevent.lib \
- ..\..\..\build-alpha\lib\libcrypto.lib \
- ..\..\..\build-alpha\lib\libssl.lib \
- ..\..\..\build-alpha\lib\libz.lib \
- ws2_32.lib advapi32.lib shell32.lib \
- crypt32.lib gdi32.lib user32.lib
-
-LIBTOR_OBJECTS = \
-  addressmap.obj \
-  buffers.obj \
-  channel.obj \
-  channelpadding.obj \
-  channeltls.obj \
-  circpathbias.obj \
-  circuitbuild.obj \
-  circuitlist.obj \
-  circuitmux.obj \
-  circuitmux_ewma.obj \
-  circuitstats.obj \
-  circuituse.obj \
-  command.obj \
-  config.obj \
-  config_codedigest.obj \
-  confparse.obj \
-  connection.obj \
-  connection_edge.obj \
-  connection_or.obj \
-  control.obj \
-  cpuworker.obj \
-  directory.obj \
-  dirserv.obj \
-  dirvote.obj \
-  dns.obj \
-  dnsserv.obj \
-  ext_orport.obj \
-  fp_pair.obj \
-  entrynodes.obj \
-  geoip.obj \
-  hibernate.obj \
-  main.obj \
-  microdesc.obj \
-  networkstatus.obj \
-  nodelist.obj \
-  ntmain.obj \
-  onion.obj \
-  onion_fast.obj \
-  onion_ntor.obj \
-  onion_tap.obj \
-  policies.obj \
-  reasons.obj \
-  relay.obj \
-  rendclient.obj \
-  rendcommon.obj \
-  rendmid.obj \
-  rendservice.obj \
-  rephist.obj \
-  replaycache.obj \
-  router.obj \
-  routerlist.obj \
-  routerparse.obj \
-  routerset.obj \
-  scheduler.obj \
-  statefile.obj \
-  status.obj \
-  transports.obj
-
-libtor.lib: $(LIBTOR_OBJECTS)
-	lib $(LIBTOR_OBJECTS) /out:$@
-
-tor.exe: libtor.lib tor_main.obj
-	$(CC) $(CFLAGS) $(LIBS) libtor.lib ..\common\*.lib ..\ext\*.lib tor_main.obj /Fe$@
-
-clean:
-	del $(LIBTOR_OBJECTS) tor_main.obj *.lib tor.exe