diff --git a/bitcoin/base58.c b/bitcoin/base58.c
index a3da473a9..f0dc2a78d 100644
--- a/bitcoin/base58.c
+++ b/bitcoin/base58.c
@@ -6,9 +6,6 @@
 #include "config.h"
 #include <bitcoin/address.h>
 #include <bitcoin/base58.h>
-#include <bitcoin/privkey.h>
-#include <bitcoin/pubkey.h>
-#include <bitcoin/shadouble.h>
 #include <common/utils.h>
 #include <wally_core.h>
 
diff --git a/bitcoin/block.c b/bitcoin/block.c
index 53fc6d9d7..5a36a7dfc 100644
--- a/bitcoin/block.c
+++ b/bitcoin/block.c
@@ -1,7 +1,6 @@
 #include "config.h"
 #include <assert.h>
 #include <bitcoin/block.h>
-#include <bitcoin/chainparams.h>
 #include <bitcoin/tx.h>
 #include <ccan/mem/mem.h>
 #include <ccan/str/hex/hex.h>
diff --git a/bitcoin/chainparams.c b/bitcoin/chainparams.c
index 572f8b167..9d2883ba1 100644
--- a/bitcoin/chainparams.c
+++ b/bitcoin/chainparams.c
@@ -3,7 +3,6 @@
 #include <bitcoin/chainparams.h>
 #include <ccan/array_size/array_size.h>
 #include <ccan/tal/str/str.h>
-#include <common/utils.h>
 
 /* Version codes for BIP32 extended keys in libwally-core.
  * Stolen from wally_bip32.h in libwally-core*/
diff --git a/bitcoin/locktime.c b/bitcoin/locktime.c
index f73559dc1..d45e8caea 100644
--- a/bitcoin/locktime.c
+++ b/bitcoin/locktime.c
@@ -1,7 +1,6 @@
 #include "config.h"
 #include <assert.h>
 #include <bitcoin/locktime.h>
-#include <ccan/tal/str/str.h>
 
 #define SECONDS_POINT 500000000
 
diff --git a/bitcoin/psbt.c b/bitcoin/psbt.c
index dff12b040..ea4a6c2f3 100644
--- a/bitcoin/psbt.c
+++ b/bitcoin/psbt.c
@@ -1,13 +1,10 @@
 #include "config.h"
 #include <assert.h>
-#include <bitcoin/chainparams.h>
 #include <bitcoin/psbt.h>
 #include <bitcoin/pubkey.h>
 #include <bitcoin/script.h>
-#include <bitcoin/varint.h>
 #include <ccan/ccan/array_size/array_size.h>
 #include <ccan/ccan/mem/mem.h>
-#include <ccan/tal/str/str.h>
 #include <common/utils.h>
 #include <wally_psbt.h>
 #include <wire/wire.h>
diff --git a/bitcoin/script.c b/bitcoin/script.c
index 71e0dd075..73367f5bc 100644
--- a/bitcoin/script.c
+++ b/bitcoin/script.c
@@ -5,7 +5,6 @@
 #include <bitcoin/preimage.h>
 #include <bitcoin/pubkey.h>
 #include <bitcoin/script.h>
-#include <ccan/endian/endian.h>
 #include <ccan/mem/mem.h>
 #include <common/utils.h>
 #include <sodium/randombytes.h>
diff --git a/bitcoin/signature.c b/bitcoin/signature.c
index 82215cf2c..5ae7bd555 100644
--- a/bitcoin/signature.c
+++ b/bitcoin/signature.c
@@ -3,8 +3,6 @@
 #include <bitcoin/privkey.h>
 #include <bitcoin/psbt.h>
 #include <bitcoin/pubkey.h>
-#include <bitcoin/script.h>
-#include <bitcoin/shadouble.h>
 #include <bitcoin/signature.h>
 #include <bitcoin/tx.h>
 #include <ccan/mem/mem.h>
diff --git a/channeld/channeld.c b/channeld/channeld.c
index dc8bdf24b..6489ba7c6 100644
--- a/channeld/channeld.c
+++ b/channeld/channeld.c
@@ -19,14 +19,10 @@
 #include <channeld/channeld.h>
 #include <channeld/channeld_wiregen.h>
 #include <channeld/full_channel.h>
-#include <channeld/inflight.h>
 #include <channeld/splice.h>
 #include <channeld/watchtower.h>
 #include <common/billboard.h>
 #include <common/ecdh_hsmd.h>
-#include <common/gossip_store.h>
-#include <common/hsm_capable.h>
-#include <common/hsm_version.h>
 #include <common/interactivetx.h>
 #include <common/key_derive.h>
 #include <common/memleak.h>
@@ -48,10 +44,6 @@
 #include <fcntl.h>
 #include <hsmd/hsmd_wiregen.h>
 #include <inttypes.h>
-#include <stdio.h>
-#include <wally_bip32.h>
-#include <wire/peer_wire.h>
-#include <wire/tlvstream.h>
 #include <wire/wire_sync.h>
 
 /* stdin == requests, 3 == peer, 4 = HSM */
diff --git a/channeld/inflight.c b/channeld/inflight.c
index db84e5819..475e6698f 100644
--- a/channeld/inflight.c
+++ b/channeld/inflight.c
@@ -1,5 +1,4 @@
 #include "config.h"
-#include <assert.h>
 #include <bitcoin/psbt.h>
 #include <bitcoin/short_channel_id.h>
 #include <channeld/inflight.h>
diff --git a/channeld/splice.c b/channeld/splice.c
index e72b4af54..6ebc73df1 100644
--- a/channeld/splice.c
+++ b/channeld/splice.c
@@ -1,5 +1,4 @@
 #include "config.h"
-#include <ccan/tal/tal.h>
 #include <channeld/splice.h>
 
 struct splice_state *splice_state_new(const tal_t *ctx)
diff --git a/channeld/watchtower.c b/channeld/watchtower.c
index 43a267e84..285cdc460 100644
--- a/channeld/watchtower.c
+++ b/channeld/watchtower.c
@@ -3,13 +3,11 @@
 #include <bitcoin/script.h>
 #include <channeld/channeld.h>
 #include <channeld/watchtower.h>
-#include <common/features.h>
 #include <common/htlc_tx.h>
 #include <common/keyset.h>
 #include <common/psbt_keypath.h>
 #include <common/status.h>
 #include <hsmd/hsmd_wiregen.h>
-#include <wire/wire_sync.h>
 
 static const u8 ONE = 0x1;
 
diff --git a/cli/config_cli.h b/cli/config_cli.h
index 5b0dcfd6c..7d1e9cc34 100644
--- a/cli/config_cli.h
+++ b/cli/config_cli.h
@@ -2,6 +2,7 @@
 #define LIGHTNING_CLI_CONFIG_CLI_H
 
 #include "config.h"
+#include <unistd.h>
 
 #ifndef CLN_TEST
 /* Redefinition procedure is a very cool feature, but
diff --git a/cli/lightning-cli.c b/cli/lightning-cli.c
index 8ebc25409..3aed5362a 100644
--- a/cli/lightning-cli.c
+++ b/cli/lightning-cli.c
@@ -13,15 +13,12 @@
 #include <common/configdir.h>
 #include <common/json_command.h>
 #include <common/node_id.h>
-#include <common/status_levels.h>
 #include <common/utils.h>
-#include <common/version.h>
 #include <libgen.h>
 #include <stdio.h>
 #include <sys/socket.h>
 #include <sys/un.h>
 #include <sys/wait.h>
-#include <unistd.h>
 
 #define NO_ERROR 0
 #define ERROR_FROM_LIGHTNINGD 1
diff --git a/closingd/closingd.c b/closingd/closingd.c
index 5cf5f5b59..a42bcf3f9 100644
--- a/closingd/closingd.c
+++ b/closingd/closingd.c
@@ -1,13 +1,10 @@
 #include "config.h"
 #include <bitcoin/script.h>
 #include <ccan/cast/cast.h>
-#include <ccan/fdpass/fdpass.h>
 #include <ccan/tal/str/str.h>
 #include <closingd/closingd_wiregen.h>
 #include <common/close_tx.h>
 #include <common/closing_fee.h>
-#include <common/derive_basepoints.h>
-#include <common/htlc.h>
 #include <common/memleak.h>
 #include <common/peer_billboard.h>
 #include <common/peer_failed.h>
@@ -17,14 +14,11 @@
 #include <common/status.h>
 #include <common/subdaemon.h>
 #include <common/utils.h>
-#include <common/version.h>
-#include <common/wire_error.h>
 #include <errno.h>
 #include <hsmd/hsmd_wiregen.h>
 #include <inttypes.h>
 #include <stdio.h>
 #include <unistd.h>
-#include <wally_bip32.h>
 #include <wire/peer_wire.h>
 #include <wire/wire_sync.h>
 
diff --git a/common/blindedpath.c b/common/blindedpath.c
index 0923c40b3..5d26c931c 100644
--- a/common/blindedpath.c
+++ b/common/blindedpath.c
@@ -1,7 +1,5 @@
 #include "config.h"
-#include <bitcoin/privkey.h>
 #include <bitcoin/tx.h>
-#include <ccan/cast/cast.h>
 #include <common/blindedpath.h>
 #include <common/blinding.h>
 #include <common/bolt11.h>
diff --git a/common/blindedpay.c b/common/blindedpay.c
index 1dc6f744a..4d8c3c870 100644
--- a/common/blindedpay.c
+++ b/common/blindedpay.c
@@ -1,7 +1,6 @@
 #include "config.h"
 #include <assert.h>
 #include <common/blindedpay.h>
-#include <common/bolt12.h>
 #include <common/onion_encode.h>
 #include <wire/onion_wiregen.h>
 
diff --git a/common/bolt11.c b/common/bolt11.c
index bd51fb3df..7698f497b 100644
--- a/common/bolt11.c
+++ b/common/bolt11.c
@@ -1,5 +1,4 @@
 #include "config.h"
-#include <assert.h>
 #include <bitcoin/address.h>
 #include <bitcoin/script.h>
 #include <ccan/array_size/array_size.h>
diff --git a/common/bolt11_json.c b/common/bolt11_json.c
index c2e7f225d..bdc91c124 100644
--- a/common/bolt11_json.c
+++ b/common/bolt11_json.c
@@ -1,6 +1,4 @@
 #include "config.h"
-#include <bitcoin/address.h>
-#include <bitcoin/base58.h>
 #include <bitcoin/script.h>
 #include <ccan/tal/str/str.h>
 #include <common/addr.h>
diff --git a/common/bolt12.c b/common/bolt12.c
index 8716807a9..1435b35d8 100644
--- a/common/bolt12.c
+++ b/common/bolt12.c
@@ -1,19 +1,14 @@
 #include "config.h"
-#include <assert.h>
 #include <bitcoin/chainparams.h>
 #include <ccan/tal/str/str.h>
-#include <ccan/time/time.h>
 #include <common/bech32_util.h>
 #include <common/bolt12.h>
 #include <common/bolt12_merkle.h>
-#include <common/configdir.h>
 #include <common/features.h>
 #include <common/overflows.h>
 #include <common/utils.h>
 #include <inttypes.h>
-#include <secp256k1_schnorrsig.h>
 #include <time.h>
-#include <wire/onion_wiregen.h>
 
 /* If chains is NULL, max_num_chains is ignored */
 bool bolt12_chains_match(const struct bitcoin_blkid *chains,
diff --git a/common/bolt12_id.c b/common/bolt12_id.c
index 3348b995a..7665229cb 100644
--- a/common/bolt12_id.c
+++ b/common/bolt12_id.c
@@ -1,6 +1,5 @@
 #include "config.h"
 #include <bitcoin/privkey.h>
-#include <ccan/crypto/sha256/sha256.h>
 #include <common/bolt12_id.h>
 #include <common/utils.h>
 
diff --git a/common/bolt12_merkle.c b/common/bolt12_merkle.c
index 7f4e18580..dadd6decc 100644
--- a/common/bolt12_merkle.c
+++ b/common/bolt12_merkle.c
@@ -3,7 +3,6 @@
 #include <bitcoin/tx.h>
 #include <ccan/cast/cast.h>
 #include <ccan/ilog/ilog.h>
-#include <ccan/mem/mem.h>
 #include <common/bolt12_merkle.h>
 #include <common/utils.h>
 
diff --git a/common/close_tx.c b/common/close_tx.c
index e4ec99899..ee549131e 100644
--- a/common/close_tx.c
+++ b/common/close_tx.c
@@ -4,7 +4,6 @@
 #include <common/close_tx.h>
 #include <common/permute_tx.h>
 #include <common/psbt_keypath.h>
-#include <common/utils.h>
 
 struct bitcoin_tx *create_close_tx(const tal_t *ctx,
 				   const struct chainparams *chainparams,
diff --git a/common/codex32.c b/common/codex32.c
index 6ccb0c495..39c9cc095 100644
--- a/common/codex32.c
+++ b/common/codex32.c
@@ -22,22 +22,11 @@
  */
 #include "config.h"
 #include <assert.h>
-#include <bitcoin/chainparams.h>
 #include <ccan/array_size/array_size.h>
-#include <ccan/mem/mem.h>
 #include <ccan/tal/str/str.h>
 #include <common/bech32.h>
-#include <common/bech32_util.h>
-#include <common/bolt12.h>
-#include <common/bolt12_merkle.h>
 #include <common/codex32.h>
-#include <common/configdir.h>
-#include <common/features.h>
 #include <common/utils.h>
-#include <math.h>
-#include <secp256k1_schnorrsig.h>
-#include <string.h>
-#include <time.h>
 
 struct checksum_engine {
 	u8 generator[15];
diff --git a/common/configdir.c b/common/configdir.c
index 248c8e73e..b4e401a11 100644
--- a/common/configdir.c
+++ b/common/configdir.c
@@ -1,7 +1,6 @@
 #include "config.h"
 #include <assert.h>
 #include <bitcoin/chainparams.h>
-#include <ccan/cast/cast.h>
 #include <ccan/err/err.h>
 #include <ccan/opt/opt.h>
 #include <ccan/opt/private.h>
diff --git a/common/configvar.c b/common/configvar.c
index 4a3dff39d..1148f984b 100644
--- a/common/configvar.c
+++ b/common/configvar.c
@@ -4,7 +4,6 @@
 #include <ccan/tal/str/str.h>
 #include <common/configvar.h>
 #include <common/utils.h>
-#include <unistd.h>
 
 struct configvar *configvar_new(const tal_t *ctx,
 				enum configvar_src src,
diff --git a/common/deprecation.c b/common/deprecation.c
index 6adabb7fa..3666e2010 100644
--- a/common/deprecation.c
+++ b/common/deprecation.c
@@ -1,9 +1,7 @@
 #include "config.h"
 #include <assert.h>
-#include <ccan/str/str.h>
 #include <ccan/tal/tal.h>
 #include <common/deprecation.h>
-#include <stdlib.h>
 
 #define MONTH_VAL (10)
 #define YEAR_VAL (12 * MONTH_VAL)
diff --git a/common/dev_disconnect.c b/common/dev_disconnect.c
index 2feaf9278..039897cd8 100644
--- a/common/dev_disconnect.c
+++ b/common/dev_disconnect.c
@@ -1,12 +1,9 @@
 #include "config.h"
-#include <ccan/closefrom/closefrom.h>
 #include <ccan/err/err.h>
 #include <common/dev_disconnect.h>
 #include <common/status.h>
 #include <netinet/in.h>
 #include <netinet/tcp.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
 #include <unistd.h>
 #include <wire/peer_wire.h>
 
diff --git a/common/gossip_store.c b/common/gossip_store.c
index 10f4dabe4..3f10dd82b 100644
--- a/common/gossip_store.c
+++ b/common/gossip_store.c
@@ -1,14 +1,7 @@
 #include "config.h"
-#include <ccan/crc32c/crc32c.h>
 #include <common/gossip_store.h>
-#include <common/per_peer_state.h>
-#include <common/status.h>
-#include <errno.h>
-#include <fcntl.h>
 #include <gossipd/gossip_store_wiregen.h>
-#include <inttypes.h>
 #include <unistd.h>
-#include <wire/peer_wire.h>
 
 /* We cheat and read first two bytes of message too. */
 struct hdr_and_type {
diff --git a/common/gossmap.c b/common/gossmap.c
index a21a666f9..948ed0b9c 100644
--- a/common/gossmap.c
+++ b/common/gossmap.c
@@ -1,7 +1,5 @@
 #include "config.h"
-#include <assert.h>
 #include <ccan/crc32c/crc32c.h>
-#include <ccan/crypto/siphash24/siphash24.h>
 #include <ccan/err/err.h>
 #include <ccan/htable/htable_type.h>
 #include <ccan/ptrint/ptrint.h>
@@ -9,7 +7,6 @@
 #include <common/features.h>
 #include <common/gossip_store.h>
 #include <common/gossmap.h>
-#include <common/pseudorand.h>
 #include <common/sciddir_or_pubkey.h>
 #include <common/utils.h>
 #include <errno.h>
diff --git a/common/gossmods_listpeerchannels.c b/common/gossmods_listpeerchannels.c
index 59754d75c..256bc3090 100644
--- a/common/gossmods_listpeerchannels.c
+++ b/common/gossmods_listpeerchannels.c
@@ -2,7 +2,6 @@
 #include <ccan/err/err.h>
 #include <common/gossmap.h>
 #include <common/gossmods_listpeerchannels.h>
-#include <common/node_id.h>
 #include <plugins/libplugin.h>
 
 void gossmod_add_localchan(struct gossmap_localmods *mods,
diff --git a/common/hsm_encryption.c b/common/hsm_encryption.c
index c8f316a31..3486773dd 100644
--- a/common/hsm_encryption.c
+++ b/common/hsm_encryption.c
@@ -1,8 +1,6 @@
 #include "config.h"
-#include <ccan/tal/str/str.h>
 #include <common/errcode.h>
 #include <common/hsm_encryption.h>
-#include <errno.h>
 #include <sys/stat.h>
 #include <termios.h>
 #include <unistd.h>
diff --git a/common/htlc_wire.c b/common/htlc_wire.c
index 3d94471ad..5ccd75795 100644
--- a/common/htlc_wire.c
+++ b/common/htlc_wire.c
@@ -5,7 +5,6 @@
 #include <common/htlc_wire.h>
 #include <common/onionreply.h>
 #include <common/utils.h>
-#include <wire/tlvstream.h>
 
 static struct failed_htlc *failed_htlc_dup(const tal_t *ctx,
 					   const struct failed_htlc *f TAKES)
diff --git a/common/interactivetx.c b/common/interactivetx.c
index 2e9a659ae..87473aeee 100644
--- a/common/interactivetx.c
+++ b/common/interactivetx.c
@@ -1,26 +1,13 @@
 #include "config.h"
-#include <bitcoin/chainparams.h>
 #include <bitcoin/psbt.h>
 #include <bitcoin/script.h>
-#include <ccan/array_size/array_size.h>
 #include <ccan/cast/cast.h>
-#include <ccan/mem/mem.h>
 #include <ccan/tal/str/str.h>
-#include <common/billboard.h>
-#include <common/blockheight_states.h>
-#include <common/gossip_store.h>
-#include <common/initial_channel.h>
 #include <common/interactivetx.h>
 #include <common/lease_rates.h>
-#include <common/memleak.h>
-#include <common/peer_billboard.h>
-#include <common/peer_failed.h>
 #include <common/peer_io.h>
-#include <common/psbt_internal.h>
 #include <common/psbt_open.h>
-#include <common/setup.h>
 #include <common/status.h>
-#include <common/subdaemon.h>
 #include <common/utils.h>
 #include <common/wire_error.h>
 #include <inttypes.h>
diff --git a/common/json_blinded_path.c b/common/json_blinded_path.c
index 2df745e1d..bac2be422 100644
--- a/common/json_blinded_path.c
+++ b/common/json_blinded_path.c
@@ -1,5 +1,4 @@
 #include "config.h"
-#include <bitcoin/pubkey.h>
 #include <common/json_blinded_path.h>
 #include <common/json_parse.h>
 #include <common/utils.h>
diff --git a/common/json_channel_type.c b/common/json_channel_type.c
index bb175e8f6..91c618113 100644
--- a/common/json_channel_type.c
+++ b/common/json_channel_type.c
@@ -2,7 +2,6 @@
 #include <common/channel_type.h>
 #include <common/json_channel_type.h>
 #include <common/json_command.h>
-#include <common/json_param.h>
 #include <common/json_stream.h>
 
 struct command_result *param_channel_type(struct command *cmd,
diff --git a/common/json_param.c b/common/json_param.c
index 9323b0385..1b5297070 100644
--- a/common/json_param.c
+++ b/common/json_param.c
@@ -1,7 +1,6 @@
 #include "config.h"
 #include <bitcoin/address.h>
 #include <bitcoin/base58.h>
-#include <bitcoin/feerate.h>
 #include <bitcoin/psbt.h>
 #include <bitcoin/script.h>
 #include <ccan/asort/asort.h>
@@ -10,7 +9,6 @@
 #include <ccan/str/hex/hex.h>
 #include <ccan/tal/str/str.h>
 #include <common/bech32.h>
-#include <common/configdir.h>
 #include <common/json_command.h>
 #include <common/json_param.h>
 #include <common/route.h>
diff --git a/common/json_parse.c b/common/json_parse.c
index 2e4bc9ef1..dc491b2a0 100644
--- a/common/json_parse.c
+++ b/common/json_parse.c
@@ -4,22 +4,14 @@
 #include <bitcoin/preimage.h>
 #include <bitcoin/privkey.h>
 #include <bitcoin/psbt.h>
-#include <bitcoin/pubkey.h>
-#include <bitcoin/tx.h>
-#include <ccan/json_escape/json_escape.h>
 #include <ccan/mem/mem.h>
 #include <ccan/str/hex/hex.h>
 #include <ccan/tal/str/str.h>
-#include <ccan/time/time.h>
-#include <common/amount.h>
-#include <common/channel_id.h>
 #include <common/json_parse.h>
 #include <common/node_id.h>
 #include <common/overflows.h>
 #include <common/utils.h>
 #include <errno.h>
-#include <inttypes.h>
-#include <stdio.h>
 
 bool json_to_millionths(const char *buffer, const jsmntok_t *tok,
 			u64 *millionths)
diff --git a/common/json_parse_simple.c b/common/json_parse_simple.c
index 521b73723..f3b3da808 100644
--- a/common/json_parse_simple.c
+++ b/common/json_parse_simple.c
@@ -6,8 +6,6 @@
 #include <common/json_parse_simple.h>
 #include <common/utils.h>
 #include <errno.h>
-#include <inttypes.h>
-#include <stdio.h>
 
 const char *json_tok_full(const char *buffer, const jsmntok_t *t)
 {
diff --git a/common/json_stream.c b/common/json_stream.c
index 7d1cc92cb..582e5e7e3 100644
--- a/common/json_stream.c
+++ b/common/json_stream.c
@@ -1,25 +1,15 @@
 #include "config.h"
 #include <arpa/inet.h>
-#include <bitcoin/preimage.h>
-#include <bitcoin/privkey.h>
 #include <bitcoin/psbt.h>
 #include <bitcoin/signature.h>
-#include <bitcoin/tx.h>
 #include <ccan/io/io.h>
   /* To reach into io_plan: not a public header! */
   #include <ccan/io/backend.h>
 #include <ccan/json_escape/json_escape.h>
 #include <ccan/json_out/json_out.h>
 #include <ccan/str/hex/hex.h>
-#include <ccan/strmap/strmap.h>
-#include <ccan/tal/str/str.h>
-#include <common/channel_id.h>
-#include <common/configdir.h>
 #include <common/json_filter.h>
-#include <common/json_parse.h>
 #include <common/json_stream.h>
-#include <common/node_id.h>
-#include <common/wireaddr.h>
 #include <inttypes.h>
 #include <stdio.h>
 #include <wire/peer_wire.h>
diff --git a/common/key_derive.c b/common/key_derive.c
index 07c74614e..cc2a91326 100644
--- a/common/key_derive.c
+++ b/common/key_derive.c
@@ -3,7 +3,6 @@
 #include <bitcoin/pubkey.h>
 #include <common/key_derive.h>
 #include <common/utils.h>
-#include <wally_bip32.h>
 
 /* BOLT #3:
  *
diff --git a/common/msg_queue.c b/common/msg_queue.c
index ba702f373..566bb3bff 100644
--- a/common/msg_queue.c
+++ b/common/msg_queue.c
@@ -1,10 +1,7 @@
 #include "config.h"
-#include <assert.h>
-#include <ccan/cast/cast.h>
 #include <ccan/membuf/membuf.h>
 #include <common/daemon.h>
 #include <common/msg_queue.h>
-#include <common/utils.h>
 #include <wire/wire.h>
 
 static bool warned_once;
diff --git a/common/onion_decode.c b/common/onion_decode.c
index e82b8a956..285c634c3 100644
--- a/common/onion_decode.c
+++ b/common/onion_decode.c
@@ -1,7 +1,4 @@
 #include "config.h"
-#include <assert.h>
-#include <ccan/array_size/array_size.h>
-#include <ccan/cast/cast.h>
 #include <ccan/mem/mem.h>
 #include <ccan/tal/str/str.h>
 #include <common/blindedpath.h>
@@ -10,7 +7,6 @@
 #include <common/sphinx.h>
 #include <common/utils.h>
 #include <inttypes.h>
-#include <sodium/crypto_aead_chacha20poly1305.h>
 
 /* BOLT #4:
  * - If `encrypted_recipient_data` is present:
diff --git a/common/onion_encode.c b/common/onion_encode.c
index e5ff5d997..2b817e184 100644
--- a/common/onion_encode.c
+++ b/common/onion_encode.c
@@ -1,14 +1,9 @@
 #include "config.h"
 #include <assert.h>
-#include <ccan/array_size/array_size.h>
 #include <ccan/cast/cast.h>
-#include <ccan/mem/mem.h>
-#include <common/blindedpath.h>
-#include <common/ecdh.h>
 #include <common/onion_encode.h>
 #include <common/sphinx.h>
 #include <common/utils.h>
-#include <sodium/crypto_aead_chacha20poly1305.h>
 
 /* BOLT #4:
  *
diff --git a/common/onion_message.c b/common/onion_message.c
index e887d42aa..34faf004c 100644
--- a/common/onion_message.c
+++ b/common/onion_message.c
@@ -1,13 +1,11 @@
 #include "config.h"
 #include <assert.h>
-#include <bitcoin/pubkey.h>
 #include <ccan/array_size/array_size.h>
 #include <ccan/cast/cast.h>
 #include <common/blindedpath.h>
 #include <common/onion_message.h>
 #include <common/sphinx.h>
 #include <sodium.h>
-#include <wire/onion_wiregen.h>
 
 struct tlv_encrypted_data_tlv **new_encdata_tlvs(const tal_t *ctx,
 						 const struct pubkey *ids,
diff --git a/common/onion_message_parse.c b/common/onion_message_parse.c
index c2184dbd7..8668c85d9 100644
--- a/common/onion_message_parse.c
+++ b/common/onion_message_parse.c
@@ -6,9 +6,7 @@
 #include <common/ecdh.h>
 #include <common/onion_message_parse.h>
 #include <common/sphinx.h>
-#include <common/status.h>
 #include <common/utils.h>
-#include <wire/onion_wiregen.h>
 #include <wire/peer_wire.h>
 
 static bool decrypt_final_onionmsg(const tal_t *ctx,
diff --git a/common/onionreply.c b/common/onionreply.c
index 6a6e58ff9..74a20a57c 100644
--- a/common/onionreply.c
+++ b/common/onionreply.c
@@ -1,7 +1,6 @@
 #include "config.h"
 #include <ccan/cast/cast.h>
 #include <common/onionreply.h>
-#include <common/utils.h>
 #include <wire/wire.h>
 
 void towire_onionreply(u8 **cursor, const struct onionreply *r)
diff --git a/common/peer_io.c b/common/peer_io.c
index 3f090a834..79812b77f 100644
--- a/common/peer_io.c
+++ b/common/peer_io.c
@@ -1,17 +1,9 @@
 #include "config.h"
-#include <ccan/read_write_all/read_write_all.h>
 #include <common/cryptomsg.h>
 #include <common/peer_failed.h>
 #include <common/peer_io.h>
 #include <common/per_peer_state.h>
 #include <common/status.h>
-#include <errno.h>
-#include <inttypes.h>
-#include <netinet/in.h>
-#include <netinet/tcp.h>
-#include <sys/socket.h>
-#include <wire/wire.h>
-#include <wire/wire_io.h>
 #include <wire/wire_sync.h>
 
 void peer_write(struct per_peer_state *pps, const void *msg TAKES)
diff --git a/common/per_peer_state.c b/common/per_peer_state.c
index 981e06c07..ee93565cd 100644
--- a/common/per_peer_state.c
+++ b/common/per_peer_state.c
@@ -1,10 +1,8 @@
 #include "config.h"
 #include <assert.h>
 #include <ccan/fdpass/fdpass.h>
-#include <common/gossip_constants.h>
 #include <common/per_peer_state.h>
 #include <unistd.h>
-#include <wire/wire.h>
 
 bool dev_fast_gossip = false;
 
diff --git a/common/ping.c b/common/ping.c
index cfba85f03..4c98f095e 100644
--- a/common/ping.c
+++ b/common/ping.c
@@ -1,7 +1,5 @@
 #include "config.h"
 #include <common/ping.h>
-#include <common/status.h>
-#include <common/version.h>
 #include <wire/peer_wire.h>
 
 bool check_ping_make_pong(const tal_t *ctx, const u8 *ping, u8 **pong)
diff --git a/common/psbt_internal.c b/common/psbt_internal.c
index 55c50e54a..22d468524 100644
--- a/common/psbt_internal.c
+++ b/common/psbt_internal.c
@@ -2,7 +2,6 @@
 #include <assert.h>
 #include <bitcoin/psbt.h>
 #include <bitcoin/script.h>
-#include <bitcoin/varint.h>
 #include <common/psbt_internal.h>
 #include <common/psbt_open.h>
 #include <common/utils.h>
diff --git a/common/psbt_keypath.c b/common/psbt_keypath.c
index dbc055f6e..dcd89a9ea 100644
--- a/common/psbt_keypath.c
+++ b/common/psbt_keypath.c
@@ -2,7 +2,6 @@
 #include <bitcoin/tx.h>
 #include <common/psbt_keypath.h>
 #include <common/utils.h>
-#include <wally_bip32.h>
 
 void psbt_output_set_keypath(u32 index, const struct ext_key *ext, bool is_taproot, struct wally_psbt_output *output) {
 	u8 fingerprint[BIP32_KEY_FINGERPRINT_LEN];
diff --git a/common/psbt_open.c b/common/psbt_open.c
index d58932250..5cf83b50f 100644
--- a/common/psbt_open.c
+++ b/common/psbt_open.c
@@ -2,8 +2,6 @@
 #include <bitcoin/psbt.h>
 #include <bitcoin/script.h>
 #include <ccan/asort/asort.h>
-#include <ccan/ccan/endian/endian.h>
-#include <ccan/ccan/mem/mem.h>
 #include <common/channel_id.h>
 #include <common/psbt_open.h>
 #include <common/pseudorand.h>
diff --git a/common/pseudorand.c b/common/pseudorand.c
index a9c5dfa82..b29aeee06 100644
--- a/common/pseudorand.c
+++ b/common/pseudorand.c
@@ -2,11 +2,9 @@
 #include <assert.h>
 #include <ccan/crypto/sha256/sha256.h>
 #include <ccan/isaac/isaac64.h>
-#include <ccan/likely/likely.h>
 #include <ccan/tal/tal.h>
 #include <common/pseudorand.h>
 #include <sodium/randombytes.h>
-#include <string.h>
 
 static struct isaac64_ctx isaac64;
 static struct siphash_seed siphashseed;
diff --git a/common/read_peer_msg.c b/common/read_peer_msg.c
index a371cf952..292cc6ecc 100644
--- a/common/read_peer_msg.c
+++ b/common/read_peer_msg.c
@@ -1,17 +1,10 @@
 #include "config.h"
-#include <assert.h>
 #include <bitcoin/chainparams.h>
 #include <common/peer_failed.h>
-#include <common/peer_io.h>
-#include <common/per_peer_state.h>
-#include <common/ping.h>
 #include <common/read_peer_msg.h>
 #include <common/status.h>
 #include <common/utils.h>
 #include <common/wire_error.h>
-#include <errno.h>
-#include <wire/peer_wire.h>
-#include <wire/wire_sync.h>
 
 bool handle_peer_error_or_warning(struct per_peer_state *pps,
 				  const u8 *msg TAKES)
diff --git a/common/route.c b/common/route.c
index b699742ab..534594eab 100644
--- a/common/route.c
+++ b/common/route.c
@@ -1,7 +1,6 @@
 #include "config.h"
 #include <assert.h>
 #include <common/dijkstra.h>
-#include <common/features.h>
 #include <common/gossmap.h>
 #include <common/route.h>
 
diff --git a/common/sphinx.c b/common/sphinx.c
index e44055022..dd405a05f 100644
--- a/common/sphinx.c
+++ b/common/sphinx.c
@@ -3,7 +3,6 @@
 
 #include <ccan/array_size/array_size.h>
 #include <ccan/mem/mem.h>
-#include <common/onion_decode.h>
 #include <common/onionreply.h>
 #include <common/overflows.h>
 #include <common/sphinx.h>
diff --git a/common/splice_script.c b/common/splice_script.c
index fd07c3e22..0affda6ef 100644
--- a/common/splice_script.c
+++ b/common/splice_script.c
@@ -1,16 +1,12 @@
 #include "config.h"
 #include <assert.h>
 #include <bitcoin/base58.h>
-#include <bitcoin/pubkey.h>
 #include <ccan/mem/mem.h>
 #include <ccan/str/hex/hex.h>
 #include <ccan/tal/str/str.h>
-#include <common/amount.h>
 #include <common/bech32.h>
 #include <common/json_parse.h>
-#include <common/json_parse_simple.h>
 #include <common/splice_script.h>
-#include <ctype.h>
 #include <errno.h>
 #include <inttypes.h>
 
diff --git a/common/test/run-bolt12_decode.c b/common/test/run-bolt12_decode.c
index 4702d23f2..6f0fa2a55 100644
--- a/common/test/run-bolt12_decode.c
+++ b/common/test/run-bolt12_decode.c
@@ -5,6 +5,7 @@
 #include "../json_parse.c"
 #include "../json_parse_simple.c"
 #include <ccan/array_size/array_size.h>
+#include <ccan/json_escape/json_escape.h>
 #include <ccan/tal/grab_file/grab_file.h>
 #include <ccan/tal/path/path.h>
 #include <common/setup.h>
diff --git a/common/test/run-codex32.c b/common/test/run-codex32.c
index 2aed32315..3b32582f9 100644
--- a/common/test/run-codex32.c
+++ b/common/test/run-codex32.c
@@ -9,6 +9,7 @@
 #include <ccan/tal/grab_file/grab_file.h>
 #include <ccan/tal/path/path.h>
 #include <common/setup.h>
+#include <wire/wire.h>
 
 /* AUTOGENERATED MOCKS START */
 /* Generated stub for amount_asset_is_main */
diff --git a/common/test/run-json_scan.c b/common/test/run-json_scan.c
index a80dad990..ab3e487ca 100644
--- a/common/test/run-json_scan.c
+++ b/common/test/run-json_scan.c
@@ -3,6 +3,7 @@
 #include "../json_parse_simple.c"
 #include <common/amount.h>
 #include <common/setup.h>
+#include <stdio.h>
 #include <wire/wire.h>
 
 /* AUTOGENERATED MOCKS START */
diff --git a/common/trace.c b/common/trace.c
index a91adf2b3..7ffe7eac1 100644
--- a/common/trace.c
+++ b/common/trace.c
@@ -4,13 +4,9 @@
 #include <ccan/err/err.h>
 #include <ccan/str/hex/hex.h>
 #include <ccan/tal/str/str.h>
-#include <ccan/tal/tal.h>
-#include <ccan/time/time.h>
 #include <common/json_stream.h>
-#include <common/memleak.h>
 #include <common/pseudorand.h>
 #include <common/trace.h>
-#include <fcntl.h>
 #include <inttypes.h>
 #include <stdio.h>
 #include <unistd.h>
diff --git a/common/utxo.c b/common/utxo.c
index 93ec50d3e..ca978c507 100644
--- a/common/utxo.c
+++ b/common/utxo.c
@@ -1,6 +1,5 @@
 #include "config.h"
 #include <common/utxo.h>
-#include <wire/wire.h>
 
 size_t utxo_spend_weight(const struct utxo *utxo, size_t min_witness_weight)
 {
diff --git a/common/version.c b/common/version.c
index 0840968fd..5e762e20b 100644
--- a/common/version.c
+++ b/common/version.c
@@ -1,10 +1,7 @@
 #include "config.h"
-#include <ccan/compiler/compiler.h>
 #include <common/configvar.h>
 #include <common/version.h>
 #include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 
 /* Only common/version.c can safely include this.  */
 # include "version_gen.h"
diff --git a/connectd/connectd.c b/connectd/connectd.c
index 17ec7d3a3..edbd51ade 100644
--- a/connectd/connectd.c
+++ b/connectd/connectd.c
@@ -13,7 +13,6 @@
 #include <ccan/array_size/array_size.h>
 #include <ccan/asort/asort.h>
 #include <ccan/closefrom/closefrom.h>
-#include <ccan/fdpass/fdpass.h>
 #include <ccan/io/backend.h>
 #include <ccan/noerr/noerr.h>
 #include <ccan/tal/str/str.h>
@@ -24,9 +23,7 @@
 #include <common/dev_disconnect.h>
 #include <common/ecdh.h>
 #include <common/ecdh_hsmd.h>
-#include <common/gossip_store.h>
 #include <common/gossmap.h>
-#include <common/jsonrpc_errors.h>
 #include <common/memleak.h>
 #include <common/status.h>
 #include <common/subdaemon.h>
@@ -52,10 +49,8 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <sys/wait.h>
-#include <unistd.h>
 #include <wire/peer_wire.h>
 #include <wire/wire_io.h>
-#include <wire/wire_sync.h>
 
 /*~ We are passed two file descriptors when exec'ed from `lightningd`: the
  * first is a connection to `hsmd`, which we need for the cryptographic
diff --git a/connectd/gossip_rcvd_filter.c b/connectd/gossip_rcvd_filter.c
index c8097a4d6..5f628c176 100644
--- a/connectd/gossip_rcvd_filter.c
+++ b/connectd/gossip_rcvd_filter.c
@@ -1,9 +1,6 @@
 #include "config.h"
-#include <ccan/crypto/siphash24/siphash24.h>
 #include <ccan/htable/htable.h>
 #include <ccan/ptrint/ptrint.h>
-#include <common/memleak.h>
-#include <common/pseudorand.h>
 #include <connectd/gossip_rcvd_filter.h>
 #include <wire/peer_wire.h>
 
diff --git a/connectd/multiplex.c b/connectd/multiplex.c
index 77cdfd50a..b657a693a 100644
--- a/connectd/multiplex.c
+++ b/connectd/multiplex.c
@@ -1,19 +1,12 @@
 /*~ This contains all the code to shuffle data between socket to the peer
  * itself, and the subdaemons. */
 #include "config.h"
-#include <assert.h>
-#include <bitcoin/block.h>
-#include <bitcoin/chainparams.h>
-#include <ccan/io/io.h>
 #include <ccan/tal/str/str.h>
 #include <common/cryptomsg.h>
 #include <common/daemon_conn.h>
 #include <common/dev_disconnect.h>
-#include <common/features.h>
-#include <common/gossip_constants.h>
 #include <common/gossmap.h>
 #include <common/memleak.h>
-#include <common/per_peer_state.h>
 #include <common/ping.h>
 #include <common/status.h>
 #include <common/timeout.h>
@@ -23,22 +16,15 @@
 #include <connectd/connectd_gossipd_wiregen.h>
 #include <connectd/connectd_wiregen.h>
 #include <connectd/gossip_rcvd_filter.h>
-#include <connectd/gossip_store.h>
 #include <connectd/multiplex.h>
 #include <connectd/onion_message.h>
 #include <connectd/queries.h>
 #include <errno.h>
-#include <fcntl.h>
 #include <inttypes.h>
 #include <netinet/in.h>
 #include <netinet/tcp.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
-#include <sys/types.h>
 #include <wire/peer_wire.h>
-#include <wire/wire.h>
 #include <wire/wire_io.h>
-#include <wire/wire_sync.h>
 
 struct subd {
 	/* Owner: we are in peer->subds[] */
diff --git a/connectd/onion_message.c b/connectd/onion_message.c
index 1a9b42b0f..27718b757 100644
--- a/connectd/onion_message.c
+++ b/connectd/onion_message.c
@@ -1,14 +1,8 @@
 /*~ This contains all the code to handle onion messages. */
 #include "config.h"
-#include <ccan/cast/cast.h>
 #include <ccan/tal/str/str.h>
-#include <common/blindedpath.h>
-#include <common/blinding.h>
 #include <common/daemon_conn.h>
-#include <common/ecdh_hsmd.h>
-#include <common/features.h>
 #include <common/onion_message_parse.h>
-#include <common/sphinx.h>
 #include <common/status.h>
 #include <common/utils.h>
 #include <common/wire_error.h>
diff --git a/connectd/peer_exchange_initmsg.c b/connectd/peer_exchange_initmsg.c
index de43633fa..bbcb6b44d 100644
--- a/connectd/peer_exchange_initmsg.c
+++ b/connectd/peer_exchange_initmsg.c
@@ -1,9 +1,7 @@
 #include "config.h"
-#include <bitcoin/chainparams.h>
 #include <ccan/io/io.h>
 #include <common/cryptomsg.h>
 #include <common/dev_disconnect.h>
-#include <common/memleak.h>
 #include <common/status.h>
 #include <common/utils.h>
 #include <common/wire_error.h>
diff --git a/connectd/queries.c b/connectd/queries.c
index 351c46939..59f2bf52f 100644
--- a/connectd/queries.c
+++ b/connectd/queries.c
@@ -1,10 +1,8 @@
 /* Routines to handle gossip query messages */
 #include "config.h"
-#include <bitcoin/chainparams.h>
 #include <ccan/array_size/array_size.h>
 #include <ccan/asort/asort.h>
 #include <ccan/crc32c/crc32c.h>
-#include <common/daemon_conn.h>
 #include <common/decode_array.h>
 #include <common/gossmap.h>
 #include <common/status.h>
diff --git a/connectd/test/run-gossip_rcvd_filter.c b/connectd/test/run-gossip_rcvd_filter.c
index b46dc4c05..301191752 100644
--- a/connectd/test/run-gossip_rcvd_filter.c
+++ b/connectd/test/run-gossip_rcvd_filter.c
@@ -8,12 +8,6 @@
 /* AUTOGENERATED MOCKS START */
 /* AUTOGENERATED MOCKS END */
 
-void memleak_add_helper_(const tal_t *p UNNEEDED,
-			 void (*cb)(struct htable *memtable,
-				    const tal_t *) UNNEEDED)
-{
-}
-
 static u8 *mkgossip(const tal_t *ctx, const char *str)
 {
 	return tal_hexdata(ctx, str, strlen(str));
diff --git a/connectd/websocketd.c b/connectd/websocketd.c
index 782530426..d139199f6 100644
--- a/connectd/websocketd.c
+++ b/connectd/websocketd.c
@@ -8,15 +8,10 @@
 #include <ccan/io/io.h>
 #include <ccan/mem/mem.h>
 #include <ccan/read_write_all/read_write_all.h>
-#include <ccan/str/hex/hex.h>
 #include <ccan/tal/str/str.h>
 #include <common/setup.h>
 #include <common/utils.h>
 #include <connectd/sha1.h>
-#include <poll.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <unistd.h>
 
 /*
       0                   1                   2                   3
diff --git a/db/bindings.c b/db/bindings.c
index ceb251f30..8dac3ea6e 100644
--- a/db/bindings.c
+++ b/db/bindings.c
@@ -2,12 +2,9 @@
 #include <bitcoin/privkey.h>
 #include <bitcoin/psbt.h>
 #include <ccan/mem/mem.h>
-#include <ccan/take/take.h>
 #include <ccan/tal/str/str.h>
-#include <ccan/tal/tal.h>
 #include <common/channel_id.h>
 #include <common/channel_type.h>
-#include <common/htlc_state.h>
 #include <common/node_id.h>
 #include <common/onionreply.h>
 #include <db/bindings.h>
diff --git a/db/db_sqlite3.c b/db/db_sqlite3.c
index c34acc51c..5df248b6f 100644
--- a/db/db_sqlite3.c
+++ b/db/db_sqlite3.c
@@ -1,7 +1,5 @@
 #include "config.h"
 #include <ccan/ccan/tal/str/str.h>
-#include <common/utils.h>
-#include <db/bindings.h>
 #include <db/common.h>
 #include <db/exec.h>
 #include <db/utils.h>
diff --git a/db/exec.c b/db/exec.c
index c6e647182..5ab6e9b04 100644
--- a/db/exec.c
+++ b/db/exec.c
@@ -1,5 +1,4 @@
 #include "config.h"
-#include <ccan/tal/tal.h>
 #include <db/bindings.h>
 #include <db/common.h>
 #include <db/exec.h>
diff --git a/db/utils.c b/db/utils.c
index 3b896f9c7..25bce2f4f 100644
--- a/db/utils.c
+++ b/db/utils.c
@@ -2,7 +2,6 @@
 #include <ccan/strset/strset.h>
 #include <ccan/tal/str/str.h>
 #include <common/trace.h>
-#include <common/utils.h>
 #include <db/common.h>
 #include <db/utils.h>
 
diff --git a/devtools/bip137-verifysignature.c b/devtools/bip137-verifysignature.c
index 48db7b95d..761f6ce63 100644
--- a/devtools/bip137-verifysignature.c
+++ b/devtools/bip137-verifysignature.c
@@ -1,8 +1,5 @@
 #include "config.h"
-#include <assert.h>
-#include <bitcoin/base58.h>
 #include <bitcoin/pubkey.h>
-#include <bitcoin/shadouble.h>
 #include <bitcoin/varint.h>
 #include <ccan/err/err.h>
 #include <common/addr.h>
diff --git a/devtools/bolt12-cli.c b/devtools/bolt12-cli.c
index 0aa6adc85..9d8e0b6e2 100644
--- a/devtools/bolt12-cli.c
+++ b/devtools/bolt12-cli.c
@@ -1,5 +1,4 @@
 #include "config.h"
-#include <bitcoin/chainparams.h>
 #include <bitcoin/tx.h>
 #include <ccan/array_size/array_size.h>
 #include <ccan/err/err.h>
@@ -7,14 +6,12 @@
 #include <ccan/tal/str/str.h>
 #include <common/bech32_util.h>
 #include <common/bolt12_merkle.h>
-#include <common/configdir.h>
 #include <common/features.h>
 #include <common/iso4217.h>
 #include <common/setup.h>
 #include <common/utils.h>
 #include <common/version.h>
 #include <inttypes.h>
-#include <secp256k1_schnorrsig.h>
 #include <stdio.h>
 #include <time.h>
 
diff --git a/devtools/checkchannels.c b/devtools/checkchannels.c
index 235b11096..144646f3a 100644
--- a/devtools/checkchannels.c
+++ b/devtools/checkchannels.c
@@ -5,7 +5,6 @@
 #include <bitcoin/short_channel_id.h>
 #include <ccan/crypto/hkdf_sha256/hkdf_sha256.h>
 #include <ccan/err/err.h>
-#include <ccan/mem/mem.h>
 #include <ccan/opt/opt.h>
 #include <ccan/tal/grab_file/grab_file.h>
 #include <ccan/tal/path/path.h>
diff --git a/devtools/convert-gossmap.c b/devtools/convert-gossmap.c
index 96ea79563..c5ee23c9d 100644
--- a/devtools/convert-gossmap.c
+++ b/devtools/convert-gossmap.c
@@ -1,14 +1,10 @@
 /* Tool we can use to convert our testing gossip_store files */
 #include "config.h"
-#include <ccan/crc32c/crc32c.h>
 #include <ccan/err/err.h>
-#include <ccan/opt/opt.h>
 #include <ccan/read_write_all/read_write_all.h>
 #include <common/gossip_store.h>
 #include <common/utils.h>
-#include <fcntl.h>
 #include <gossipd/gossip_store_wiregen.h>
-#include <stdio.h>
 #include <unistd.h>
 #include <wire/peer_wire.h>
 
diff --git a/devtools/fp16.c b/devtools/fp16.c
index abf1947ed..81791b3ee 100644
--- a/devtools/fp16.c
+++ b/devtools/fp16.c
@@ -1,6 +1,5 @@
 /* Simple tool to convert to/from our internal fp16 representation */
 #include "config.h"
-#include <ccan/err/err.h>
 #include <ccan/opt/opt.h>
 #include <common/fp16.h>
 #include <common/setup.h>
diff --git a/devtools/gossipwith.c b/devtools/gossipwith.c
index 254e61943..a0e55ab99 100644
--- a/devtools/gossipwith.c
+++ b/devtools/gossipwith.c
@@ -1,7 +1,5 @@
 /* Simple tool to route gossip from a peer. */
 #include "config.h"
-#include <bitcoin/block.h>
-#include <bitcoin/chainparams.h>
 #include <ccan/array_size/array_size.h>
 #include <ccan/err/err.h>
 #include <ccan/io/io.h>
@@ -12,14 +10,9 @@
 #include <ccan/time/time.h>
 #include <common/cryptomsg.h>
 #include <common/features.h>
-#include <common/peer_failed.h>
-#include <common/per_peer_state.h>
 #include <common/ping.h>
-#include <common/status.h>
 #include <inttypes.h>
 #include <netdb.h>
-#include <poll.h>
-#include <secp256k1_ecdh.h>
 #include <stdio.h>
 #include <wire/peer_wire.h>
 
diff --git a/devtools/gossmap-compress.c b/devtools/gossmap-compress.c
index 58ef255ac..ac995f911 100644
--- a/devtools/gossmap-compress.c
+++ b/devtools/gossmap-compress.c
@@ -1,15 +1,11 @@
 #include "config.h"
-#include <bitcoin/privkey.h>
-#include <bitcoin/pubkey.h>
 #include <ccan/asort/asort.h>
-#include <ccan/cast/cast.h>
 #include <ccan/crc32c/crc32c.h>
 #include <ccan/err/err.h>
 #include <ccan/mem/mem.h>
 #include <ccan/opt/opt.h>
 #include <ccan/read_write_all/read_write_all.h>
 #include <ccan/tal/str/str.h>
-#include <common/bigsize.h>
 #include <common/gossip_store.h>
 #include <common/gossmap.h>
 #include <common/setup.h>
diff --git a/devtools/mkcommit.c b/devtools/mkcommit.c
index 3cfe80ba2..48494ac79 100644
--- a/devtools/mkcommit.c
+++ b/devtools/mkcommit.c
@@ -9,7 +9,6 @@
    0000000000000000000000000000000000000000000000000000000000000010 FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF 0000000000000000000000000000000000000000000000000000000000000011 0000000000000000000000000000000000000000000000000000000000000012 0000000000000000000000000000000000000000000000000000000000000013 0000000000000000000000000000000000000000000000000000000000000014
  */
 #include "config.h"
-#include <bitcoin/chainparams.h>
 #include <bitcoin/script.h>
 #include <ccan/cast/cast.h>
 #include <ccan/err/err.h>
diff --git a/devtools/onion.c b/devtools/onion.c
index ee2f53138..461494af0 100644
--- a/devtools/onion.c
+++ b/devtools/onion.c
@@ -7,7 +7,6 @@
 #include <ccan/tal/str/str.h>
 #include <common/ecdh.h>
 #include <common/json_parse.h>
-#include <common/onion_decode.h>
 #include <common/onion_encode.h>
 #include <common/sphinx.h>
 #include <common/utils.h>
diff --git a/devtools/print_wire.c b/devtools/print_wire.c
index ba1285fff..a99a49559 100644
--- a/devtools/print_wire.c
+++ b/devtools/print_wire.c
@@ -6,7 +6,6 @@
 #include <ccan/utf8/utf8.h>
 #include <common/channel_id.h>
 #include <common/decode_array.h>
-#include <common/sciddir_or_pubkey.h>
 #include <common/utils.h>
 #include <devtools/print_wire.h>
 #include <errno.h>
diff --git a/devtools/rune.c b/devtools/rune.c
index 37322e06c..a534dec8e 100644
--- a/devtools/rune.c
+++ b/devtools/rune.c
@@ -1,11 +1,8 @@
 /* Decodes a rune. */
 #include "config.h"
-#include <ccan/err/err.h>
 #include <ccan/opt/opt.h>
 #include <ccan/rune/rune.h>
-#include <common/configdir.h>
 #include <common/setup.h>
-#include <common/utils.h>
 #include <common/version.h>
 #include <stdio.h>
 
diff --git a/gossipd/gossip_store.c b/gossipd/gossip_store.c
index 4d4907777..214362514 100644
--- a/gossipd/gossip_store.c
+++ b/gossipd/gossip_store.c
@@ -1,5 +1,4 @@
 #include "config.h"
-#include <ccan/array_size/array_size.h>
 #include <ccan/crc32c/crc32c.h>
 #include <ccan/noerr/noerr.h>
 #include <ccan/read_write_all/read_write_all.h>
@@ -12,12 +11,9 @@
 #include <gossipd/gossip_store.h>
 #include <gossipd/gossip_store_wiregen.h>
 #include <gossipd/gossipd.h>
-#include <gossipd/gossmap_manage.h>
 #include <inttypes.h>
 #include <sys/stat.h>
-#include <sys/uio.h>
 #include <unistd.h>
-#include <wire/peer_wire.h>
 
 /* Obsolete ZOMBIE bit */
 #define GOSSIP_STORE_ZOMBIE_BIT_V13 0x1000U
diff --git a/gossipd/gossipd.c b/gossipd/gossipd.c
index 14b795fd2..18166adbc 100644
--- a/gossipd/gossipd.c
+++ b/gossipd/gossipd.c
@@ -11,29 +11,21 @@
  * add complexity to this daemon.
  */
 #include "config.h"
-#include <ccan/cast/cast.h>
 #include <ccan/tal/str/str.h>
 #include <common/daemon_conn.h>
 #include <common/ecdh_hsmd.h>
-#include <common/lease_rates.h>
 #include <common/memleak.h>
-#include <common/pseudorand.h>
 #include <common/status.h>
 #include <common/subdaemon.h>
 #include <common/timeout.h>
 #include <common/utils.h>
 #include <common/wire_error.h>
-#include <common/wireaddr.h>
 #include <connectd/connectd_gossipd_wiregen.h>
-#include <errno.h>
-#include <gossipd/gossip_store.h>
-#include <gossipd/gossip_store_wiregen.h>
 #include <gossipd/gossipd.h>
 #include <gossipd/gossipd_wiregen.h>
 #include <gossipd/gossmap_manage.h>
 #include <gossipd/queries.h>
 #include <gossipd/seeker.h>
-#include <sodium/crypto_aead_chacha20poly1305.h>
 
 const struct node_id *peer_node_id(const struct peer *peer)
 {
diff --git a/gossipd/gossmap_manage.c b/gossipd/gossmap_manage.c
index 72c94f3b2..bf4faee56 100644
--- a/gossipd/gossmap_manage.c
+++ b/gossipd/gossmap_manage.c
@@ -1,7 +1,6 @@
 #include "config.h"
 #include <bitcoin/script.h>
 #include <ccan/array_size/array_size.h>
-#include <ccan/mem/mem.h>
 #include <ccan/tal/str/str.h>
 #include <common/daemon_conn.h>
 #include <common/gossip_store.h>
@@ -11,8 +10,6 @@
 #include <common/timeout.h>
 #include <common/utils.h>
 #include <common/wire_error.h>
-#include <errno.h>
-#include <fcntl.h>
 #include <gossipd/gossip_store.h>
 #include <gossipd/gossip_store_wiregen.h>
 #include <gossipd/gossipd.h>
@@ -21,7 +18,6 @@
 #include <gossipd/seeker.h>
 #include <gossipd/sigcheck.h>
 #include <gossipd/txout_failures.h>
-#include <string.h>
 
 struct pending_cannounce {
 	const u8 *scriptpubkey;
diff --git a/gossipd/queries.c b/gossipd/queries.c
index 8902a5fc9..e106f47df 100644
--- a/gossipd/queries.c
+++ b/gossipd/queries.c
@@ -1,19 +1,10 @@
 /* Routines to generate gossip query messages */
 #include "config.h"
-#include <bitcoin/chainparams.h>
-#include <ccan/array_size/array_size.h>
-#include <ccan/asort/asort.h>
-#include <ccan/crc32c/crc32c.h>
-#include <common/daemon_conn.h>
 #include <common/decode_array.h>
-#include <common/gossmap.h>
 #include <common/status.h>
 #include <common/utils.h>
 #include <common/wire_error.h>
-#include <gossipd/gossip_store.h>
 #include <gossipd/gossipd.h>
-#include <gossipd/gossipd_wiregen.h>
-#include <gossipd/gossmap_manage.h>
 #include <gossipd/queries.h>
 
 /* BOLT #7:
diff --git a/gossipd/seeker.c b/gossipd/seeker.c
index b822cb732..4ba862e93 100644
--- a/gossipd/seeker.c
+++ b/gossipd/seeker.c
@@ -1,7 +1,5 @@
 /* This contains the code which actively seeks out gossip from peers */
 #include "config.h"
-#include <bitcoin/chainparams.h>
-#include <ccan/array_size/array_size.h>
 #include <ccan/asort/asort.h>
 #include <ccan/intmap/intmap.h>
 #include <ccan/tal/str/str.h>
@@ -9,8 +7,6 @@
 #include <common/decode_array.h>
 #include <common/gossmap.h>
 #include <common/memleak.h>
-#include <common/pseudorand.h>
-#include <common/random_select.h>
 #include <common/status.h>
 #include <common/timeout.h>
 #include <common/utils.h>
diff --git a/gossipd/sigcheck.c b/gossipd/sigcheck.c
index 8897586a0..9e729c112 100644
--- a/gossipd/sigcheck.c
+++ b/gossipd/sigcheck.c
@@ -3,7 +3,6 @@
 #include <bitcoin/signature.h>
 #include <ccan/tal/str/str.h>
 #include <common/utils.h>
-#include <common/wire_error.h>
 #include <gossipd/sigcheck.h>
 
 /* Verify the signature of a channel_update message */
diff --git a/gossipd/test/run-extended-info.c b/gossipd/test/run-extended-info.c
index 0fee41009..417c0eb8b 100644
--- a/gossipd/test/run-extended-info.c
+++ b/gossipd/test/run-extended-info.c
@@ -1,6 +1,7 @@
 #include "config.h"
 
 #include "../queries.c"
+#include <ccan/array_size/array_size.h>
 #include <ccan/str/hex/hex.h>
 #include <common/blinding.h>
 #include <common/channel_type.h>
diff --git a/hsmd/hsmd.c b/hsmd/hsmd.c
index 2d05e657e..56f22836e 100644
--- a/hsmd/hsmd.c
+++ b/hsmd/hsmd.c
@@ -25,7 +25,6 @@
 /*~ _wiregen files are autogenerated by tools/generate-wire.py */
 #include <hsmd/libhsmd.h>
 #include <hsmd/permissions.h>
-#include <sys/socket.h>
 #include <sys/stat.h>
 #include <wire/wire_io.h>
 
diff --git a/lightningd/anchorspend.c b/lightningd/anchorspend.c
index 2dbe10bb0..a194702ec 100644
--- a/lightningd/anchorspend.c
+++ b/lightningd/anchorspend.c
@@ -1,23 +1,15 @@
 #include "config.h"
-#include <bitcoin/psbt.h>
 #include <bitcoin/script.h>
-#include <bitcoin/tx.h>
 #include <ccan/asort/asort.h>
-#include <ccan/cast/cast.h>
 #include <ccan/mem/mem.h>
-#include <ccan/tal/str/str.h>
 #include <channeld/channeld_wiregen.h>
-#include <common/utils.h>
 #include <hsmd/hsmd_wiregen.h>
 #include <inttypes.h>
 #include <lightningd/anchorspend.h>
 #include <lightningd/chaintopology.h>
 #include <lightningd/channel.h>
 #include <lightningd/hsm_control.h>
-#include <lightningd/htlc_end.h>
 #include <lightningd/lightningd.h>
-#include <lightningd/log.h>
-#include <lightningd/peer_control.h>
 #include <wally_psbt.h>
 
 /* This is attached to each anchor tx retransmission */
diff --git a/lightningd/bitcoind.c b/lightningd/bitcoind.c
index 771ccf2f9..3e092a5bf 100644
--- a/lightningd/bitcoind.c
+++ b/lightningd/bitcoind.c
@@ -4,24 +4,15 @@
  * standardized and you can use another plugin as the Bitcoin backend, or
  * even make your own! */
 #include "config.h"
-#include <bitcoin/base58.h>
-#include <bitcoin/block.h>
 #include <bitcoin/feerate.h>
 #include <bitcoin/script.h>
-#include <bitcoin/shadouble.h>
 #include <ccan/array_size/array_size.h>
 #include <ccan/io/io.h>
 #include <ccan/tal/str/str.h>
-#include <common/configdir.h>
-#include <common/json_parse.h>
-#include <common/memleak.h>
 #include <common/trace.h>
-#include <db/exec.h>
 #include <lightningd/bitcoind.h>
 #include <lightningd/chaintopology.h>
 #include <lightningd/io_loop_with_timers.h>
-#include <lightningd/lightningd.h>
-#include <lightningd/log.h>
 #include <lightningd/plugin.h>
 
 /* The names of the requests we can make to our Bitcoin backend. */
diff --git a/lightningd/chaintopology.c b/lightningd/chaintopology.c
index 1baab407f..a35e4d013 100644
--- a/lightningd/chaintopology.c
+++ b/lightningd/chaintopology.c
@@ -1,19 +1,13 @@
 #include "config.h"
-#include <bitcoin/feerate.h>
 #include <bitcoin/script.h>
-#include <bitcoin/tx.h>
 #include <ccan/array_size/array_size.h>
 #include <ccan/io/io.h>
 #include <ccan/tal/str/str.h>
-#include <common/configdir.h>
 #include <common/htlc_tx.h>
-#include <common/json_command.h>
-#include <common/json_param.h>
 #include <common/memleak.h>
 #include <common/timeout.h>
 #include <common/trace.h>
 #include <db/exec.h>
-#include <lightningd/bitcoind.h>
 #include <lightningd/chaintopology.h>
 #include <lightningd/channel.h>
 #include <lightningd/coin_mvts.h>
@@ -21,13 +15,9 @@
 #include <lightningd/gossip_control.h>
 #include <lightningd/invoice.h>
 #include <lightningd/io_loop_with_timers.h>
-#include <lightningd/jsonrpc.h>
-#include <lightningd/lightningd.h>
-#include <lightningd/log.h>
 #include <lightningd/notification.h>
 #include <math.h>
 #include <wallet/txfilter.h>
-#include <wallet/wallet.h>
 
 /* Mutual recursion via timer. */
 static void try_extend_tip(struct chain_topology *topo);
diff --git a/lightningd/channel.c b/lightningd/channel.c
index 1390a4868..798c7ad7a 100644
--- a/lightningd/channel.c
+++ b/lightningd/channel.c
@@ -5,20 +5,16 @@
 #include <common/fee_states.h>
 #include <common/json_command.h>
 #include <common/wire_error.h>
-#include <errno.h>
 #include <hsmd/hsmd_wiregen.h>
 #include <lightningd/channel.h>
 #include <lightningd/channel_gossip.h>
 #include <lightningd/channel_state_names_gen.h>
 #include <lightningd/connect_control.h>
-#include <lightningd/gossip_control.h>
 #include <lightningd/hsm_control.h>
 #include <lightningd/notification.h>
 #include <lightningd/opening_common.h>
-#include <lightningd/peer_control.h>
 #include <lightningd/subd.h>
 #include <wallet/txfilter.h>
-#include <wire/peer_wire.h>
 
 void channel_set_owner(struct channel *channel, struct subd *owner)
 {
diff --git a/lightningd/channel_control.c b/lightningd/channel_control.c
index 93d76a7ad..a5fb7d460 100644
--- a/lightningd/channel_control.c
+++ b/lightningd/channel_control.c
@@ -1,37 +1,27 @@
 #include "config.h"
 #include <ccan/asort/asort.h>
 #include <ccan/cast/cast.h>
-#include <ccan/mem/mem.h>
 #include <ccan/tal/str/str.h>
 #include <channeld/channeld_wiregen.h>
 #include <common/json_command.h>
-#include <common/json_param.h>
-#include <common/json_stream.h>
-#include <common/memleak.h>
 #include <common/psbt_open.h>
 #include <common/shutdown_scriptpubkey.h>
 #include <common/wire_error.h>
 #include <connectd/connectd_wiregen.h>
 #include <errno.h>
-#include <fcntl.h>
 #include <hsmd/permissions.h>
-#include <lightningd/chaintopology.h>
 #include <lightningd/channel.h>
 #include <lightningd/channel_control.h>
 #include <lightningd/channel_gossip.h>
 #include <lightningd/closing_control.h>
-#include <lightningd/coin_mvts.h>
 #include <lightningd/connect_control.h>
 #include <lightningd/dual_open_control.h>
 #include <lightningd/feerate.h>
-#include <lightningd/gossip_control.h>
 #include <lightningd/hsm_control.h>
 #include <lightningd/notification.h>
-#include <lightningd/peer_control.h>
 #include <lightningd/peer_fd.h>
 #include <lightningd/peer_htlcs.h>
-#include <wally_bip32.h>
-#include <wally_psbt.h>
+#include <unistd.h>
 
 struct stfu_result
 {
diff --git a/lightningd/channel_gossip.c b/lightningd/channel_gossip.c
index d4153b207..79b12ffc5 100644
--- a/lightningd/channel_gossip.c
+++ b/lightningd/channel_gossip.c
@@ -1,7 +1,6 @@
 #include "config.h"
 #include <ccan/array_size/array_size.h>
 #include <ccan/cast/cast.h>
-#include <ccan/mem/mem.h>
 #include <common/memleak.h>
 #include <common/timeout.h>
 #include <common/wire_error.h>
@@ -13,7 +12,6 @@
 #include <lightningd/gossip_generation.h>
 #include <lightningd/hsm_control.h>
 #include <lightningd/lightningd.h>
-#include <lightningd/peer_control.h>
 #include <lightningd/subd.h>
 
 enum channel_gossip_state {
diff --git a/lightningd/closed_channel.c b/lightningd/closed_channel.c
index dd85f4fc2..73b572feb 100644
--- a/lightningd/closed_channel.c
+++ b/lightningd/closed_channel.c
@@ -1,14 +1,9 @@
 #include "config.h"
 #include <common/json_channel_type.h>
-#include <common/json_command.h>
-#include <common/json_param.h>
-#include <common/json_stream.h>
 #include <lightningd/channel.h>
 #include <lightningd/closed_channel.h>
 #include <lightningd/jsonrpc.h>
 #include <lightningd/lightningd.h>
-#include <lightningd/peer_control.h>
-#include <wallet/wallet.h>
 
 size_t hash_cid(const struct channel_id *cid)
 {
diff --git a/lightningd/closing_control.c b/lightningd/closing_control.c
index dbf604bc4..c3f2d7b8d 100644
--- a/lightningd/closing_control.c
+++ b/lightningd/closing_control.c
@@ -1,27 +1,15 @@
 #include "config.h"
-#include <bitcoin/feerate.h>
 #include <bitcoin/script.h>
-#include <ccan/cast/cast.h>
-#include <ccan/mem/mem.h>
 #include <ccan/tal/str/str.h>
 #include <channeld/channeld_wiregen.h>
 #include <closingd/closingd_wiregen.h>
-#include <common/close_tx.h>
 #include <common/closing_fee.h>
-#include <common/configdir.h>
-#include <common/fee_states.h>
-#include <common/initial_commit_tx.h>
 #include <common/json_command.h>
-#include <common/json_param.h>
 #include <common/shutdown_scriptpubkey.h>
 #include <common/timeout.h>
-#include <common/utils.h>
-#include <connectd/connectd_wiregen.h>
 #include <errno.h>
-#include <gossipd/gossipd_wiregen.h>
 #include <hsmd/permissions.h>
 #include <inttypes.h>
-#include <lightningd/bitcoind.h>
 #include <lightningd/chaintopology.h>
 #include <lightningd/channel.h>
 #include <lightningd/closing_control.h>
@@ -31,14 +19,9 @@
 #include <lightningd/hsm_control.h>
 #include <lightningd/jsonrpc.h>
 #include <lightningd/lightningd.h>
-#include <lightningd/log.h>
 #include <lightningd/opening_common.h>
-#include <lightningd/options.h>
-#include <lightningd/peer_control.h>
 #include <lightningd/peer_fd.h>
-#include <lightningd/subd.h>
 #include <openingd/dualopend_wiregen.h>
-#include <wally_bip32.h>
 
 struct close_command {
 	/* Inside struct lightningd close_commands. */
diff --git a/lightningd/coin_mvts.c b/lightningd/coin_mvts.c
index cc206b62b..dcbc30594 100644
--- a/lightningd/coin_mvts.c
+++ b/lightningd/coin_mvts.c
@@ -1,11 +1,9 @@
 #include "config.h"
-#include <ccan/array_size/array_size.h>
 #include <ccan/tal/str/str.h>
 #include <common/json_command.h>
 #include <lightningd/channel.h>
 #include <lightningd/coin_mvts.h>
 #include <lightningd/notification.h>
-#include <lightningd/peer_control.h>
 
 
 struct channel_coin_mvt *new_channel_mvt_invoice_hin(const tal_t *ctx,
diff --git a/lightningd/configs.c b/lightningd/configs.c
index 058571776..553dafff6 100644
--- a/lightningd/configs.c
+++ b/lightningd/configs.c
@@ -10,12 +10,8 @@
 #include <common/configdir.h>
 #include <common/configvar.h>
 #include <common/json_command.h>
-#include <common/json_param.h>
-#include <common/version.h>
 #include <errno.h>
 #include <fcntl.h>
-#include <lightningd/jsonrpc.h>
-#include <lightningd/options.h>
 #include <lightningd/plugin.h>
 #include <unistd.h>
 
diff --git a/lightningd/connect_control.c b/lightningd/connect_control.c
index 437beaa9e..d42681155 100644
--- a/lightningd/connect_control.c
+++ b/lightningd/connect_control.c
@@ -1,27 +1,17 @@
 #include "config.h"
-#include <bitcoin/chainparams.h>
 #include <ccan/err/err.h>
 #include <ccan/io/io.h>
 #include <ccan/tal/str/str.h>
-#include <common/configdir.h>
 #include <common/json_command.h>
-#include <common/json_param.h>
-#include <common/memleak.h>
-#include <common/timeout.h>
 #include <connectd/connectd_wiregen.h>
-#include <gossipd/gossipd_wiregen.h>
 #include <hsmd/permissions.h>
 #include <lightningd/channel.h>
-#include <lightningd/channel_gossip.h>
 #include <lightningd/connect_control.h>
 #include <lightningd/dual_open_control.h>
 #include <lightningd/hsm_control.h>
-#include <lightningd/lightningd.h>
 #include <lightningd/notification.h>
 #include <lightningd/onion_message.h>
 #include <lightningd/opening_common.h>
-#include <lightningd/opening_control.h>
-#include <lightningd/peer_control.h>
 #include <lightningd/ping.h>
 #include <lightningd/plugin_hook.h>
 
diff --git a/lightningd/datastore.c b/lightningd/datastore.c
index f3ecfc6d9..8ccb53382 100644
--- a/lightningd/datastore.c
+++ b/lightningd/datastore.c
@@ -1,8 +1,6 @@
 #include "config.h"
 #include <ccan/tal/str/str.h>
 #include <common/json_command.h>
-#include <common/json_param.h>
-#include <common/json_stream.h>
 #include <lightningd/jsonrpc.h>
 #include <lightningd/lightningd.h>
 
diff --git a/lightningd/dual_open_control.c b/lightningd/dual_open_control.c
index 8e6a65169..1dc4c6a4b 100644
--- a/lightningd/dual_open_control.c
+++ b/lightningd/dual_open_control.c
@@ -3,7 +3,6 @@
  * saves and funding tx watching for a channel open */
 
 #include "config.h"
-#include <bitcoin/short_channel_id.h>
 #include <ccan/array_size/array_size.h>
 #include <ccan/cast/cast.h>
 #include <ccan/mem/mem.h>
@@ -11,14 +10,12 @@
 #include <common/blockheight_states.h>
 #include <common/json_channel_type.h>
 #include <common/json_command.h>
-#include <common/json_param.h>
 #include <common/psbt_open.h>
 #include <common/shutdown_scriptpubkey.h>
 #include <common/wire_error.h>
 #include <connectd/connectd_wiregen.h>
 #include <errno.h>
 #include <hsmd/permissions.h>
-#include <lightningd/chaintopology.h>
 #include <lightningd/channel.h>
 #include <lightningd/channel_control.h>
 #include <lightningd/channel_gossip.h>
@@ -26,14 +23,13 @@
 #include <lightningd/connect_control.h>
 #include <lightningd/dual_open_control.h>
 #include <lightningd/feerate.h>
-#include <lightningd/gossip_control.h>
 #include <lightningd/hsm_control.h>
 #include <lightningd/notification.h>
 #include <lightningd/opening_common.h>
-#include <lightningd/peer_control.h>
 #include <lightningd/peer_fd.h>
 #include <lightningd/plugin_hook.h>
 #include <openingd/dualopend_wiregen.h>
+#include <unistd.h>
 
 struct commit_rcvd {
 	struct channel *channel;
diff --git a/lightningd/feerate.c b/lightningd/feerate.c
index 56b0e8229..78027a56a 100644
--- a/lightningd/feerate.c
+++ b/lightningd/feerate.c
@@ -1,5 +1,4 @@
 #include "config.h"
-#include <common/configdir.h>
 #include <common/json_command.h>
 #include <lightningd/chaintopology.h>
 #include <lightningd/feerate.h>
diff --git a/lightningd/forwards.c b/lightningd/forwards.c
index ecb14094c..6c86d5063 100644
--- a/lightningd/forwards.c
+++ b/lightningd/forwards.c
@@ -2,14 +2,10 @@
 #include <ccan/mem/mem.h>
 #include <ccan/tal/str/str.h>
 #include <common/json_command.h>
-#include <common/json_param.h>
-#include <common/json_stream.h>
 #include <inttypes.h>
 #include <lightningd/forwards.h>
-#include <lightningd/htlc_end.h>
 #include <lightningd/jsonrpc.h>
 #include <lightningd/lightningd.h>
-#include <wallet/wallet.h>
 
 static u64 forward_index_inc(struct lightningd *ld,
 			     enum forward_status status,
diff --git a/lightningd/gossip_control.c b/lightningd/gossip_control.c
index 207e41b57..6b484a77e 100644
--- a/lightningd/gossip_control.c
+++ b/lightningd/gossip_control.c
@@ -1,29 +1,17 @@
 #include "config.h"
 #include <ccan/err/err.h>
 #include <ccan/io/io.h>
-#include <ccan/mem/mem.h>
 #include <ccan/ptrint/ptrint.h>
-#include <channeld/channeld_wiregen.h>
-#include <common/daemon.h>
 #include <common/json_command.h>
-#include <common/json_param.h>
-#include <common/json_stream.h>
-#include <common/node_id.h>
-#include <common/timeout.h>
 #include <connectd/connectd_wiregen.h>
-#include <gossipd/gossipd_wiregen.h>
-#include <hsmd/hsmd_wiregen.h>
 #include <hsmd/permissions.h>
-#include <lightningd/bitcoind.h>
 #include <lightningd/chaintopology.h>
 #include <lightningd/channel.h>
-#include <lightningd/channel_control.h>
 #include <lightningd/channel_gossip.h>
 #include <lightningd/gossip_control.h>
 #include <lightningd/hsm_control.h>
 #include <lightningd/jsonrpc.h>
 #include <lightningd/lightningd.h>
-#include <lightningd/peer_control.h>
 #include <lightningd/subd.h>
 
 static void got_txout(struct bitcoind *bitcoind,
diff --git a/lightningd/gossip_generation.c b/lightningd/gossip_generation.c
index 22877c9c0..7a59f0e9d 100644
--- a/lightningd/gossip_generation.c
+++ b/lightningd/gossip_generation.c
@@ -1,14 +1,9 @@
 #include "config.h"
 #include <ccan/cast/cast.h>
 #include <ccan/mem/mem.h>
-#include <common/features.h>
-#include <common/htlc.h>
-#include <common/node_id.h>
 #include <lightningd/channel.h>
 #include <lightningd/gossip_generation.h>
 #include <lightningd/lightningd.h>
-#include <lightningd/peer_control.h>
-#include <wire/peer_wire.h>
 
 /* Once we know which way nodes go, it's easy to construct */
 static u8 *create_channel_announcement_dir(const tal_t *ctx,
diff --git a/lightningd/hsm_control.c b/lightningd/hsm_control.c
index 7c0c6587f..599ef4081 100644
--- a/lightningd/hsm_control.c
+++ b/lightningd/hsm_control.c
@@ -2,22 +2,17 @@
 #include <ccan/err/err.h>
 #include <ccan/fdpass/fdpass.h>
 #include <common/bolt12_id.h>
-#include <common/ecdh.h>
 #include <common/errcode.h>
 #include <common/hsm_capable.h>
 #include <common/hsm_encryption.h>
 #include <common/hsm_version.h>
 #include <common/json_command.h>
-#include <common/json_param.h>
-#include <common/jsonrpc_errors.h>
 #include <errno.h>
 #include <hsmd/hsmd_wiregen.h>
 #include <lightningd/hsm_control.h>
 #include <lightningd/jsonrpc.h>
 #include <lightningd/lightningd.h>
 #include <lightningd/subd.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
 #include <wally_bip32.h>
 #include <wire/wire_sync.h>
 
diff --git a/lightningd/htlc_end.c b/lightningd/htlc_end.c
index b55780874..e2a06170d 100644
--- a/lightningd/htlc_end.c
+++ b/lightningd/htlc_end.c
@@ -1,14 +1,10 @@
 #include "config.h"
 #include <ccan/cast/cast.h>
-#include <ccan/crypto/siphash24/siphash24.h>
 #include <ccan/tal/str/str.h>
-#include <common/htlc.h>
 #include <common/htlc_wire.h>
-#include <common/pseudorand.h>
 #include <common/utils.h>
 #include <lightningd/htlc_end.h>
 #include <lightningd/log.h>
-#include <wire/tlvstream.h>
 
 size_t hash_htlc_key(const struct htlc_key *k)
 {
diff --git a/lightningd/htlc_set.c b/lightningd/htlc_set.c
index 47677678d..5d2531fff 100644
--- a/lightningd/htlc_set.c
+++ b/lightningd/htlc_set.c
@@ -1,5 +1,4 @@
 #include "config.h"
-#include <common/features.h>
 #include <common/timeout.h>
 #include <lightningd/chaintopology.h>
 #include <lightningd/channel.h>
diff --git a/lightningd/invoice.c b/lightningd/invoice.c
index 31362ab6c..dfdf633e4 100644
--- a/lightningd/invoice.c
+++ b/lightningd/invoice.c
@@ -2,7 +2,6 @@
 #include <bitcoin/script.h>
 #include <ccan/array_size/array_size.h>
 #include <ccan/asort/asort.h>
-#include <ccan/cast/cast.h>
 #include <ccan/json_escape/json_escape.h>
 #include <ccan/str/hex/hex.h>
 #include <ccan/tal/str/str.h>
@@ -10,14 +9,9 @@
 #include <common/bolt11_json.h>
 #include <common/bolt12_id.h>
 #include <common/bolt12_merkle.h>
-#include <common/configdir.h>
 #include <common/json_command.h>
-#include <common/json_param.h>
-#include <common/overflows.h>
 #include <common/random_select.h>
 #include <common/timeout.h>
-#include <db/exec.h>
-#include <errno.h>
 #include <hsmd/hsmd_wiregen.h>
 #include <lightningd/channel.h>
 #include <lightningd/hsm_control.h>
@@ -27,10 +21,8 @@
 #include <lightningd/plugin_hook.h>
 #include <lightningd/routehint.h>
 #include <sodium/randombytes.h>
-#include <stdio.h>
 #include <wallet/invoices.h>
 #include <wallet/walletrpc.h>
-#include <wire/wire_sync.h>
 
 const char *invoice_status_str(enum invoice_status state)
 {
diff --git a/lightningd/jsonrpc.c b/lightningd/jsonrpc.c
index 7370ad73a..95d32cb11 100644
--- a/lightningd/jsonrpc.c
+++ b/lightningd/jsonrpc.c
@@ -23,11 +23,8 @@
 #include <ccan/tal/path/path.h>
 #include <ccan/tal/str/str.h>
 #include <common/codex32.h>
-#include <common/configdir.h>
-#include <common/deprecation.h>
 #include <common/json_command.h>
 #include <common/json_filter.h>
-#include <common/json_param.h>
 #include <common/memleak.h>
 #include <common/timeout.h>
 #include <common/trace.h>
@@ -36,11 +33,7 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <lightningd/jsonrpc.h>
-#include <lightningd/options.h>
 #include <lightningd/plugin_hook.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
-#include <sys/un.h>
 
 
 /* Dummy structure. */
diff --git a/lightningd/lightningd.c b/lightningd/lightningd.c
index 7044d9796..8eb3acc9c 100644
--- a/lightningd/lightningd.c
+++ b/lightningd/lightningd.c
@@ -39,7 +39,6 @@
 #include <ccan/closefrom/closefrom.h>
 #include <ccan/io/io.h>
 #include <ccan/json_escape/json_escape.h>
-#include <ccan/opt/opt.h>
 #include <ccan/pipecmd/pipecmd.h>
 #include <ccan/read_write_all/read_write_all.h>
 #include <ccan/tal/grab_file/grab_file.h>
@@ -48,13 +47,11 @@
 
 /*~ This is common code: routines shared by one or more executables
  *  (separate daemons, or the lightning-cli program). */
-#include <common/configdir.h>
 #include <common/daemon.h>
 #include <common/deprecation.h>
 #include <common/ecdh_hsmd.h>
 #include <common/errcode.h>
 #include <common/hsm_encryption.h>
-#include <common/json_stream.h>
 #include <common/memleak.h>
 #include <common/timeout.h>
 #include <common/trace.h>
@@ -64,13 +61,11 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <header_versions_gen.h>
-#include <hsmd/hsmd_wiregen.h>
 #include <lightningd/chaintopology.h>
 #include <lightningd/channel.h>
 #include <lightningd/channel_control.h>
 #include <lightningd/channel_gossip.h>
 #include <lightningd/closed_channel.h>
-#include <lightningd/coin_mvts.h>
 #include <lightningd/connect_control.h>
 #include <lightningd/gossip_control.h>
 #include <lightningd/hsm_control.h>
@@ -78,7 +73,6 @@
 #include <lightningd/lightningd.h>
 #include <lightningd/onchain_control.h>
 #include <lightningd/peer_htlcs.h>
-#include <lightningd/plugin.h>
 #include <lightningd/plugin_hook.h>
 #include <lightningd/runes.h>
 #include <lightningd/subd.h>
diff --git a/lightningd/log.c b/lightningd/log.c
index 9775e79f4..5b5bcd5ae 100644
--- a/lightningd/log.c
+++ b/lightningd/log.c
@@ -7,13 +7,11 @@
 #include <ccan/tal/str/str.h>
 #include <common/configvar.h>
 #include <common/json_command.h>
-#include <common/json_param.h>
 #include <common/memleak.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <lightningd/log.h>
 #include <lightningd/notification.h>
-#include <signal.h>
 #include <stdio.h>
 
 /* What logging level to use if they didn't specify */
diff --git a/lightningd/memdump.c b/lightningd/memdump.c
index b2f32a106..2372ab0a9 100644
--- a/lightningd/memdump.c
+++ b/lightningd/memdump.c
@@ -3,12 +3,9 @@
 #include <backtrace.h>
 #include <ccan/tal/str/str.h>
 #include <common/json_command.h>
-#include <common/json_param.h>
 #include <common/memleak.h>
 #include <common/timeout.h>
 #include <connectd/connectd_wiregen.h>
-#include <errno.h>
-#include <gossipd/gossipd_wiregen.h>
 #include <hsmd/hsmd_wiregen.h>
 #include <lightningd/chaintopology.h>
 #include <lightningd/channel.h>
@@ -17,8 +14,6 @@
 #include <lightningd/jsonrpc.h>
 #include <lightningd/lightningd.h>
 #include <lightningd/memdump.h>
-#include <lightningd/opening_common.h>
-#include <lightningd/peer_control.h>
 #include <lightningd/subd.h>
 
 static void json_add_ptr(struct json_stream *response, const char *name,
diff --git a/lightningd/notification.c b/lightningd/notification.c
index 75134ecde..73a689b97 100644
--- a/lightningd/notification.c
+++ b/lightningd/notification.c
@@ -1,9 +1,7 @@
 #include "config.h"
 #include <ccan/cast/cast.h>
-#include <common/configdir.h>
 #include <lightningd/channel.h>
 #include <lightningd/coin_mvts.h>
-#include <lightningd/log.h>
 #include <lightningd/notification.h>
 
 bool notifications_topic_is_native(const char *topic)
diff --git a/lightningd/offer.c b/lightningd/offer.c
index 9b26d75ad..dd8871cbe 100644
--- a/lightningd/offer.c
+++ b/lightningd/offer.c
@@ -1,20 +1,13 @@
 #include "config.h"
 #include <ccan/cast/cast.h>
-#include <ccan/json_escape/json_escape.h>
-#include <ccan/take/take.h>
 #include <common/bolt12_id.h>
 #include <common/bolt12_merkle.h>
-#include <common/configdir.h>
 #include <common/json_command.h>
-#include <common/json_param.h>
-#include <common/json_stream.h>
-#include <errno.h>
 #include <hsmd/hsmd_wiregen.h>
 #include <inttypes.h>
 #include <lightningd/hsm_control.h>
 #include <lightningd/jsonrpc.h>
 #include <lightningd/lightningd.h>
-#include <secp256k1_schnorrsig.h>
 
 static void json_populate_offer(struct json_stream *response,
 				const struct sha256 *offer_id,
diff --git a/lightningd/onchain_control.c b/lightningd/onchain_control.c
index b82523ab1..09d5d8966 100644
--- a/lightningd/onchain_control.c
+++ b/lightningd/onchain_control.c
@@ -4,7 +4,6 @@
 #include <ccan/cast/cast.h>
 #include <ccan/tal/str/str.h>
 #include <common/htlc_tx.h>
-#include <common/key_derive.h>
 #include <common/memleak.h>
 #include <common/psbt_keypath.h>
 #include <db/exec.h>
@@ -18,15 +17,10 @@
 #include <lightningd/coin_mvts.h>
 #include <lightningd/hsm_control.h>
 #include <lightningd/onchain_control.h>
-#include <lightningd/peer_control.h>
 #include <lightningd/peer_htlcs.h>
 #include <lightningd/subd.h>
 #include <onchaind/onchaind_wiregen.h>
 #include <wallet/txfilter.h>
-#include <wallet/wallet.h>
-#include <wally_bip32.h>
-#include <wally_psbt.h>
-#include <wire/wire_sync.h>
 
 /* If we're restarting, we keep a per-channel copy of watches, and replay */
 struct replay_tx {
diff --git a/lightningd/onion_message.c b/lightningd/onion_message.c
index 6c0949813..70efb66e5 100644
--- a/lightningd/onion_message.c
+++ b/lightningd/onion_message.c
@@ -1,18 +1,12 @@
 #include "config.h"
-#include <ccan/mem/mem.h>
 #include <common/blindedpath.h>
 #include <common/blinding.h>
-#include <common/configdir.h>
 #include <common/ecdh.h>
 #include <common/json_command.h>
-#include <common/json_param.h>
 #include <connectd/connectd_wiregen.h>
-#include <lightningd/channel.h>
 #include <lightningd/onion_message.h>
-#include <lightningd/peer_control.h>
 #include <lightningd/plugin_hook.h>
 #include <lightningd/subd.h>
-#include <sodium/randombytes.h>
 
 struct onion_message_hook_payload {
 	/* Optional */
diff --git a/lightningd/opening_common.c b/lightningd/opening_common.c
index 79f7867c5..5b03d2a71 100644
--- a/lightningd/opening_common.c
+++ b/lightningd/opening_common.c
@@ -1,19 +1,12 @@
 #include "config.h"
 #include <ccan/ccan/tal/str/str.h>
 #include <common/json_command.h>
-#include <common/wire_error.h>
-#include <errno.h>
 #include <hsmd/hsmd_wiregen.h>
 #include <lightningd/channel.h>
-#include <lightningd/channel_control.h>
-#include <lightningd/connect_control.h>
 #include <lightningd/hsm_control.h>
 #include <lightningd/notification.h>
 #include <lightningd/opening_common.h>
-#include <lightningd/peer_control.h>
-#include <lightningd/peer_fd.h>
 #include <lightningd/subd.h>
-#include <openingd/openingd_wiregen.h>
 
 static void destroy_uncommitted_channel(struct uncommitted_channel *uc)
 {
diff --git a/lightningd/opening_control.c b/lightningd/opening_control.c
index ffd6cab56..8570160a1 100644
--- a/lightningd/opening_control.c
+++ b/lightningd/opening_control.c
@@ -1,22 +1,17 @@
 #include "config.h"
-#include <bitcoin/feerate.h>
 #include <bitcoin/psbt.h>
 #include <ccan/cast/cast.h>
 #include <ccan/mem/mem.h>
 #include <ccan/tal/str/str.h>
 #include <common/addr.h>
 #include <common/blockheight_states.h>
-#include <common/configdir.h>
 #include <common/fee_states.h>
 #include <common/json_channel_type.h>
 #include <common/json_command.h>
-#include <common/json_param.h>
 #include <common/memleak.h>
-#include <common/scb_wiregen.h>
 #include <connectd/connectd_wiregen.h>
 #include <errno.h>
 #include <hsmd/permissions.h>
-#include <lightningd/chaintopology.h>
 #include <lightningd/channel.h>
 #include <lightningd/channel_control.h>
 #include <lightningd/connect_control.h>
@@ -29,6 +24,7 @@
 #include <lightningd/plugin_hook.h>
 #include <lightningd/subd.h>
 #include <openingd/openingd_wiregen.h>
+#include <unistd.h>
 #include <wally_psbt.h>
 
 void json_add_uncommitted_channel(struct command *cmd,
diff --git a/lightningd/options.c b/lightningd/options.c
index 5f84b7285..1ef5d1fa2 100644
--- a/lightningd/options.c
+++ b/lightningd/options.c
@@ -2,38 +2,29 @@
 #include <ccan/array_size/array_size.h>
 #include <ccan/cast/cast.h>
 #include <ccan/err/err.h>
-#include <ccan/json_escape/json_escape.h>
-#include <ccan/mem/mem.h>
 #include <ccan/noerr/noerr.h>
 #include <ccan/opt/opt.h>
-#include <ccan/opt/private.h>
 #include <ccan/read_write_all/read_write_all.h>
 #include <ccan/str/hex/hex.h>
-#include <ccan/tal/grab_file/grab_file.h>
 #include <ccan/tal/path/path.h>
 #include <ccan/tal/str/str.h>
 #include <common/codex32.h>
 #include <common/configdir.h>
 #include <common/configvar.h>
 #include <common/errcode.h>
-#include <common/features.h>
 #include <common/hsm_encryption.h>
-#include <common/json_command.h>
-#include <common/json_param.h>
 #include <common/version.h>
-#include <common/wireaddr.h>
 #include <dirent.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <hsmd/hsmd_wiregen.h>
 #include <lightningd/chaintopology.h>
 #include <lightningd/feerate.h>
-#include <lightningd/hsm_control.h>
 #include <lightningd/options.h>
 #include <lightningd/plugin.h>
 #include <lightningd/subd.h>
-#include <sys/stat.h>
 #include <sys/wait.h>
+#include <unistd.h>
 
 /* FIXME: Put into ccan/time. */
 #define TIME_FROM_SEC(sec) { { .tv_nsec = 0, .tv_sec = sec } }
diff --git a/lightningd/pay.c b/lightningd/pay.c
index bd85e732d..c1b277185 100644
--- a/lightningd/pay.c
+++ b/lightningd/pay.c
@@ -4,19 +4,15 @@
 #include <ccan/tal/str/str.h>
 #include <common/blinding.h>
 #include <common/bolt12_merkle.h>
-#include <common/configdir.h>
 #include <common/json_command.h>
-#include <common/json_param.h>
 #include <common/onion_decode.h>
 #include <common/onionreply.h>
 #include <common/route.h>
 #include <common/timeout.h>
-#include <lightningd/chaintopology.h>
 #include <lightningd/channel.h>
 #include <lightningd/invoice.h>
 #include <lightningd/notification.h>
 #include <lightningd/pay.h>
-#include <lightningd/peer_control.h>
 #include <lightningd/peer_htlcs.h>
 #include <wallet/invoices.h>
 
diff --git a/lightningd/peer_control.c b/lightningd/peer_control.c
index 98f596b2e..7ecd01a6b 100644
--- a/lightningd/peer_control.c
+++ b/lightningd/peer_control.c
@@ -1,46 +1,22 @@
 #include "config.h"
-#include <arpa/inet.h>
 #include <bitcoin/feerate.h>
 #include <bitcoin/script.h>
-#include <bitcoin/tx.h>
 #include <ccan/array_size/array_size.h>
 #include <ccan/asort/asort.h>
-#include <ccan/cast/cast.h>
-#include <ccan/io/io.h>
-#include <ccan/mem/mem.h>
-#include <ccan/noerr/noerr.h>
-#include <ccan/str/str.h>
-#include <ccan/take/take.h>
 #include <ccan/tal/str/str.h>
 #include <channeld/channeld_wiregen.h>
 #include <common/addr.h>
-#include <common/closing_fee.h>
-#include <common/configdir.h>
-#include <common/dev_disconnect.h>
-#include <common/features.h>
 #include <common/htlc_trim.h>
 #include <common/initial_commit_tx.h>
 #include <common/json_channel_type.h>
 #include <common/json_command.h>
-#include <common/json_param.h>
-#include <common/jsonrpc_errors.h>
-#include <common/key_derive.h>
-#include <common/scb_wiregen.h>
-#include <common/shutdown_scriptpubkey.h>
-#include <common/status.h>
 #include <common/timeout.h>
-#include <common/utils.h>
 #include <common/version.h>
 #include <common/wire_error.h>
 #include <connectd/connectd_wiregen.h>
 #include <errno.h>
-#include <fcntl.h>
-#include <gossipd/gossipd_wiregen.h>
 #include <hsmd/hsmd_wiregen.h>
-#include <inttypes.h>
 #include <lightningd/anchorspend.h>
-#include <lightningd/bitcoind.h>
-#include <lightningd/chaintopology.h>
 #include <lightningd/channel.h>
 #include <lightningd/channel_control.h>
 #include <lightningd/channel_gossip.h>
@@ -48,30 +24,20 @@
 #include <lightningd/closing_control.h>
 #include <lightningd/connect_control.h>
 #include <lightningd/dual_open_control.h>
-#include <lightningd/gossip_control.h>
 #include <lightningd/hsm_control.h>
-#include <lightningd/jsonrpc.h>
-#include <lightningd/lightningd.h>
-#include <lightningd/log.h>
 #include <lightningd/memdump.h>
 #include <lightningd/notification.h>
 #include <lightningd/onchain_control.h>
 #include <lightningd/opening_common.h>
 #include <lightningd/opening_control.h>
-#include <lightningd/options.h>
 #include <lightningd/peer_control.h>
 #include <lightningd/peer_fd.h>
 #include <lightningd/peer_htlcs.h>
 #include <lightningd/plugin_hook.h>
-#include <lightningd/subd.h>
-#include <limits.h>
 #include <onchaind/onchaind_wiregen.h>
 #include <openingd/dualopend_wiregen.h>
 #include <openingd/openingd_wiregen.h>
-#include <stdlib.h>
 #include <unistd.h>
-#include <wally_bip32.h>
-#include <wire/wire_sync.h>
 
 /* FIXME: Reorder! */
 static void peer_disconnected(struct lightningd *ld,
diff --git a/lightningd/peer_htlcs.c b/lightningd/peer_htlcs.c
index da93db881..6dea60182 100644
--- a/lightningd/peer_htlcs.c
+++ b/lightningd/peer_htlcs.c
@@ -3,32 +3,20 @@
 #include <ccan/mem/mem.h>
 #include <ccan/tal/str/str.h>
 #include <channeld/channeld_wiregen.h>
-#include <common/bigsize.h>
 #include <common/blinding.h>
-#include <common/configdir.h>
 #include <common/ecdh.h>
 #include <common/json_command.h>
-#include <common/json_param.h>
 #include <common/onion_decode.h>
 #include <common/onionreply.h>
 #include <common/timeout.h>
-#include <connectd/connectd_wiregen.h>
 #include <db/exec.h>
-#include <gossipd/gossipd_wiregen.h>
-#include <lightningd/chaintopology.h>
 #include <lightningd/channel.h>
 #include <lightningd/coin_mvts.h>
 #include <lightningd/notification.h>
-#include <lightningd/pay.h>
-#include <lightningd/peer_control.h>
 #include <lightningd/peer_htlcs.h>
 #include <lightningd/plugin_hook.h>
 #include <lightningd/subd.h>
 #include <onchaind/onchaind_wiregen.h>
-#include <stdio.h>
-#include <wire/onion_wiregen.h>
-#include <wire/peer_wiregen.h>
-#include <wire/tlvstream.h>
 
 #ifndef SUPERVERBOSE
 #define SUPERVERBOSE(...)
diff --git a/lightningd/ping.c b/lightningd/ping.c
index 45ceb3323..b348eec53 100644
--- a/lightningd/ping.c
+++ b/lightningd/ping.c
@@ -1,12 +1,9 @@
 #include "config.h"
 #include <common/json_command.h>
-#include <common/json_param.h>
 #include <connectd/connectd_wiregen.h>
 #include <inttypes.h>
-#include <lightningd/channel.h>
 #include <lightningd/jsonrpc.h>
 #include <lightningd/lightningd.h>
-#include <lightningd/peer_control.h>
 #include <lightningd/ping.h>
 #include <lightningd/subd.h>
 
diff --git a/lightningd/plugin.c b/lightningd/plugin.c
index 42718c27b..cb38c8484 100644
--- a/lightningd/plugin.c
+++ b/lightningd/plugin.c
@@ -5,17 +5,13 @@
 #include <ccan/io/io.h>
 #include <ccan/json_escape/json_escape.h>
 #include <ccan/json_out/json_out.h>
-#include <ccan/mem/mem.h>
-#include <ccan/opt/opt.h>
 #include <ccan/pipecmd/pipecmd.h>
 #include <ccan/read_write_all/read_write_all.h>
 #include <ccan/tal/path/path.h>
 #include <ccan/tal/str/str.h>
 #include <ccan/utf8/utf8.h>
-#include <common/configdir.h>
 #include <common/configvar.h>
 #include <common/deprecation.h>
-#include <common/features.h>
 #include <common/json_command.h>
 #include <common/memleak.h>
 #include <common/plugin.h>
@@ -32,7 +28,6 @@
 #include <lightningd/plugin_control.h>
 #include <lightningd/plugin_hook.h>
 #include <lightningd/subd.h>
-#include <sys/stat.h>
 
 /* Only this file can include this generated header! */
 # include <plugins/list_of_builtin_plugins_gen.h>
diff --git a/lightningd/plugin_control.c b/lightningd/plugin_control.c
index 2f8bb4ed0..89073f990 100644
--- a/lightningd/plugin_control.c
+++ b/lightningd/plugin_control.c
@@ -2,7 +2,6 @@
 #include <ccan/tal/path/path.h>
 #include <ccan/tal/str/str.h>
 #include <common/json_command.h>
-#include <common/json_param.h>
 #include <common/memleak.h>
 #include <common/timeout.h>
 #include <errno.h>
diff --git a/lightningd/plugin_hook.c b/lightningd/plugin_hook.c
index cd69b794d..934fa1635 100644
--- a/lightningd/plugin_hook.c
+++ b/lightningd/plugin_hook.c
@@ -1,7 +1,5 @@
 #include "config.h"
 #include <ccan/io/io.h>
-#include <ccan/tal/str/str.h>
-#include <common/json_parse.h>
 #include <common/memleak.h>
 #include <db/exec.h>
 #include <db/utils.h>
diff --git a/lightningd/routehint.c b/lightningd/routehint.c
index 5c0d80a43..27264f65e 100644
--- a/lightningd/routehint.c
+++ b/lightningd/routehint.c
@@ -1,10 +1,6 @@
 #include "config.h"
-#include <common/bolt11.h>
-#include <common/json_parse.h>
-#include <gossipd/gossipd_wiregen.h>
 #include <lightningd/channel.h>
 #include <lightningd/lightningd.h>
-#include <lightningd/peer_control.h>
 #include <lightningd/routehint.h>
 
 static bool scid_in_arr(const struct short_channel_id *scidarr,
diff --git a/lightningd/runes.c b/lightningd/runes.c
index 908549783..70821bcb9 100644
--- a/lightningd/runes.c
+++ b/lightningd/runes.c
@@ -2,24 +2,16 @@
 #include <ccan/array_size/array_size.h>
 #include <ccan/bitmap/bitmap.h>
 #include <ccan/json_escape/json_escape.h>
-#include <ccan/rune/rune.h>
 #include <ccan/tal/str/str.h>
 #include <common/bolt12.h>
-#include <common/configdir.h>
 #include <common/json_command.h>
-#include <common/json_param.h>
-#include <common/json_stream.h>
-#include <common/memleak.h>
 #include <common/overflows.h>
-#include <common/timeout.h>
-#include <db/exec.h>
 #include <hsmd/hsmd_wiregen.h>
 #include <inttypes.h>
 #include <lightningd/hsm_control.h>
 #include <lightningd/jsonrpc.h>
 #include <lightningd/lightningd.h>
 #include <lightningd/runes.h>
-#include <wallet/wallet.h>
 
 /* "640k should be enough for anybody!" */
 #define MAX_BLACKLIST_NUM 100000000
diff --git a/lightningd/signmessage.c b/lightningd/signmessage.c
index 7ecc8423e..b13e4f86a 100644
--- a/lightningd/signmessage.c
+++ b/lightningd/signmessage.c
@@ -1,9 +1,6 @@
 #include "config.h"
 #include <common/bech32.h>
-#include <common/configdir.h>
 #include <common/json_command.h>
-#include <common/json_param.h>
-#include <errno.h>
 #include <hsmd/hsmd_wiregen.h>
 #include <lightningd/hsm_control.h>
 #include <lightningd/plugin.h>
diff --git a/lightningd/subd.c b/lightningd/subd.c
index c3f59f01b..744d61529 100644
--- a/lightningd/subd.c
+++ b/lightningd/subd.c
@@ -18,7 +18,6 @@
 #include <lightningd/log_status.h>
 #include <lightningd/peer_fd.h>
 #include <lightningd/subd.h>
-#include <sys/socket.h>
 #include <sys/wait.h>
 #include <wire/wire_io.h>
 
diff --git a/lightningd/test/run-find_my_abspath.c b/lightningd/test/run-find_my_abspath.c
index 1d7067c80..7f15dc1b8 100644
--- a/lightningd/test/run-find_my_abspath.c
+++ b/lightningd/test/run-find_my_abspath.c
@@ -6,6 +6,7 @@ int unused_main(int argc, char *argv[]);
 #include "../subd.c"
 #include <common/json_command.h>
 #include <common/setup.h>
+#include <hsmd/hsmd_wiregen.h>
 
 /* AUTOGENERATED MOCKS START */
 /* Generated stub for begin_topology */
diff --git a/onchaind/onchaind.c b/onchaind/onchaind.c
index 024aaf4a0..5f2ad78df 100644
--- a/onchaind/onchaind.c
+++ b/onchaind/onchaind.c
@@ -1,5 +1,4 @@
 #include "config.h"
-#include <bitcoin/feerate.h>
 #include <bitcoin/script.h>
 #include <ccan/array_size/array_size.h>
 #include <ccan/asort/asort.h>
@@ -11,9 +10,7 @@
 #include <common/keyset.h>
 #include <common/lease_rates.h>
 #include <common/memleak.h>
-#include <common/overflows.h>
 #include <common/peer_billboard.h>
-#include <common/psbt_keypath.h>
 #include <common/status.h>
 #include <common/subdaemon.h>
 #include <hsmd/hsmd_wiregen.h>
@@ -21,7 +18,6 @@
 #include <onchaind/onchain_types.h>
 #include <onchaind/onchaind_wiregen.h>
 #include <unistd.h>
-#include <wally_bip32.h>
 #include <wire/wire_sync.h>
   #include "onchain_types_names_gen.h"
 
diff --git a/openingd/common.c b/openingd/common.c
index 78c72f908..d57bd835d 100644
--- a/openingd/common.c
+++ b/openingd/common.c
@@ -1,7 +1,6 @@
 #include "config.h"
 #include <ccan/ccan/tal/str/str.h>
 #include <common/channel_config.h>
-#include <common/features.h>
 #include <common/initial_commit_tx.h>
 #include <common/shutdown_scriptpubkey.h>
 #include <common/status.h>
diff --git a/openingd/dualopend.c b/openingd/dualopend.c
index eeca9056a..9ac43d87a 100644
--- a/openingd/dualopend.c
+++ b/openingd/dualopend.c
@@ -19,15 +19,12 @@
 #include <ccan/tal/str/str.h>
 #include <common/billboard.h>
 #include <common/blockheight_states.h>
-#include <common/channel_type.h>
-#include <common/gossip_store.h>
 #include <common/initial_channel.h>
 #include <common/lease_rates.h>
 #include <common/memleak.h>
 #include <common/peer_billboard.h>
 #include <common/peer_failed.h>
 #include <common/peer_io.h>
-#include <common/peer_status_wiregen.h>
 #include <common/per_peer_state.h>
 #include <common/psbt_internal.h>
 #include <common/psbt_open.h>
diff --git a/openingd/openingd.c b/openingd/openingd.c
index 23331faff..7a86218b3 100644
--- a/openingd/openingd.c
+++ b/openingd/openingd.c
@@ -12,9 +12,7 @@
 #include <ccan/array_size/array_size.h>
 #include <ccan/breakpoint/breakpoint.h>
 #include <ccan/tal/str/str.h>
-#include <common/channel_type.h>
 #include <common/fee_states.h>
-#include <common/gossip_store.h>
 #include <common/initial_channel.h>
 #include <common/memleak.h>
 #include <common/peer_billboard.h>
@@ -25,7 +23,6 @@
 #include <common/status.h>
 #include <common/subdaemon.h>
 #include <common/wire_error.h>
-#include <errno.h>
 #include <hsmd/hsmd_wiregen.h>
 #include <openingd/common.h>
 #include <openingd/openingd_wiregen.h>
diff --git a/plugins/autoclean.c b/plugins/autoclean.c
index 8be8ce2b6..f15612522 100644
--- a/plugins/autoclean.c
+++ b/plugins/autoclean.c
@@ -1,7 +1,6 @@
 #include "config.h"
 #include <ccan/array_size/array_size.h>
 #include <ccan/mem/mem.h>
-#include <ccan/ptrint/ptrint.h>
 #include <ccan/tal/str/str.h>
 #include <common/json_param.h>
 #include <common/json_stream.h>
diff --git a/plugins/bcli.c b/plugins/bcli.c
index b1e655b99..656df9ffa 100644
--- a/plugins/bcli.c
+++ b/plugins/bcli.c
@@ -1,5 +1,4 @@
 #include "config.h"
-#include <bitcoin/base58.h>
 #include <ccan/array_size/array_size.h>
 #include <ccan/cast/cast.h>
 #include <ccan/io/io.h>
diff --git a/plugins/chanbackup.c b/plugins/chanbackup.c
index 034c3ecff..de298ec30 100644
--- a/plugins/chanbackup.c
+++ b/plugins/chanbackup.c
@@ -1,15 +1,11 @@
 #include "config.h"
 #include <ccan/array_size/array_size.h>
 #include <ccan/cast/cast.h>
-#include <ccan/err/err.h>
 #include <ccan/json_out/json_out.h>
 #include <ccan/noerr/noerr.h>
 #include <ccan/read_write_all/read_write_all.h>
 #include <ccan/tal/grab_file/grab_file.h>
 #include <ccan/tal/str/str.h>
-#include <ccan/time/time.h>
-#include <common/features.h>
-#include <common/hsm_encryption.h>
 #include <common/json_param.h>
 #include <common/json_stream.h>
 #include <common/memleak.h>
diff --git a/plugins/commando.c b/plugins/commando.c
index ae23d7a62..f5022be8d 100644
--- a/plugins/commando.c
+++ b/plugins/commando.c
@@ -1,18 +1,13 @@
 #include "config.h"
 #include <ccan/array_size/array_size.h>
 #include <ccan/cast/cast.h>
-#include <ccan/crypto/siphash24/siphash24.h>
-#include <ccan/htable/htable_type.h>
-#include <ccan/json_escape/json_escape.h>
 #include <ccan/json_out/json_out.h>
 #include <ccan/mem/mem.h>
 #include <ccan/rune/rune.h>
 #include <ccan/tal/str/str.h>
-#include <ccan/time/time.h>
 #include <common/json_param.h>
 #include <common/json_stream.h>
 #include <common/memleak.h>
-#include <common/pseudorand.h>
 #include <inttypes.h>
 #include <plugins/libplugin.h>
 
diff --git a/plugins/establish_onion_path.c b/plugins/establish_onion_path.c
index c74bc4430..f3213bdc8 100644
--- a/plugins/establish_onion_path.c
+++ b/plugins/establish_onion_path.c
@@ -1,9 +1,7 @@
 #include "config.h"
-#include <ccan/tal/str/str.h>
 #include <common/dijkstra.h>
 #include <common/features.h>
 #include <common/gossmap.h>
-#include <common/gossmods_listpeerchannels.h>
 #include <common/json_stream.h>
 #include <common/route.h>
 #include <plugins/establish_onion_path.h>
diff --git a/plugins/exposesecret.c b/plugins/exposesecret.c
index ea50fa03c..ed944cd6d 100644
--- a/plugins/exposesecret.c
+++ b/plugins/exposesecret.c
@@ -1,8 +1,6 @@
 #include "config.h"
-#include <bitcoin/privkey.h>
 #include <ccan/array_size/array_size.h>
 #include <ccan/crypto/hkdf_sha256/hkdf_sha256.h>
-#include <ccan/crypto/sha256/sha256.h>
 #include <ccan/tal/grab_file/grab_file.h>
 #include <ccan/tal/str/str.h>
 #include <common/bech32.h>
diff --git a/plugins/fetchinvoice.c b/plugins/fetchinvoice.c
index 10362e8aa..a18b82e18 100644
--- a/plugins/fetchinvoice.c
+++ b/plugins/fetchinvoice.c
@@ -1,32 +1,20 @@
 #include "config.h"
-#include <bitcoin/chainparams.h>
-#include <ccan/array_size/array_size.h>
-#include <ccan/cast/cast.h>
 #include <ccan/json_out/json_out.h>
 #include <ccan/mem/mem.h>
 #include <ccan/str/hex/hex.h>
 #include <ccan/tal/str/str.h>
-#include <common/blindedpath.h>
 #include <common/bolt12_id.h>
 #include <common/bolt12_merkle.h>
-#include <common/dijkstra.h>
 #include <common/features.h>
 #include <common/gossmap.h>
-#include <common/gossmods_listpeerchannels.h>
 #include <common/json_param.h>
 #include <common/json_stream.h>
-#include <common/memleak.h>
 #include <common/onion_message.h>
 #include <common/overflows.h>
-#include <common/route.h>
-#include <common/utils.h>
-#include <errno.h>
 #include <inttypes.h>
 #include <plugins/establish_onion_path.h>
 #include <plugins/fetchinvoice.h>
-#include <plugins/libplugin.h>
 #include <plugins/offers.h>
-#include <secp256k1_schnorrsig.h>
 #include <sodium.h>
 
 static LIST_HEAD(sent_list);
diff --git a/plugins/funder.c b/plugins/funder.c
index af2997b3e..15ab3f100 100644
--- a/plugins/funder.c
+++ b/plugins/funder.c
@@ -12,7 +12,6 @@
 #include <ccan/tal/str/str.h>
 #include <common/json_param.h>
 #include <common/json_stream.h>
-#include <common/lease_rates.h>
 #include <common/memleak.h>
 #include <common/overflows.h>
 #include <common/psbt_open.h>
diff --git a/plugins/funder_policy.c b/plugins/funder_policy.c
index 1ce2cefc8..fc84e8fce 100644
--- a/plugins/funder_policy.c
+++ b/plugins/funder_policy.c
@@ -4,7 +4,6 @@
 #include <ccan/tal/str/str.h>
 #include <common/json_stream.h>
 #include <common/lease_rates.h>
-#include <common/pseudorand.h>
 #include <inttypes.h>
 #include <plugins/funder_policy.h>
 
diff --git a/plugins/keysend.c b/plugins/keysend.c
index 79a6600da..aed5511fe 100644
--- a/plugins/keysend.c
+++ b/plugins/keysend.c
@@ -1,15 +1,12 @@
 #include "config.h"
-#include <bitcoin/preimage.h>
 #include <ccan/array_size/array_size.h>
 #include <ccan/asort/asort.h>
 #include <ccan/cast/cast.h>
 #include <ccan/tal/str/str.h>
 #include <common/features.h>
-#include <common/gossmap.h>
 #include <common/json_param.h>
 #include <common/json_stream.h>
 #include <common/memleak.h>
-#include <errno.h>
 #include <inttypes.h>
 #include <plugins/channel_hint.h>
 #include <plugins/libplugin-pay.h>
diff --git a/plugins/libplugin-pay.c b/plugins/libplugin-pay.c
index 9b3bd5fd9..919ca7de3 100644
--- a/plugins/libplugin-pay.c
+++ b/plugins/libplugin-pay.c
@@ -1,5 +1,4 @@
 #include "config.h"
-#include <ccan/array_size/array_size.h>
 #include <ccan/mem/mem.h>
 #include <ccan/tal/str/str.h>
 #include <common/blindedpay.h>
@@ -11,7 +10,6 @@
 #include <common/gossmods_listpeerchannels.h>
 #include <common/json_stream.h>
 #include <common/memleak.h>
-#include <common/pseudorand.h>
 #include <common/random_select.h>
 #include <common/route.h>
 #include <common/trace.h>
@@ -20,8 +18,6 @@
 #include <math.h>
 #include <plugins/channel_hint.h>
 #include <plugins/libplugin-pay.h>
-#include <stdio.h>
-#include <sys/types.h>
 #include <wire/peer_wire.h>
 
 static struct gossmap *global_gossmap;
diff --git a/plugins/libplugin.c b/plugins/libplugin.c
index 6e7402604..3d3570087 100644
--- a/plugins/libplugin.c
+++ b/plugins/libplugin.c
@@ -1,6 +1,4 @@
 #include "config.h"
-#include <bitcoin/chainparams.h>
-#include <bitcoin/privkey.h>
 #include <ccan/io/io.h>
 #include <ccan/json_out/json_out.h>
 #include <ccan/membuf/membuf.h>
@@ -12,7 +10,6 @@
 #include <common/features.h>
 #include <common/json_filter.h>
 #include <common/json_param.h>
-#include <common/json_parse_simple.h>
 #include <common/json_stream.h>
 #include <common/memleak.h>
 #include <common/plugin.h>
@@ -22,8 +19,7 @@
 #include <inttypes.h>
 #include <plugins/libplugin.h>
 #include <stdio.h>
-#include <sys/socket.h>
-#include <sys/un.h>
+#include <unistd.h>
 
 #define READ_CHUNKSIZE 4096
 
diff --git a/plugins/offers.c b/plugins/offers.c
index 5daf8b63a..383beff08 100644
--- a/plugins/offers.c
+++ b/plugins/offers.c
@@ -1,13 +1,10 @@
 /* This plugin covers both sending and receiving offers */
 #include "config.h"
-#include <bitcoin/chainparams.h>
 #include <ccan/array_size/array_size.h>
-#include <ccan/cast/cast.h>
 #include <ccan/rune/rune.h>
 #include <ccan/tal/str/str.h>
 #include <common/bech32.h>
 #include <common/bech32_util.h>
-#include <common/bolt11.h>
 #include <common/bolt11_json.h>
 #include <common/bolt12_id.h>
 #include <common/bolt12_merkle.h>
diff --git a/plugins/offers_inv_hook.c b/plugins/offers_inv_hook.c
index 4772899fb..3e72fae0f 100644
--- a/plugins/offers_inv_hook.c
+++ b/plugins/offers_inv_hook.c
@@ -7,7 +7,6 @@
 #include <common/json_stream.h>
 #include <plugins/offers.h>
 #include <plugins/offers_inv_hook.h>
-#include <secp256k1_schnorrsig.h>
 
 /* We need to keep the reply path around so we can reply if error */
 struct inv {
diff --git a/plugins/offers_invreq_hook.c b/plugins/offers_invreq_hook.c
index 3a7574f24..153def675 100644
--- a/plugins/offers_invreq_hook.c
+++ b/plugins/offers_invreq_hook.c
@@ -1,25 +1,19 @@
 #include "config.h"
-#include <bitcoin/chainparams.h>
 #include <bitcoin/preimage.h>
 #include <ccan/cast/cast.h>
-#include <ccan/mem/mem.h>
 #include <ccan/tal/str/str.h>
 #include <common/bech32_util.h>
-#include <common/blindedpath.h>
 #include <common/bolt12_id.h>
 #include <common/bolt12_merkle.h>
 #include <common/features.h>
 #include <common/gossmap.h>
 #include <common/iso4217.h>
 #include <common/json_stream.h>
-#include <common/memleak.h>
 #include <common/onion_message.h>
 #include <common/overflows.h>
-#include <errno.h>
 #include <inttypes.h>
 #include <plugins/offers.h>
 #include <plugins/offers_invreq_hook.h>
-#include <secp256k1_schnorrsig.h>
 #include <sodium.h>
 
 /* We need to keep the reply path around so we can reply with invoice */
diff --git a/plugins/offers_offer.c b/plugins/offers_offer.c
index 77eae2c9b..34b6844d4 100644
--- a/plugins/offers_offer.c
+++ b/plugins/offers_offer.c
@@ -1,7 +1,5 @@
 #include "config.h"
-#include <bitcoin/chainparams.h>
 #include <ccan/array_size/array_size.h>
-#include <ccan/tal/str/str.h>
 #include <common/bolt12.h>
 #include <common/bolt12_id.h>
 #include <common/features.h>
diff --git a/plugins/pay.c b/plugins/pay.c
index 20de6e1b0..ba1353a54 100644
--- a/plugins/pay.c
+++ b/plugins/pay.c
@@ -1,12 +1,6 @@
 #include "config.h"
-#include <bitcoin/chainparams.h>
 #include <ccan/array_size/array_size.h>
-#include <ccan/asort/asort.h>
 #include <ccan/cast/cast.h>
-#include <ccan/crypto/siphash24/siphash24.h>
-#include <ccan/htable/htable_type.h>
-#include <ccan/json_out/json_out.h>
-#include <ccan/str/hex/hex.h>
 #include <ccan/tal/str/str.h>
 #include <common/bolt12_merkle.h>
 #include <common/features.h>
@@ -14,10 +8,8 @@
 #include <common/json_param.h>
 #include <common/json_stream.h>
 #include <common/memleak.h>
-#include <common/pseudorand.h>
 #include <plugins/channel_hint.h>
 #include <plugins/libplugin-pay.h>
-#include <plugins/libplugin.h>
 #include <stdio.h>
 
 /* Public key of this node. */
diff --git a/plugins/recklessrpc.c b/plugins/recklessrpc.c
index 3c86a0824..510a3e55d 100644
--- a/plugins/recklessrpc.c
+++ b/plugins/recklessrpc.c
@@ -5,15 +5,14 @@
 #include <ccan/array_size/array_size.h>
 #include <ccan/io/io.h>
 #include <ccan/pipecmd/pipecmd.h>
-#include <ccan/str/str.h>
 #include <ccan/tal/str/str.h>
 #include <common/json_param.h>
-#include <common/json_parse_simple.h>
 #include <common/json_stream.h>
 #include <common/memleak.h>
 #include <errno.h>
 #include <plugins/libplugin.h>
 #include <signal.h>
+#include <unistd.h>
 
 static struct plugin *plugin;
 
diff --git a/plugins/recover.c b/plugins/recover.c
index fcc7b74f8..850f85d45 100644
--- a/plugins/recover.c
+++ b/plugins/recover.c
@@ -1,14 +1,10 @@
 #include "config.h"
 #include <ccan/array_size/array_size.h>
-#include <common/features.h>
 #include <common/gossmap.h>
-#include <common/hsm_encryption.h>
-#include <common/json_param.h>
 #include <common/json_stream.h>
 #include <common/memleak.h>
 #include <errno.h>
 #include <plugins/libplugin.h>
-#include <unistd.h>
 
 /* How long to wait after startup before starting the timer loop */
 #define STARTUP_TIME 2
diff --git a/plugins/sql.c b/plugins/sql.c
index a1c361da2..ca622c08f 100644
--- a/plugins/sql.c
+++ b/plugins/sql.c
@@ -2,7 +2,6 @@
 #include "config.h"
 #include <ccan/array_size/array_size.h>
 #include <ccan/err/err.h>
-#include <ccan/strmap/strmap.h>
 #include <ccan/tal/str/str.h>
 #include <common/deprecation.h>
 #include <common/gossip_store.h>
@@ -16,8 +15,6 @@
 #include <plugins/libplugin.h>
 #include <sqlite3.h>
 #include <stdio.h>
-#include <sys/stat.h>
-#include <sys/types.h>
 #include <unistd.h>
 
 /* Minimized schemas.  C23 #embed, Where Art Thou? */
diff --git a/plugins/test/run-route-calc.c b/plugins/test/run-route-calc.c
index 025c984b9..de62e9815 100644
--- a/plugins/test/run-route-calc.c
+++ b/plugins/test/run-route-calc.c
@@ -4,6 +4,7 @@
 #include "../../common/dijkstra.c"
 #include "../libplugin-pay.c"
 #include <bitcoin/chainparams.h>
+#include <ccan/array_size/array_size.h>
 #include <ccan/crc32c/crc32c.h>
 #include <common/gossip_store.h>
 #include <common/setup.h>
diff --git a/plugins/topology.c b/plugins/topology.c
index 4a440846b..944180de5 100644
--- a/plugins/topology.c
+++ b/plugins/topology.c
@@ -1,7 +1,5 @@
 #include "config.h"
 #include <ccan/array_size/array_size.h>
-#include <ccan/crypto/siphash24/siphash24.h>
-#include <ccan/htable/htable_type.h>
 #include <ccan/json_escape/json_escape.h>
 #include <ccan/tal/str/str.h>
 #include <common/dijkstra.h>
@@ -10,9 +8,7 @@
 #include <common/json_param.h>
 #include <common/json_stream.h>
 #include <common/memleak.h>
-#include <common/pseudorand.h>
 #include <common/route.h>
-#include <common/wireaddr.h>
 #include <errno.h>
 #include <inttypes.h>
 #include <plugins/libplugin.h>
diff --git a/plugins/txprepare.c b/plugins/txprepare.c
index a0cbd1bf2..d1be784e9 100644
--- a/plugins/txprepare.c
+++ b/plugins/txprepare.c
@@ -1,15 +1,11 @@
 #include "config.h"
 #include <bitcoin/psbt.h>
-#include <bitcoin/script.h>
 #include <ccan/array_size/array_size.h>
-#include <common/addr.h>
 #include <common/json_param.h>
 #include <common/json_stream.h>
 #include <common/memleak.h>
 #include <common/psbt_open.h>
-#include <common/pseudorand.h>
 #include <plugins/libplugin.h>
-#include <wally_psbt.h>
 
 struct tx_output {
 	struct amount_sat amount;
diff --git a/tools/hsmtool.c b/tools/hsmtool.c
index 484ef2b4c..1352bd807 100644
--- a/tools/hsmtool.c
+++ b/tools/hsmtool.c
@@ -1,5 +1,4 @@
 #include "config.h"
-#include <bitcoin/tx.h>
 #include <ccan/array_size/array_size.h>
 #include <ccan/crypto/hkdf_sha256/hkdf_sha256.h>
 #include <ccan/err/err.h>
@@ -12,13 +11,11 @@
 #include <common/bech32.h>
 #include <common/bech32_util.h>
 #include <common/codex32.h>
-#include <common/configdir.h>
 #include <common/derive_basepoints.h>
 #include <common/descriptor_checksum.h>
 #include <common/errcode.h>
 #include <common/hsm_encryption.h>
 #include <common/key_derive.h>
-#include <common/node_id.h>
 #include <common/utils.h>
 #include <common/utxo.h>
 #include <errno.h>
diff --git a/wallet/account_migration.c b/wallet/account_migration.c
index e26d52111..b1de096bb 100644
--- a/wallet/account_migration.c
+++ b/wallet/account_migration.c
@@ -11,7 +11,6 @@
 #include <lightningd/lightningd.h>
 #include <unistd.h>
 #include <wallet/account_migration.h>
-#include <wallet/wallet.h>
 
 /* These functions and definitions copied almost exactly from old
  * plugins/bkpr/{recorder.c,chain_event.h,channel_event.h}
diff --git a/wallet/db.c b/wallet/db.c
index eb0ae7bed..245734961 100644
--- a/wallet/db.c
+++ b/wallet/db.c
@@ -1,11 +1,7 @@
 #include "config.h"
 #include <bitcoin/script.h>
 #include <ccan/array_size/array_size.h>
-#include <ccan/build_assert/build_assert.h>
-#include <ccan/mem/mem.h>
 #include <ccan/tal/str/str.h>
-#include <common/bolt11.h>
-#include <common/key_derive.h>
 #include <common/version.h>
 #include <db/bindings.h>
 #include <db/common.h>
@@ -16,12 +12,9 @@
 #include <lightningd/channel.h>
 #include <lightningd/hsm_control.h>
 #include <lightningd/plugin_hook.h>
-#include <sodium/randombytes.h>
-#include <stddef.h>
 #include <wallet/account_migration.h>
 #include <wallet/db.h>
 #include <wallet/psbt_fixup.h>
-#include <wire/peer_wire.h>
 #include <wire/wire_sync.h>
 
 struct migration {
diff --git a/wallet/invoices.c b/wallet/invoices.c
index 1655c8f96..0376f179c 100644
--- a/wallet/invoices.c
+++ b/wallet/invoices.c
@@ -7,7 +7,6 @@
 #include <db/utils.h>
 #include <lightningd/invoice.h>
 #include <lightningd/lightningd.h>
-#include <lightningd/wait.h>
 #include <wallet/invoices.h>
 
 struct invoice_waiter {
diff --git a/wallet/psbt_fixup.c b/wallet/psbt_fixup.c
index b5509635d..1c15946ce 100644
--- a/wallet/psbt_fixup.c
+++ b/wallet/psbt_fixup.c
@@ -6,11 +6,8 @@
  * As of libwally 0.88 (and perhaps 0.87?) it will refuse to load them.
  */
 #include "config.h"
-#include <bitcoin/pubkey.h>
 #include <bitcoin/signature.h>
-#include <ccan/array_size/array_size.h>
 #include <ccan/endian/endian.h>
-#include <ccan/mem/mem.h>
 #include <common/utils.h>
 #include <wallet/psbt_fixup.h>
 #include <wire/wire.h>
diff --git a/wallet/reservation.c b/wallet/reservation.c
index 23cdaad5b..dd1bebb29 100644
--- a/wallet/reservation.c
+++ b/wallet/reservation.c
@@ -3,11 +3,7 @@
 #include <bitcoin/psbt.h>
 #include <bitcoin/script.h>
 #include <ccan/cast/cast.h>
-#include <ccan/mem/mem.h>
-#include <common/configdir.h>
 #include <common/json_command.h>
-#include <common/json_param.h>
-#include <common/key_derive.h>
 #include <common/psbt_open.h>
 #include <lightningd/chaintopology.h>
 #include <lightningd/channel.h>
@@ -16,7 +12,6 @@
 #include <lightningd/jsonrpc.h>
 #include <lightningd/lightningd.h>
 #include <wallet/txfilter.h>
-#include <wally_psbt.h>
 
 /* 12 hours is usually enough reservation time */
 #define RESERVATION_DEFAULT (6 * 12)
diff --git a/wallet/test/run-psbt_fixup.c b/wallet/test/run-psbt_fixup.c
index ac63f25bb..5af0ad531 100644
--- a/wallet/test/run-psbt_fixup.c
+++ b/wallet/test/run-psbt_fixup.c
@@ -3,6 +3,7 @@
 #include <assert.h>
 #include <bitcoin/chainparams.h>
 #include <bitcoin/psbt.h>
+#include <ccan/array_size/array_size.h>
 #include <ccan/cast/cast.h>
 #include <common/setup.h>
 #include <stdio.h>
diff --git a/wallet/txfilter.c b/wallet/txfilter.c
index b96228611..a8b32db6b 100644
--- a/wallet/txfilter.c
+++ b/wallet/txfilter.c
@@ -1,9 +1,6 @@
 #include "config.h"
 #include <bitcoin/script.h>
-#include <ccan/crypto/siphash24/siphash24.h>
-#include <ccan/mem/mem.h>
 #include <common/memleak.h>
-#include <common/pseudorand.h>
 #include <common/utils.h>
 #include <wallet/txfilter.h>
 #include <wallet/wallet.h>
diff --git a/wallet/wallet.c b/wallet/wallet.c
index 599e2f920..d2dc7d08b 100644
--- a/wallet/wallet.c
+++ b/wallet/wallet.c
@@ -5,8 +5,6 @@
 #include <ccan/mem/mem.h>
 #include <ccan/tal/str/str.h>
 #include <channeld/channeld_wiregen.h>
-#include <common/blockheight_states.h>
-#include <common/fee_states.h>
 #include <common/memleak.h>
 #include <common/onionreply.h>
 #include <common/trace.h>
@@ -14,20 +12,17 @@
 #include <db/common.h>
 #include <db/exec.h>
 #include <db/utils.h>
-#include <lightningd/chaintopology.h>
 #include <lightningd/channel.h>
 #include <lightningd/channel_gossip.h>
 #include <lightningd/closed_channel.h>
 #include <lightningd/coin_mvts.h>
 #include <lightningd/notification.h>
-#include <lightningd/peer_control.h>
 #include <lightningd/peer_htlcs.h>
 #include <lightningd/runes.h>
 #include <onchaind/onchaind_wiregen.h>
 #include <wallet/invoices.h>
 #include <wallet/txfilter.h>
 #include <wallet/wallet.h>
-#include <wally_bip32.h>
 
 #define SQLITE_MAX_UINT 0x7FFFFFFFFFFFFFFF
 #define DIRECTION_INCOMING 0
diff --git a/wallet/walletrpc.c b/wallet/walletrpc.c
index 677db8bab..6155c899e 100644
--- a/wallet/walletrpc.c
+++ b/wallet/walletrpc.c
@@ -1,30 +1,19 @@
 #include "config.h"
-#include <bitcoin/base58.h>
 #include <bitcoin/script.h>
-#include <ccan/array_size/array_size.h>
-#include <ccan/cast/cast.h>
 #include <common/addr.h>
 #include <common/base64.h>
 #include <common/bech32.h>
-#include <common/configdir.h>
 #include <common/json_command.h>
-#include <common/json_param.h>
-#include <common/key_derive.h>
 #include <common/psbt_keypath.h>
 #include <common/psbt_open.h>
 #include <db/exec.h>
 #include <errno.h>
 #include <hsmd/hsmd_wiregen.h>
-#include <lightningd/chaintopology.h>
 #include <lightningd/channel.h>
 #include <lightningd/hsm_control.h>
-#include <lightningd/jsonrpc.h>
-#include <lightningd/lightningd.h>
 #include <lightningd/notification.h>
-#include <lightningd/peer_control.h>
 #include <wallet/txfilter.h>
 #include <wallet/walletrpc.h>
-#include <wally_psbt.h>
 #include <wire/wire_sync.h>
 
 /* May return NULL if encoding error occurs. */
diff --git a/wire/towire.c b/wire/towire.c
index f275367e4..b90c7e3d1 100644
--- a/wire/towire.c
+++ b/wire/towire.c
@@ -2,7 +2,6 @@
 #include "wire.h"
 #include <assert.h>
 #include <ccan/crypto/siphash24/siphash24.h>
-#include <ccan/endian/endian.h>
 #include <ccan/mem/mem.h>
 #include <channeld/inflight.h>
 #include <common/utils.h>
diff --git a/wire/wire_io.c b/wire/wire_io.c
index 26051c8d5..7cbdde378 100644
--- a/wire/wire_io.c
+++ b/wire/wire_io.c
@@ -3,7 +3,6 @@
  #include <unistd.h>
 #include <ccan/io/io_plan.h>
 #include <ccan/mem/mem.h>
-#include <common/utils.h>
 #include <errno.h>
 #include <wire/wire_io.h>