diff --git a/bitcoin/base58.c b/bitcoin/base58.c
index 167453de2..05828b5b7 100644
--- a/bitcoin/base58.c
+++ b/bitcoin/base58.c
@@ -8,11 +8,7 @@
 #include "privkey.h"
 #include "pubkey.h"
 #include "shadouble.h"
-#include <assert.h>
-#include <ccan/build_assert/build_assert.h>
-#include <ccan/tal/str/str.h>
 #include <common/utils.h>
-#include <string.h>
 #include <wally_core.h>
 
 static char *to_base58(const tal_t *ctx, u8 version,
diff --git a/bitcoin/block.c b/bitcoin/block.c
index a70550625..bd8446cbd 100644
--- a/bitcoin/block.c
+++ b/bitcoin/block.c
@@ -1,12 +1,11 @@
 #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>
 #include <common/type_to_string.h>
-#include <wire/wire.h>
+#include <bitcoin/block.h>
 
 /* Sets *cursor to NULL and returns NULL when a pull fails. */
 static const u8 *pull(const u8 **cursor, size_t *max, void *copy, size_t n)
diff --git a/bitcoin/chainparams.c b/bitcoin/chainparams.c
index ed1eeaf05..9fb6d9c04 100644
--- a/bitcoin/chainparams.c
+++ b/bitcoin/chainparams.c
@@ -1,9 +1,7 @@
 #include "chainparams.h"
 #include <ccan/array_size/array_size.h>
-#include <ccan/str/str.h>
 #include <ccan/tal/str/str.h>
 #include <common/utils.h>
-#include <string.h>
 
 /* Version codes for BIP32 extended keys in libwally-core.
  * Stolen from wally_bip32.h in libwally-core*/
diff --git a/bitcoin/feerate.c b/bitcoin/feerate.c
index f02d45d64..88c4af762 100644
--- a/bitcoin/feerate.c
+++ b/bitcoin/feerate.c
@@ -1,7 +1,4 @@
 #include <bitcoin/feerate.h>
-#include <bitcoin/varint.h>
-#include <limits.h>
-#include <stdlib.h>
 
 u32 feerate_from_style(u32 feerate, enum feerate_style style)
 {
diff --git a/bitcoin/privkey.c b/bitcoin/privkey.c
index bdd83b361..e250a1313 100644
--- a/bitcoin/privkey.c
+++ b/bitcoin/privkey.c
@@ -1,6 +1,4 @@
 #include "privkey.h"
-#include <assert.h>
-#include <ccan/mem/mem.h>
 #include <ccan/str/hex/hex.h>
 #include <common/type_to_string.h>
 #include <wire/wire.h>
diff --git a/bitcoin/psbt.c b/bitcoin/psbt.c
index df76d4e6c..8075078ee 100644
--- a/bitcoin/psbt.c
+++ b/bitcoin/psbt.c
@@ -4,16 +4,11 @@
 #include <bitcoin/psbt.h>
 #include <bitcoin/pubkey.h>
 #include <bitcoin/script.h>
-#include <bitcoin/signature.h>
 #include <ccan/ccan/array_size/array_size.h>
 #include <ccan/ccan/mem/mem.h>
 #include <ccan/tal/str/str.h>
-#include <common/amount.h>
 #include <common/type_to_string.h>
-#include <common/utils.h>
-#include <string.h>
 #include <wally_psbt.h>
-#include <wally_transaction.h>
 #include <wire/wire.h>
 
 
diff --git a/bitcoin/pubkey.c b/bitcoin/pubkey.c
index acc520b1a..0b731a614 100644
--- a/bitcoin/pubkey.c
+++ b/bitcoin/pubkey.c
@@ -4,7 +4,6 @@
 #include <ccan/mem/mem.h>
 #include <ccan/str/hex/hex.h>
 #include <common/type_to_string.h>
-#include <common/utils.h>
 #include <wire/wire.h>
 
 #ifndef SUPERVERBOSE
diff --git a/bitcoin/script.c b/bitcoin/script.c
index d4b7db962..fdd05be54 100644
--- a/bitcoin/script.c
+++ b/bitcoin/script.c
@@ -4,8 +4,6 @@
 #include "pubkey.h"
 #include "script.h"
 #include <assert.h>
-#include <ccan/crypto/ripemd160/ripemd160.h>
-#include <ccan/crypto/sha256/sha256.h>
 #include <ccan/endian/endian.h>
 #include <ccan/mem/mem.h>
 #include <common/utils.h>
diff --git a/bitcoin/short_channel_id.c b/bitcoin/short_channel_id.c
index acfcfaaf2..d67004d83 100644
--- a/bitcoin/short_channel_id.c
+++ b/bitcoin/short_channel_id.c
@@ -2,7 +2,6 @@
 #include <ccan/tal/str/str.h>
 #include <common/type_to_string.h>
 #include <stdio.h>
-#include <string.h>
 #include <wire/wire.h>
 
 /* BOLT#07:
diff --git a/bitcoin/signature.c b/bitcoin/signature.c
index f007dc182..c835c680c 100644
--- a/bitcoin/signature.c
+++ b/bitcoin/signature.c
@@ -6,10 +6,8 @@
 #include "tx.h"
 #include <assert.h>
 #include <bitcoin/psbt.h>
-#include <ccan/cast/cast.h>
 #include <ccan/mem/mem.h>
 #include <common/type_to_string.h>
-#include <common/utils.h>
 #include <wire/wire.h>
 
 #undef DEBUG
diff --git a/bitcoin/test/run-bitcoin_block_from_hex.c b/bitcoin/test/run-bitcoin_block_from_hex.c
index e87b879cb..c4a23dfc9 100644
--- a/bitcoin/test/run-bitcoin_block_from_hex.c
+++ b/bitcoin/test/run-bitcoin_block_from_hex.c
@@ -5,6 +5,7 @@
 #include "../varint.c"
 #include <assert.h>
 #include <common/setup.h>
+#include <stdio.h>
 
 /* AUTOGENERATED MOCKS START */
 /* Generated stub for amount_asset_is_main */
diff --git a/bitcoin/test/run-tx-encode.c b/bitcoin/test/run-tx-encode.c
index 048472ba2..7fb160b19 100644
--- a/bitcoin/test/run-tx-encode.c
+++ b/bitcoin/test/run-tx-encode.c
@@ -7,6 +7,7 @@
 #include <ccan/str/hex/hex.h>
 #include <common/setup.h>
 #include <common/utils.h>
+#include <stdio.h>
 
 /* AUTOGENERATED MOCKS START */
 /* Generated stub for amount_asset_is_main */
diff --git a/bitcoin/tx.c b/bitcoin/tx.c
index eed329c0c..4aa490f0e 100644
--- a/bitcoin/tx.c
+++ b/bitcoin/tx.c
@@ -1,19 +1,13 @@
 #include "config.h"
 #include <assert.h>
-#include <bitcoin/block.h>
 #include <bitcoin/chainparams.h>
 #include <bitcoin/psbt.h>
 #include <bitcoin/script.h>
-#include <bitcoin/tx.h>
-#include <ccan/crypto/sha256/sha256.h>
-#include <ccan/endian/endian.h>
-#include <ccan/mem/mem.h>
-#include <ccan/read_write_all/read_write_all.h>
 #include <ccan/str/hex/hex.h>
 #include <common/type_to_string.h>
-#include <stdio.h>
 #include <wally_psbt.h>
 #include <wire/wire.h>
+#include <bitcoin/tx.h>
 
 #define SEGREGATED_WITNESS_FLAG 0x1
 
diff --git a/channeld/channeld.c b/channeld/channeld.c
index 9147b8cc9..25bdb565f 100644
--- a/channeld/channeld.c
+++ b/channeld/channeld.c
@@ -10,67 +10,39 @@
  *    reading and writing synchronously we could deadlock if we hit buffer
  *    limits, unlikely as that is.
  */
-#include <bitcoin/chainparams.h>
-#include <bitcoin/privkey.h>
-#include <bitcoin/psbt.h>
-#include <bitcoin/script.h>
-#include <ccan/array_size/array_size.h>
 #include <ccan/asort/asort.h>
 #include <ccan/cast/cast.h>
-#include <ccan/container_of/container_of.h>
-#include <ccan/crypto/hkdf_sha256/hkdf_sha256.h>
-#include <ccan/crypto/shachain/shachain.h>
-#include <ccan/err/err.h>
-#include <ccan/fdpass/fdpass.h>
 #include <ccan/mem/mem.h>
-#include <ccan/take/take.h>
 #include <ccan/tal/str/str.h>
-#include <ccan/time/time.h>
 #include <channeld/channeld_wiregen.h>
-#include <channeld/commit_tx.h>
 #include <channeld/full_channel.h>
 #include <channeld/watchtower.h>
 #include <common/billboard.h>
-#include <common/blinding.h>
-#include <common/bolt12.h>
-#include <common/channel_type.h>
-#include <common/coin_mvt.h>
 #include <common/crypto_sync.h>
 #include <common/dev_disconnect.h>
 #include <common/ecdh_hsmd.h>
-#include <common/gossip_constants.h>
 #include <common/gossip_store.h>
-#include <common/htlc_tx.h>
 #include <common/key_derive.h>
 #include <common/memleak.h>
 #include <common/msg_queue.h>
-#include <common/node_id.h>
 #include <common/onionreply.h>
 #include <common/peer_billboard.h>
 #include <common/peer_failed.h>
 #include <common/ping.h>
 #include <common/private_channel_announcement.h>
-#include <common/psbt_open.h>
 #include <common/read_peer_msg.h>
 #include <common/status.h>
 #include <common/subdaemon.h>
 #include <common/timeout.h>
 #include <common/type_to_string.h>
-#include <common/version.h>
 #include <common/wire_error.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <gossipd/gossip_store_wiregen.h>
 #include <gossipd/gossipd_peerd_wiregen.h>
 #include <hsmd/hsmd_wiregen.h>
-#include <inttypes.h>
-#include <secp256k1.h>
-#include <stdio.h>
 #include <wire/common_wiregen.h>
-#include <wire/onion_wire.h>
 #include <wire/peer_wire.h>
-#include <wire/wire.h>
-#include <wire/wire_io.h>
 #include <wire/wire_sync.h>
 
 /* stdin == requests, 3 == peer, 4 = gossip, 5 = gossip_store, 6 = HSM */
diff --git a/channeld/commit_tx.c b/channeld/commit_tx.c
index 26c8cf1f8..8f58a4a9e 100644
--- a/channeld/commit_tx.c
+++ b/channeld/commit_tx.c
@@ -1,12 +1,9 @@
 #include <bitcoin/script.h>
-#include <bitcoin/tx.h>
-#include <ccan/endian/endian.h>
 #include <channeld/commit_tx.h>
 #include <common/htlc_trim.h>
 #include <common/htlc_tx.h>
 #include <common/keyset.h>
 #include <common/permute_tx.h>
-#include <common/utils.h>
 
 #ifndef SUPERVERBOSE
 #define SUPERVERBOSE(...)
diff --git a/channeld/full_channel.c b/channeld/full_channel.c
index c355a8b76..cbf38ada4 100644
--- a/channeld/full_channel.c
+++ b/channeld/full_channel.c
@@ -1,34 +1,19 @@
 #include "config.h"
-#include <assert.h>
-#include <bitcoin/chainparams.h>
-#include <bitcoin/preimage.h>
 #include <bitcoin/psbt.h>
 #include <bitcoin/script.h>
-#include <bitcoin/tx.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 <channeld/commit_tx.h>
 #include <channeld/full_channel.h>
-#include <channeld/full_channel_error.h>
 #include <common/blockheight_states.h>
-#include <common/channel_config.h>
 #include <common/features.h>
 #include <common/fee_states.h>
-#include <common/htlc.h>
-#include <common/htlc_trim.h>
 #include <common/htlc_tx.h>
 #include <common/htlc_wire.h>
-#include <common/key_derive.h>
 #include <common/keyset.h>
 #include <common/memleak.h>
-#include <common/onionreply.h>
 #include <common/status.h>
 #include <common/type_to_string.h>
-#include <inttypes.h>
 #include <stdio.h>
-#include <string.h>
   /* Needs to be at end, since it doesn't include its own hdrs */
   #include "full_channel_error_names_gen.h"
 
diff --git a/channeld/test/run-commit_tx.c b/channeld/test/run-commit_tx.c
index 03bce950f..57d4ce234 100644
--- a/channeld/test/run-commit_tx.c
+++ b/channeld/test/run-commit_tx.c
@@ -1,6 +1,5 @@
 #include <inttypes.h>
 #include <stdio.h>
-#include <common/channel_type.h>
 #include <common/type_to_string.h>
 static bool print_superverbose;
 #define SUPERVERBOSE(...)					\
@@ -8,12 +7,9 @@ static bool print_superverbose;
 #define PRINT_ACTUAL_FEE
 #include "../commit_tx.c"
 #include <bitcoin/preimage.h>
-#include <bitcoin/privkey.h>
-#include <bitcoin/pubkey.h>
 #include <ccan/array_size/array_size.h>
 #include <ccan/err/err.h>
 #include <ccan/str/hex/hex.h>
-#include <common/amount.h>
 #include <common/channel_id.h>
 #include <common/key_derive.h>
 #include <common/setup.h>
diff --git a/channeld/test/run-full_channel.c b/channeld/test/run-full_channel.c
index 037bda5e0..bc7b3e3a8 100644
--- a/channeld/test/run-full_channel.c
+++ b/channeld/test/run-full_channel.c
@@ -5,17 +5,8 @@
 #include "../../common/keyset.c"
 #include "../full_channel.c"
 #include "../commit_tx.c"
-#include <bitcoin/preimage.h>
-#include <bitcoin/privkey.h>
-#include <bitcoin/pubkey.h>
 #include <ccan/err/err.h>
-#include <ccan/str/hex/hex.h>
-#include <common/amount.h>
 #include <common/setup.h>
-#include <common/sphinx.h>
-#include <common/type_to_string.h>
-#include <stdio.h>
-#include <wally_core.h>
 
 /* AUTOGENERATED MOCKS START */
 /* Generated stub for fromwire_bigsize */
diff --git a/channeld/watchtower.c b/channeld/watchtower.c
index efb13468e..db81121d7 100644
--- a/channeld/watchtower.c
+++ b/channeld/watchtower.c
@@ -2,11 +2,8 @@
 
 #include <bitcoin/feerate.h>
 #include <bitcoin/script.h>
-#include <bitcoin/signature.h>
-#include <bitcoin/tx.h>
 #include <common/features.h>
 #include <common/htlc_tx.h>
-#include <common/key_derive.h>
 #include <common/keyset.h>
 #include <common/status.h>
 #include <common/type_to_string.h>
diff --git a/cli/lightning-cli.c b/cli/lightning-cli.c
index c6996e6d8..743d8b8f0 100644
--- a/cli/lightning-cli.c
+++ b/cli/lightning-cli.c
@@ -2,26 +2,21 @@
  * Helper to submit via JSON-RPC and get back response.
  */
 #include "config.h"
-#include <assert.h>
 #include <ccan/asort/asort.h>
 #include <ccan/err/err.h>
 #include <ccan/json_escape/json_escape.h>
 #include <ccan/opt/opt.h>
 #include <ccan/read_write_all/read_write_all.h>
-#include <ccan/str/str.h>
 #include <ccan/tal/path/path.h>
 #include <ccan/tal/str/str.h>
 #include <common/configdir.h>
-#include <common/json.h>
 #include <common/json_command.h>
-#include <common/memleak.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/types.h>
 #include <sys/un.h>
 #include <sys/wait.h>
 #include <unistd.h>
diff --git a/cli/test/run-human-mode.c b/cli/test/run-human-mode.c
index a30828246..d0dcea17e 100644
--- a/cli/test/run-human-mode.c
+++ b/cli/test/run-human-mode.c
@@ -1,16 +1,11 @@
 #include "config.h"
-#include <assert.h>
 #include <common/amount.h>
 #include <common/bigsize.h>
 #include <common/channel_id.h>
 #include <common/json_stream.h>
 #include <common/node_id.h>
-#include <common/wireaddr.h>
 #include <fcntl.h>
 #include <sys/socket.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <unistd.h>
 
 int test_main(int argc, char *argv[]);
 ssize_t test_read(int fd, void *buf, size_t len);
diff --git a/cli/test/run-large-input.c b/cli/test/run-large-input.c
index 4e02cd487..dec5bc571 100644
--- a/cli/test/run-large-input.c
+++ b/cli/test/run-large-input.c
@@ -1,16 +1,11 @@
 #include "config.h"
-#include <assert.h>
 #include <common/amount.h>
 #include <common/bigsize.h>
 #include <common/channel_id.h>
 #include <common/json_stream.h>
 #include <common/node_id.h>
-#include <common/wireaddr.h>
 #include <fcntl.h>
 #include <sys/socket.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <unistd.h>
 
 int test_main(int argc, char *argv[]);
 ssize_t test_read(int fd, void *buf, size_t len);
diff --git a/cli/test/run-remove-hint.c b/cli/test/run-remove-hint.c
index 42e00ab16..c31bebc8e 100644
--- a/cli/test/run-remove-hint.c
+++ b/cli/test/run-remove-hint.c
@@ -1,17 +1,12 @@
 #include "config.h"
-#include <assert.h>
 #include <common/amount.h>
 #include <common/bigsize.h>
 #include <common/channel_id.h>
 #include <common/json_stream.h>
 #include <common/node_id.h>
-#include <common/wireaddr.h>
 #include <fcntl.h>
 #include <stdio.h>
 #include <sys/socket.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <unistd.h>
 
 int test_main(int argc, char *argv[]);
 ssize_t test_read(int fd, void *buf, size_t len);
diff --git a/common/amount.c b/common/amount.c
index ddea6569c..bfe29e7a8 100644
--- a/common/amount.c
+++ b/common/amount.c
@@ -1,13 +1,11 @@
 #include "config.h"
 #include <assert.h>
 #include <bitcoin/chainparams.h>
-#include <ccan/endian/endian.h>
 #include <ccan/mem/mem.h>
 #include <ccan/tal/str/str.h>
 #include <common/amount.h>
 #include <common/overflows.h>
 #include <common/type_to_string.h>
-#include <common/utils.h>
 #include <inttypes.h>
 #include <wire/wire.h>
 
diff --git a/common/base64.c b/common/base64.c
index f806f4e24..f7e7f7ef5 100644
--- a/common/base64.c
+++ b/common/base64.c
@@ -1,5 +1,4 @@
 #include <common/base64.h>
-#include <sodium.h>
 #include <sodium/utils.h>
 
 /* Decode/encode from/to base64, base64 helper functions.
diff --git a/common/blindedpath.c b/common/blindedpath.c
index 11f05c326..f081e0d7c 100644
--- a/common/blindedpath.c
+++ b/common/blindedpath.c
@@ -1,12 +1,8 @@
-#include <bitcoin/privkey.h>
-#include <bitcoin/pubkey.h>
 #include <ccan/cast/cast.h>
 #include <common/blindedpath.h>
 #include <common/blinding.h>
 #include <common/bolt11.h>
 #include <common/hmac.h>
-#include <common/node_id.h>
-#include <common/utils.h>
 #include <secp256k1_ecdh.h>
 #include <sodium.h>
 #include <wire/onion_wire.h>
diff --git a/common/bolt11.c b/common/bolt11.c
index 65769f24f..09bb2e433 100644
--- a/common/bolt11.c
+++ b/common/bolt11.c
@@ -1,26 +1,14 @@
 #include <bitcoin/address.h>
-#include <bitcoin/base58.h>
-#include <bitcoin/chainparams.h>
 #include <bitcoin/script.h>
 #include <ccan/array_size/array_size.h>
-#include <ccan/cast/cast.h>
-#include <ccan/endian/endian.h>
 #include <ccan/tal/str/str.h>
 #include <common/bech32.h>
 #include <common/bech32_util.h>
 #include <common/bolt11.h>
 #include <common/features.h>
-#include <common/utils.h>
 #include <errno.h>
 #include <inttypes.h>
-#include <lightningd/hsm_control.h>
-#include <lightningd/jsonrpc.h>
 #include <lightningd/lightningd.h>
-#include <lightningd/log.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <wire/wire.h>
-#include <wire/wire_sync.h>
 
 struct multiplier {
 	const char letter;
diff --git a/common/bolt11_json.c b/common/bolt11_json.c
index 804c7fcf1..b66dd5de3 100644
--- a/common/bolt11_json.c
+++ b/common/bolt11_json.c
@@ -1,15 +1,12 @@
 #include <bitcoin/address.h>
 #include <bitcoin/base58.h>
-#include <bitcoin/chainparams.h>
 #include <bitcoin/script.h>
 #include <ccan/tal/str/str.h>
 #include <common/bech32.h>
 #include <common/bolt11.h>
 #include <common/bolt11_json.h>
-#include <common/json.h>
 #include <common/json_helpers.h>
 #include <common/json_stream.h>
-#include <common/utils.h>
 
 static void json_add_fallback(struct json_stream *response,
 			      const char *fieldname,
diff --git a/common/bolt12.c b/common/bolt12.c
index 30589c63f..9da10c473 100644
--- a/common/bolt12.c
+++ b/common/bolt12.c
@@ -1,15 +1,9 @@
-#include <bitcoin/block.h>
 #include <bitcoin/chainparams.h>
-#include <ccan/cast/cast.h>
-#include <ccan/crypto/sha256/sha256.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/features.h>
-#include <common/utils.h>
 #include <secp256k1_schnorrsig.h>
 #include <time.h>
 
diff --git a/common/bolt12_merkle.c b/common/bolt12_merkle.c
index 2c5067b9e..c96dfdc8c 100644
--- a/common/bolt12_merkle.c
+++ b/common/bolt12_merkle.c
@@ -1,10 +1,7 @@
-#include <bitcoin/signature.h>
 #include <ccan/cast/cast.h>
-#include <ccan/crypto/sha256/sha256.h>
 #include <ccan/ilog/ilog.h>
 #include <ccan/mem/mem.h>
 #include <common/bolt12_merkle.h>
-#include <common/utils.h>
 
 #ifndef SUPERVERBOSE
 #define SUPERVERBOSE(...)
diff --git a/common/configdir.c b/common/configdir.c
index f649486e4..c71c001ff 100644
--- a/common/configdir.c
+++ b/common/configdir.c
@@ -9,7 +9,6 @@
 #include <ccan/tal/str/str.h>
 #include <common/utils.h>
 #include <common/version.h>
-#include <errno.h>
 
 bool deprecated_apis = true;
 
diff --git a/common/crypto_sync.c b/common/crypto_sync.c
index c529de687..ae76111ba 100644
--- a/common/crypto_sync.c
+++ b/common/crypto_sync.c
@@ -5,14 +5,11 @@
 #include <common/peer_failed.h>
 #include <common/per_peer_state.h>
 #include <common/status.h>
-#include <common/utils.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_sync.h>
 
 void sync_crypto_write(struct per_peer_state *pps, const void *msg TAKES)
 {
diff --git a/common/cryptomsg.c b/common/cryptomsg.c
index 8a0a1168f..8c4bd93c2 100644
--- a/common/cryptomsg.c
+++ b/common/cryptomsg.c
@@ -1,18 +1,9 @@
 #include "config.h"
 #include <assert.h>
-#include <ccan/build_assert/build_assert.h>
 #include <ccan/crypto/hkdf_sha256/hkdf_sha256.h>
-#include <ccan/crypto/sha256/sha256.h>
-#include <ccan/endian/endian.h>
 #include <ccan/mem/mem.h>
-#include <ccan/take/take.h>
 #include <common/cryptomsg.h>
-#include <common/dev_disconnect.h>
-#include <common/status.h>
-#include <common/utils.h>
 #include <sodium/crypto_aead_chacha20poly1305.h>
-#include <wire/peer_wire.h>
-#include <wire/wire.h>
 #include <wire/wire_io.h>
 
 static void hkdf_two_keys(struct secret *out1, struct secret *out2,
diff --git a/common/daemon.c b/common/daemon.c
index be881998d..4d703ff8d 100644
--- a/common/daemon.c
+++ b/common/daemon.c
@@ -4,19 +4,13 @@
 #include <backtrace.h>
 #include <ccan/err/err.h>
 #include <ccan/io/io.h>
-#include <ccan/str/str.h>
 #include <ccan/tal/str/str.h>
 #include <common/daemon.h>
 #include <common/memleak.h>
 #include <common/setup.h>
-#include <common/status.h>
 #include <common/utils.h>
 #include <common/version.h>
 #include <signal.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#include <unistd.h>
 
 #if BACKTRACE_SUPPORTED
 static void (*bt_print)(const char *fmt, ...) PRINTF_FMT(1,2);
diff --git a/common/daemon_conn.c b/common/daemon_conn.c
index cbadcdc72..9d77f3729 100644
--- a/common/daemon_conn.c
+++ b/common/daemon_conn.c
@@ -1,6 +1,5 @@
 #include <ccan/fdpass/fdpass.h>
 #include <ccan/io/fdpass/fdpass.h>
-#include <ccan/take/take.h>
 #include <common/daemon_conn.h>
 #include <wire/wire_io.h>
 #include <wire/wire_sync.h>
diff --git a/common/decode_array.c b/common/decode_array.c
index f2da3018d..c4df6f103 100644
--- a/common/decode_array.c
+++ b/common/decode_array.c
@@ -1,8 +1,6 @@
 #include <ccan/cast/cast.h>
 #include <common/decode_array.h>
-#include <common/utils.h>
 #include <wire/peer_wire.h>
-#include <wire/wire.h>
 #include <zlib.h>
 
 static u8 *unzlib(const tal_t *ctx, const u8 *encoded, size_t len)
diff --git a/common/derive_basepoints.c b/common/derive_basepoints.c
index e47d67b30..3b708da35 100644
--- a/common/derive_basepoints.c
+++ b/common/derive_basepoints.c
@@ -1,8 +1,6 @@
 #include <ccan/crypto/hkdf_sha256/hkdf_sha256.h>
-#include <ccan/crypto/sha256/sha256.h>
 #include <common/derive_basepoints.h>
 #include <common/utils.h>
-#include <wire/wire.h>
 
 #if DEVELOPER
 /* If they specify --dev-force-channel-secrets it ends up in here. */
diff --git a/common/descriptor_checksum.c b/common/descriptor_checksum.c
index ed16b06ea..a29aec86d 100644
--- a/common/descriptor_checksum.c
+++ b/common/descriptor_checksum.c
@@ -1,6 +1,5 @@
 #include <ccan/short_types/short_types.h>
 #include <common/descriptor_checksum.h>
-#include <stdio.h>
 #include <stdlib.h>
 
 
diff --git a/common/dev_disconnect.c b/common/dev_disconnect.c
index ab8302a29..7dbb1ee34 100644
--- a/common/dev_disconnect.c
+++ b/common/dev_disconnect.c
@@ -1,16 +1,10 @@
 #include "config.h"
-#include <assert.h>
 #include <ccan/err/err.h>
-#include <ccan/str/str.h>
 #include <common/dev_disconnect.h>
 #include <common/status.h>
-#include <fcntl.h>
 #include <netinet/in.h>
 #include <netinet/tcp.h>
-#include <stdlib.h>
-#include <sys/socket.h>
 #include <sys/stat.h>
-#include <sys/types.h>
 #include <unistd.h>
 #include <wire/peer_wire.h>
 
diff --git a/common/dijkstra.c b/common/dijkstra.c
index cb7eedb89..31551a0db 100644
--- a/common/dijkstra.c
+++ b/common/dijkstra.c
@@ -1,15 +1,9 @@
 /* Without this, gheap is *really* slow!  Comment out for debugging. */
 #define NDEBUG
 #include <ccan/cast/cast.h>
-#include <ccan/err/err.h>
-#include <ccan/tal/str/str.h>
-#include <ccan/time/time.h>
 #include <common/dijkstra.h>
 #include <common/gossmap.h>
-#include <common/utils.h>
 #include <gheap.h>
-#include <inttypes.h>
-#include <stdio.h>
 
 /* Each node has this side-info. */
 struct dijkstra {
diff --git a/common/ecdh_hsmd.c b/common/ecdh_hsmd.c
index d3c729af9..d8afac9b9 100644
--- a/common/ecdh_hsmd.c
+++ b/common/ecdh_hsmd.c
@@ -1,5 +1,4 @@
 #include <common/ecdh_hsmd.h>
-#include <common/utils.h>
 #include <hsmd/hsmd_wiregen.h>
 #include <wire/wire_sync.h>
 
diff --git a/common/features.c b/common/features.c
index 5e41d056a..b09e46bec 100644
--- a/common/features.c
+++ b/common/features.c
@@ -2,8 +2,6 @@
 #include <assert.h>
 #include <ccan/array_size/array_size.h>
 #include <ccan/tal/str/str.h>
-#include <common/memleak.h>
-#include <common/utils.h>
 #include <wire/peer_wire.h>
 
 enum feature_copy_style {
diff --git a/common/gossip_rcvd_filter.c b/common/gossip_rcvd_filter.c
index 05f0dae77..cf8e942d2 100644
--- a/common/gossip_rcvd_filter.c
+++ b/common/gossip_rcvd_filter.c
@@ -1,6 +1,5 @@
 #include <ccan/crypto/siphash24/siphash24.h>
 #include <ccan/htable/htable.h>
-#include <ccan/structeq/structeq.h>
 #include <common/gossip_rcvd_filter.h>
 #include <common/memleak.h>
 #include <common/pseudorand.h>
diff --git a/common/gossip_store.c b/common/gossip_store.c
index 827aab57e..bc66cf110 100644
--- a/common/gossip_store.c
+++ b/common/gossip_store.c
@@ -1,18 +1,13 @@
 #include "config.h"
-#include <assert.h>
 #include <ccan/crc32c/crc32c.h>
-#include <common/features.h>
 #include <common/gossip_rcvd_filter.h>
 #include <common/gossip_store.h>
 #include <common/per_peer_state.h>
 #include <common/status.h>
-#include <common/utils.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <gossipd/gossip_store_wiregen.h>
 #include <inttypes.h>
-#include <sys/stat.h>
-#include <sys/types.h>
 #include <unistd.h>
 #include <wire/peer_wire.h>
 
diff --git a/common/gossmap.c b/common/gossmap.c
index e9f3b693d..67aafd516 100644
--- a/common/gossmap.c
+++ b/common/gossmap.c
@@ -1,26 +1,19 @@
 #include "config.h"
 #include <assert.h>
-#include <ccan/bitops/bitops.h>
 #include <ccan/crypto/siphash24/siphash24.h>
-#include <ccan/endian/endian.h>
 #include <ccan/err/err.h>
 #include <ccan/htable/htable_type.h>
-#include <ccan/mem/mem.h>
 #include <ccan/ptrint/ptrint.h>
 #include <ccan/tal/str/str.h>
 #include <common/features.h>
 #include <common/gossip_store.h>
 #include <common/gossmap.h>
-#include <common/node_id.h>
 #include <common/pseudorand.h>
 #include <common/type_to_string.h>
-#include <common/utils.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <gossipd/gossip_store_wiregen.h>
 #include <sys/mman.h>
-#include <sys/stat.h>
-#include <sys/types.h>
 #include <unistd.h>
 #include <wire/peer_wire.h>
 
diff --git a/common/hsm_encryption.c b/common/hsm_encryption.c
index 3b676c5db..c52fa8d6c 100644
--- a/common/hsm_encryption.c
+++ b/common/hsm_encryption.c
@@ -1,7 +1,4 @@
-#include <ccan/tal/str/str.h>
 #include <common/hsm_encryption.h>
-#include <sodium/utils.h>
-#include <stdio.h>
 #include <termios.h>
 #include <unistd.h>
 
diff --git a/common/htlc_state.c b/common/htlc_state.c
index c925128c0..4a0e6312b 100644
--- a/common/htlc_state.c
+++ b/common/htlc_state.c
@@ -1,7 +1,7 @@
 #include <ccan/array_size/array_size.h>
 #include <common/htlc.h>
-#include <common/htlc_state.h>
   #include "htlc_state_names_gen.h"
+#include <common/htlc_state.h>
 
 const char *htlc_state_name(enum htlc_state s)
 {
diff --git a/common/htlc_tx.c b/common/htlc_tx.c
index 2a18dbd63..d3569f38e 100644
--- a/common/htlc_tx.c
+++ b/common/htlc_tx.c
@@ -1,6 +1,5 @@
 #include <bitcoin/preimage.h>
 #include <bitcoin/script.h>
-#include <bitcoin/tx.h>
 #include <common/htlc_tx.h>
 #include <common/keyset.h>
 
diff --git a/common/htlc_wire.c b/common/htlc_wire.c
index 3abdfb706..e82f27ed4 100644
--- a/common/htlc_wire.c
+++ b/common/htlc_wire.c
@@ -1,11 +1,8 @@
-#include <bitcoin/tx.h>
 #include <ccan/array_size/array_size.h>
 #include <ccan/cast/cast.h>
 #include <ccan/crypto/shachain/shachain.h>
 #include <common/htlc_wire.h>
-#include <common/memleak.h>
 #include <common/onionreply.h>
-#include <wire/wire.h>
 
 struct failed_htlc *failed_htlc_dup(const tal_t *ctx,
 				    const struct failed_htlc *f TAKES)
diff --git a/common/initial_channel.c b/common/initial_channel.c
index cb6ec9100..9cf82ef81 100644
--- a/common/initial_channel.c
+++ b/common/initial_channel.c
@@ -1,10 +1,6 @@
 #include "config.h"
-#include <assert.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/tal/str/str.h>
 #include <common/blockheight_states.h>
 #include <common/channel_type.h>
@@ -12,10 +8,7 @@
 #include <common/initial_channel.h>
 #include <common/initial_commit_tx.h>
 #include <common/keyset.h>
-#include <common/lease_rates.h>
 #include <common/type_to_string.h>
-#include <inttypes.h>
-#include <wire/peer_wire.h>
 
 struct channel *new_initial_channel(const tal_t *ctx,
 				    const struct channel_id *cid,
diff --git a/common/initial_commit_tx.c b/common/initial_commit_tx.c
index 4cb47032a..347a6dd96 100644
--- a/common/initial_commit_tx.c
+++ b/common/initial_commit_tx.c
@@ -1,13 +1,10 @@
 #include <bitcoin/script.h>
-#include <bitcoin/tx.h>
 #include <ccan/array_size/array_size.h>
-#include <ccan/endian/endian.h>
 #include <common/initial_commit_tx.h>
 #include <common/keyset.h>
 #include <common/permute_tx.h>
 #include <common/status.h>
 #include <common/type_to_string.h>
-#include <inttypes.h>
 
 /* BOLT #3:
  *
diff --git a/common/json.c b/common/json.c
index 82a07b32a..66aa91e6a 100644
--- a/common/json.c
+++ b/common/json.c
@@ -1,7 +1,6 @@
 /* JSON core and helpers */
 #include "config.h"
 #include <assert.h>
-#include <ccan/build_assert/build_assert.h>
 #include <ccan/json_escape/json_escape.h>
 #include <ccan/mem/mem.h>
 #include <ccan/str/hex/hex.h>
@@ -11,11 +10,9 @@
 #include <common/json_stream.h>
 #include <common/overflows.h>
 #include <common/utils.h>
-#include <ctype.h>
 #include <errno.h>
 #include <inttypes.h>
 #include <stdio.h>
-#include <string.h>
 
 const char *json_tok_full(const char *buffer, const jsmntok_t *t)
 {
diff --git a/common/json_helpers.c b/common/json_helpers.c
index 924820c78..b7b8c926e 100644
--- a/common/json_helpers.c
+++ b/common/json_helpers.c
@@ -1,18 +1,11 @@
 #include <arpa/inet.h>
-#include <bitcoin/preimage.h>
-#include <bitcoin/privkey.h>
 #include <bitcoin/psbt.h>
-#include <bitcoin/pubkey.h>
 #include <ccan/ccan/str/hex/hex.h>
-#include <common/amount.h>
-#include <common/channel_id.h>
 #include <common/json_helpers.h>
 #include <common/json_stream.h>
-#include <common/node_id.h>
 #include <common/type_to_string.h>
 #include <common/wireaddr.h>
 #include <errno.h>
-#include <wally_psbt.h>
 #include <wire/peer_wire.h>
 
 bool json_to_bitcoin_amount(const char *buffer, const jsmntok_t *tok,
diff --git a/common/json_stream.c b/common/json_stream.c
index 20af11a29..48c7c7726 100644
--- a/common/json_stream.c
+++ b/common/json_stream.c
@@ -1,15 +1,8 @@
 #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/tal/str/str.h>
-#include <common/daemon.h>
 #include <common/json_stream.h>
-#include <common/utils.h>
-#include <stdarg.h>
-#include <stdio.h>
 
 
 static void adjust_io_write(struct json_out *jout,
diff --git a/common/json_tok.c b/common/json_tok.c
index b32ad859c..33e4b7d90 100644
--- a/common/json_tok.c
+++ b/common/json_tok.c
@@ -1,22 +1,15 @@
 #include <bitcoin/address.h>
 #include <bitcoin/base58.h>
-#include <bitcoin/chainparams.h>
 #include <bitcoin/feerate.h>
 #include <bitcoin/psbt.h>
 #include <bitcoin/script.h>
-#include <ccan/crypto/sha256/sha256.h>
 #include <ccan/json_escape/json_escape.h>
 #include <ccan/str/hex/hex.h>
 #include <ccan/tal/str/str.h>
-#include <common/amount.h>
 #include <common/bech32.h>
-#include <common/channel_id.h>
 #include <common/json_command.h>
 #include <common/json_helpers.h>
 #include <common/json_tok.h>
-#include <common/jsonrpc_errors.h>
-#include <common/param.h>
-#include <common/utils.h>
 
 struct command_result *param_array(struct command *cmd, const char *name,
 				   const char *buffer, const jsmntok_t *tok,
diff --git a/common/key_derive.c b/common/key_derive.c
index 2ed74198e..732a121fd 100644
--- a/common/key_derive.c
+++ b/common/key_derive.c
@@ -1,6 +1,5 @@
 #include <bitcoin/privkey.h>
 #include <bitcoin/pubkey.h>
-#include <ccan/crypto/sha256/sha256.h>
 #include <common/key_derive.h>
 #include <common/utils.h>
 #include <wally_bip32.h>
diff --git a/common/lease_rates.c b/common/lease_rates.c
index 8aab58eda..233713032 100644
--- a/common/lease_rates.c
+++ b/common/lease_rates.c
@@ -1,12 +1,7 @@
 #include "config.h"
-#include <bitcoin/pubkey.h>
-#include <ccan/ccan/crypto/sha256/sha256.h>
-#include <ccan/ccan/mem/mem.h>
 #include <ccan/ccan/tal/str/str.h>
-#include <common/amount.h>
 #include <common/lease_rates.h>
 #include <common/overflows.h>
-#include <common/type_to_string.h>
 
 bool lease_rates_empty(const struct lease_rates *rates)
 {
diff --git a/common/memleak.c b/common/memleak.c
index b19d739e0..74de106dd 100644
--- a/common/memleak.c
+++ b/common/memleak.c
@@ -20,15 +20,12 @@
  *    table: these are the leaks.
  */
 #include "config.h"
-#include <assert.h>
 #include <backtrace.h>
 #include <ccan/cast/cast.h>
 #include <ccan/crypto/siphash24/siphash24.h>
 #include <ccan/htable/htable.h>
 #include <ccan/intmap/intmap.h>
-#include <common/daemon.h>
 #include <common/memleak.h>
-#include <common/utils.h>
 
 struct backtrace_state *backtrace_state;
 
diff --git a/common/node_id.c b/common/node_id.c
index 7302b6688..4444ec9be 100644
--- a/common/node_id.c
+++ b/common/node_id.c
@@ -5,7 +5,6 @@
 #include <ccan/str/hex/hex.h>
 #include <common/node_id.h>
 #include <common/type_to_string.h>
-#include <common/utils.h>
 #include <wire/wire.h>
 
 /* Convert from pubkey to compressed pubkey. */
diff --git a/common/onion.c b/common/onion.c
index 75265f3ed..4743117da 100644
--- a/common/onion.c
+++ b/common/onion.c
@@ -1,13 +1,10 @@
-#include "common/onion.h"
 #include <assert.h>
 #include <ccan/array_size/array_size.h>
 #include <ccan/cast/cast.h>
 #include <common/ecdh.h>
 #include <common/onion.h>
 #include <common/sphinx.h>
-#include <common/utils.h>
 #include <sodium/crypto_aead_chacha20poly1305.h>
-#include <wire/onion_wire.h>
 
 /* BOLT #4:
  *
diff --git a/common/param.c b/common/param.c
index ef58c7c13..40e5f0abb 100644
--- a/common/param.c
+++ b/common/param.c
@@ -2,9 +2,7 @@
 #include <ccan/tal/str/str.h>
 #include <common/json_command.h>
 #include <common/json_tok.h>
-#include <common/jsonrpc_errors.h>
 #include <common/param.h>
-#include <common/utils.h>
 
 struct param {
 	const char *name;
diff --git a/common/peer_failed.c b/common/peer_failed.c
index 109323608..a6b0c55cd 100644
--- a/common/peer_failed.c
+++ b/common/peer_failed.c
@@ -8,7 +8,6 @@
 #include <common/status.h>
 #include <common/status_wiregen.h>
 #include <common/wire_error.h>
-#include <stdarg.h>
 
 /* Fatal error here, return peer control to lightningd */
 static void NORETURN
diff --git a/common/permute_tx.c b/common/permute_tx.c
index 08de4fd58..3ab7aff73 100644
--- a/common/permute_tx.c
+++ b/common/permute_tx.c
@@ -1,6 +1,4 @@
 #include "permute_tx.h"
-#include <stdbool.h>
-#include <string.h>
 #include <wally_psbt.h>
 
 static bool input_better(const struct wally_tx_input *a,
diff --git a/common/private_channel_announcement.c b/common/private_channel_announcement.c
index 124b151de..9247be3c7 100644
--- a/common/private_channel_announcement.c
+++ b/common/private_channel_announcement.c
@@ -1,9 +1,6 @@
 #include "config.h"
 #include <assert.h>
 #include <bitcoin/chainparams.h>
-#include <bitcoin/privkey.h>
-#include <bitcoin/pubkey.h>
-#include <common/node_id.h>
 #include <common/private_channel_announcement.h>
 #include <wire/peer_wire.h>
 
diff --git a/common/psbt_internal.c b/common/psbt_internal.c
index 1b585e9be..0a034ddc8 100644
--- a/common/psbt_internal.c
+++ b/common/psbt_internal.c
@@ -1,8 +1,6 @@
 #include <bitcoin/script.h>
-#include <ccan/ccan/tal/tal.h>
 #include <common/psbt_internal.h>
 #include <common/psbt_open.h>
-#include <wally_psbt.h>
 #include <wire/peer_wire.h>
 
 static void
diff --git a/common/psbt_open.c b/common/psbt_open.c
index ab02cadc6..5ed339f0f 100644
--- a/common/psbt_open.c
+++ b/common/psbt_open.c
@@ -1,8 +1,6 @@
 #include "config.h"
-#include <assert.h>
 #include <bitcoin/psbt.h>
 #include <bitcoin/script.h>
-#include <bitcoin/tx.h>
 #include <ccan/asort/asort.h>
 #include <ccan/ccan/endian/endian.h>
 #include <ccan/ccan/mem/mem.h>
diff --git a/common/pseudorand.c b/common/pseudorand.c
index c7bff3df6..6e9a5d214 100644
--- a/common/pseudorand.c
+++ b/common/pseudorand.c
@@ -2,11 +2,9 @@
 #include <assert.h>
 #include <ccan/crypto/sha256/sha256.h>
 #include <ccan/crypto/siphash24/siphash24.h>
-#include <ccan/err/err.h>
 #include <ccan/isaac/isaac64.h>
 #include <ccan/likely/likely.h>
 #include <sodium/randombytes.h>
-#include <stdbool.h>
 #include <string.h>
 
 static struct isaac64_ctx isaac64;
diff --git a/common/read_peer_msg.c b/common/read_peer_msg.c
index 6859be7cd..2a521ec20 100644
--- a/common/read_peer_msg.c
+++ b/common/read_peer_msg.c
@@ -1,7 +1,6 @@
 #include "config.h"
 #include <assert.h>
 #include <bitcoin/chainparams.h>
-#include <ccan/fdpass/fdpass.h>
 #include <common/crypto_sync.h>
 #include <common/gossip_rcvd_filter.h>
 #include <common/gossip_store.h>
@@ -9,13 +8,8 @@
 #include <common/per_peer_state.h>
 #include <common/read_peer_msg.h>
 #include <common/status.h>
-#include <common/type_to_string.h>
-#include <common/utils.h>
 #include <common/wire_error.h>
 #include <errno.h>
-#include <gossipd/gossipd_peerd_wiregen.h>
-#include <sys/select.h>
-#include <unistd.h>
 #include <wire/peer_wire.h>
 #include <wire/wire_sync.h>
 
diff --git a/common/route.c b/common/route.c
index a772aaa1d..a24b26da4 100644
--- a/common/route.c
+++ b/common/route.c
@@ -1,17 +1,9 @@
 #include "config.h"
 #include <assert.h>
-#include <ccan/err/err.h>
-#include <ccan/tal/str/str.h>
-#include <ccan/time/time.h>
 #include <common/dijkstra.h>
 #include <common/features.h>
 #include <common/gossmap.h>
-#include <common/pseudorand.h>
-#include <common/random_select.h>
 #include <common/route.h>
-#include <common/type_to_string.h>
-#include <inttypes.h>
-#include <stdio.h>
 
 bool route_can_carry_even_disabled(const struct gossmap *map,
 				   const struct gossmap_chan *c,
diff --git a/common/setup.c b/common/setup.c
index b9e73fc25..6f4c4182a 100644
--- a/common/setup.c
+++ b/common/setup.c
@@ -1,7 +1,6 @@
 #include "config.h"
 #include <assert.h>
 #include <ccan/ccan/err/err.h>
-#include <common/memleak.h>
 #include <common/setup.h>
 #include <common/utils.h>
 #include <sodium.h>
diff --git a/common/sphinx.c b/common/sphinx.c
index 0105ad53b..27cb5ff61 100644
--- a/common/sphinx.c
+++ b/common/sphinx.c
@@ -1,24 +1,17 @@
 #include "config.h"
 #include <assert.h>
 
-#include <ccan/array_size/array_size.h>
-#include <ccan/crypto/ripemd160/ripemd160.h>
-#include <ccan/crypto/sha256/sha256.h>
 #include <ccan/mem/mem.h>
-#include <common/node_id.h>
 #include <common/onion.h>
 #include <common/onionreply.h>
 #include <common/sphinx.h>
-#include <common/utils.h>
 
-#include <err.h>
 
 #include <secp256k1_ecdh.h>
 
 #include <sodium/crypto_stream_chacha20.h>
 #include <sodium/randombytes.h>
 
-#include <wire/wire.h>
 
 #define BLINDING_FACTOR_SIZE 32
 
diff --git a/common/status.c b/common/status.c
index 3aa1c6ab6..61fbdc3ef 100644
--- a/common/status.c
+++ b/common/status.c
@@ -1,19 +1,14 @@
 #include "config.h"
 #include <assert.h>
 #include <ccan/breakpoint/breakpoint.h>
-#include <ccan/endian/endian.h>
-#include <ccan/err/err.h>
 #include <ccan/fdpass/fdpass.h>
-#include <ccan/read_write_all/read_write_all.h>
 #include <ccan/tal/str/str.h>
 #include <common/daemon.h>
 #include <common/daemon_conn.h>
 #include <common/status.h>
 #include <common/status_wiregen.h>
-#include <common/utils.h>
 #include <common/version.h>
 #include <errno.h>
-#include <signal.h>
 #include <wire/peer_wire.h>
 #include <wire/wire_sync.h>
 
diff --git a/common/status_levels.c b/common/status_levels.c
index fda05be58..99ddfd890 100644
--- a/common/status_levels.c
+++ b/common/status_levels.c
@@ -1,5 +1,4 @@
 #include <ccan/array_size/array_size.h>
-#include <ccan/build_assert/build_assert.h>
 #include <common/status_levels.h>
 
 static const char *ll_names[] = {
diff --git a/common/status_wire.c b/common/status_wire.c
index d83d9acd2..25afd376b 100644
--- a/common/status_wire.c
+++ b/common/status_wire.c
@@ -1,4 +1,3 @@
-#include <common/status_levels.h>
 #include <common/status_wire.h>
 #include <wire/wire.h>
 
diff --git a/common/subdaemon.c b/common/subdaemon.c
index e4e2d656c..24b0a0a21 100644
--- a/common/subdaemon.c
+++ b/common/subdaemon.c
@@ -1,16 +1,8 @@
-#include <ccan/tal/str/str.h>
-#include <common/daemon.h>
 #include <common/dev_disconnect.h>
 #include <common/status.h>
 #include <common/subdaemon.h>
-#include <common/utils.h>
 #include <common/version.h>
-#include <signal.h>
 #include <stdio.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#include <unistd.h>
-#include <wally_core.h>
 
 static void status_backtrace_print(const char *fmt, ...)
 {
diff --git a/common/test/run-amount.c b/common/test/run-amount.c
index 8cee214cf..780377574 100644
--- a/common/test/run-amount.c
+++ b/common/test/run-amount.c
@@ -1,8 +1,6 @@
 #include "../amount.c"
 #include <common/setup.h>
-#include <common/utils.h>
 #include <stdio.h>
-#include <wire/wire.h>
 
 /* AUTOGENERATED MOCKS START */
 /* Generated stub for fromwire */
diff --git a/common/test/run-bigsize.c b/common/test/run-bigsize.c
index 288cbbc1d..bf60a2f3d 100644
--- a/common/test/run-bigsize.c
+++ b/common/test/run-bigsize.c
@@ -1,12 +1,8 @@
 #include <ccan/array_size/array_size.h>
-#include <ccan/str/hex/hex.h>
 #include <ccan/tal/grab_file/grab_file.h>
-#include <ccan/tal/str/str.h>
 #include <common/amount.h>
 #include <common/json.c>
 #include <common/setup.h>
-#include <common/utils.h>
-#include <wire/wire.h>
 
 static const char *reason;
 #define SUPERVERBOSE(r) do { if (!reason) reason = (r); } while(0)
diff --git a/common/test/run-bolt11.c b/common/test/run-bolt11.c
index 8fb329e53..0a0862eef 100644
--- a/common/test/run-bolt11.c
+++ b/common/test/run-bolt11.c
@@ -9,11 +9,7 @@
 #include "../wire/fromwire.c"
 #include "../wire/towire.c"
 #include <ccan/err/err.h>
-#include <ccan/mem/mem.h>
-#include <ccan/str/hex/hex.h>
 #include <common/setup.h>
-#include <stdio.h>
-#include <wally_core.h>
 
 /* AUTOGENERATED MOCKS START */
 /* AUTOGENERATED MOCKS END */
diff --git a/common/test/run-bolt12_decode.c b/common/test/run-bolt12_decode.c
index 07dfb13d2..4e6ee7658 100644
--- a/common/test/run-bolt12_decode.c
+++ b/common/test/run-bolt12_decode.c
@@ -3,7 +3,6 @@
 #include "../bech32_util.c"
 #include "../bech32.c"
 #include "../json.c"
-#include <assert.h>
 #include <ccan/array_size/array_size.h>
 #include <ccan/tal/grab_file/grab_file.h>
 #include <ccan/tal/path/path.h>
diff --git a/common/test/run-bolt12_merkle-json.c b/common/test/run-bolt12_merkle-json.c
index e567f9592..e242ada25 100644
--- a/common/test/run-bolt12_merkle-json.c
+++ b/common/test/run-bolt12_merkle-json.c
@@ -12,14 +12,10 @@
   #include "../../wire/peer_wiregen.c"
   #include "../../wire/bolt12_wiregen.c"
 #endif
-#include <assert.h>
-#include <ccan/array_size/array_size.h>
 #include <ccan/tal/grab_file/grab_file.h>
 #include <ccan/tal/path/path.h>
-#include <common/bolt12.h>
+#include <common/channel_type.h>
 #include <common/setup.h>
-#include <wire/channel_type_wiregen.h>
-#include <wire/peer_wire.h>
 
 /* AUTOGENERATED MOCKS START */
 /* Generated stub for fromwire_channel_id */
diff --git a/common/test/run-bolt12_merkle.c b/common/test/run-bolt12_merkle.c
index 7d04e12e1..8b762ab9b 100644
--- a/common/test/run-bolt12_merkle.c
+++ b/common/test/run-bolt12_merkle.c
@@ -5,12 +5,9 @@
 #include "../bolt12_merkle.c"
 #include <assert.h>
 #include <ccan/array_size/array_size.h>
-#include <ccan/cast/cast.h>
-#include <ccan/tal/str/str.h>
+#include <common/channel_type.h>
 #include <common/features.h>
 #include <common/setup.h>
-#include <stdarg.h>
-#include <wire/channel_type_wiregen.h>
 
 /* Definition of n1 from the spec */
 #include <wire/peer_wire.h>
diff --git a/common/test/run-bolt12_period.c b/common/test/run-bolt12_period.c
index 07cf7e40f..12d5c4868 100644
--- a/common/test/run-bolt12_period.c
+++ b/common/test/run-bolt12_period.c
@@ -1,6 +1,5 @@
 #include "../bolt12.c"
 #include "../json.c"
-#include <assert.h>
 #include <ccan/array_size/array_size.h>
 #include <ccan/tal/grab_file/grab_file.h>
 #include <ccan/tal/path/path.h>
diff --git a/common/test/run-cryptomsg.c b/common/test/run-cryptomsg.c
index 745177f38..a072c2806 100644
--- a/common/test/run-cryptomsg.c
+++ b/common/test/run-cryptomsg.c
@@ -1,12 +1,8 @@
-#include <assert.h>
 #include <ccan/str/hex/hex.h>
-#include <ccan/tal/str/str.h>
-#include <common/dev_disconnect.h>
 #include <common/setup.h>
 #include <common/status.h>
 #include <stdio.h>
 #include <wire/peer_wire.h>
-#include <wire/wire_io.h>
 
 /* AUTOGENERATED MOCKS START */
 /* Generated stub for amount_asset_is_main */
diff --git a/common/test/run-derive_basepoints.c b/common/test/run-derive_basepoints.c
index bb9a21271..5e2a636ff 100644
--- a/common/test/run-derive_basepoints.c
+++ b/common/test/run-derive_basepoints.c
@@ -8,6 +8,7 @@
 #include <common/utils.h>
 #include <stdio.h>
 #include <wally_core.h>
+#include <wire/wire.h>
 
 /* AUTOGENERATED MOCKS START */
 /* Generated stub for amount_asset_is_main */
diff --git a/common/test/run-features.c b/common/test/run-features.c
index dabd6ada9..fefc3f78a 100644
--- a/common/test/run-features.c
+++ b/common/test/run-features.c
@@ -1,12 +1,7 @@
 #include "../features.c"
 #include "../memleak.c"
-#include <ccan/err/err.h>
 #include <ccan/mem/mem.h>
-#include <ccan/str/hex/hex.h>
 #include <common/setup.h>
-#include <common/utils.h>
-#include <stdio.h>
-#include <wally_core.h>
 
 /* AUTOGENERATED MOCKS START */
 /* Generated stub for amount_asset_is_main */
diff --git a/common/test/run-gossip_rcvd_filter.c b/common/test/run-gossip_rcvd_filter.c
index 6ed63589f..e15c098ee 100644
--- a/common/test/run-gossip_rcvd_filter.c
+++ b/common/test/run-gossip_rcvd_filter.c
@@ -2,7 +2,6 @@
 #include "../pseudorand.c"
 #include "../../wire/fromwire.c"
 #include <common/setup.h>
-#include <common/utils.h>
 #include <stdio.h>
 
 /* AUTOGENERATED MOCKS START */
diff --git a/common/test/run-gossmap-fp16.c b/common/test/run-gossmap-fp16.c
index 659a7af6d..8c3ba923d 100644
--- a/common/test/run-gossmap-fp16.c
+++ b/common/test/run-gossmap-fp16.c
@@ -1,5 +1,4 @@
 #include "../fp16.c"
-#include <common/pseudorand.h>
 #include <common/type_to_string.h>
 #include <stdio.h>
 #include <wire/wire.h>
diff --git a/common/test/run-gossmap_local.c b/common/test/run-gossmap_local.c
index 31a191c15..4dcedc6b0 100644
--- a/common/test/run-gossmap_local.c
+++ b/common/test/run-gossmap_local.c
@@ -4,13 +4,10 @@
 #include "../gossmap.c"
 #include "../node_id.c"
 #include "../pseudorand.c"
-#include <bitcoin/privkey.h>
 #include <ccan/read_write_all/read_write_all.h>
-#include <common/amount.h>
 #include <common/channel_type.h>
 #include <common/setup.h>
 #include <stdio.h>
-#include <wire/tlvstream.h>
 
 /* AUTOGENERATED MOCKS START */
 /* Generated stub for fromwire_bigsize */
diff --git a/common/test/run-ip_port_parsing.c b/common/test/run-ip_port_parsing.c
index 78d468fc3..ad9f73d77 100644
--- a/common/test/run-ip_port_parsing.c
+++ b/common/test/run-ip_port_parsing.c
@@ -2,8 +2,6 @@
 #include "../common/wireaddr.c"
 
 #include <stdio.h>
-#include <assert.h>
-#include <ccan/mem/mem.h>
 #include <common/amount.h>
 #include <common/setup.h>
 
diff --git a/common/test/run-json.c b/common/test/run-json.c
index 96f079623..3434b5a02 100644
--- a/common/test/run-json.c
+++ b/common/test/run-json.c
@@ -1,14 +1,10 @@
 #include "../json_helpers.c"
 #include <assert.h>
-#include <ccan/mem/mem.h>
 #include <ccan/tal/str/str.h>
-#include <common/json.h>
+#include <common/channel_type.h>
 #include <common/setup.h>
-#include <common/utils.h>
 #include <inttypes.h>
 #include <stdio.h>
-#include <wire/channel_type_wiregen.h>
-#include <wire/wire.h>
 
 /* AUTOGENERATED MOCKS START */
 /* Generated stub for fromwire_channel_type */
diff --git a/common/test/run-json_remove.c b/common/test/run-json_remove.c
index d23c8ddff..06b659603 100644
--- a/common/test/run-json_remove.c
+++ b/common/test/run-json_remove.c
@@ -1,6 +1,5 @@
 #include "config.h"
 #include <common/amount.h>
-#include <common/utils.h>
 #include <common/json.c>
 #include <common/setup.h>
 #include <wire/wire.h>
diff --git a/common/test/run-json_scan.c b/common/test/run-json_scan.c
index 90673d938..bd76b3447 100644
--- a/common/test/run-json_scan.c
+++ b/common/test/run-json_scan.c
@@ -1,13 +1,6 @@
 #include "../json.c"
-#include <assert.h>
-#include <ccan/mem/mem.h>
-#include <ccan/tal/str/str.h>
 #include <common/amount.h>
-#include <common/json.h>
 #include <common/setup.h>
-#include <common/utils.h>
-#include <inttypes.h>
-#include <stdio.h>
 #include <wire/wire.h>
 
 /* AUTOGENERATED MOCKS START */
diff --git a/common/test/run-key_derive.c b/common/test/run-key_derive.c
index 9cd683aa8..dd3c7c3d9 100644
--- a/common/test/run-key_derive.c
+++ b/common/test/run-key_derive.c
@@ -1,10 +1,8 @@
 #define SUPERVERBOSE
 
-#include <assert.h>
 #include <ccan/str/hex/hex.h>
 #include <common/amount.h>
 #include <common/setup.h>
-#include <common/utils.h>
 #include <stdio.h>
 #include <wire/wire.h>
 #include "../type_to_string.c"
diff --git a/common/test/run-lease_rates.c b/common/test/run-lease_rates.c
index 8e6d30740..08155e4ed 100644
--- a/common/test/run-lease_rates.c
+++ b/common/test/run-lease_rates.c
@@ -1,12 +1,7 @@
 #include "../amount.c"
 #include "../lease_rates.c"
-#include <assert.h>
-#include <ccan/ccan/crypto/sha256/sha256.h>
-#include <bitcoin/pubkey.h>
 #include <common/setup.h>
-#include <common/utils.h>
 #include <stdio.h>
-#include <wire/wire.h>
 
 /* AUTOGENERATED MOCKS START */
 /* Generated stub for fromwire */
diff --git a/common/test/run-lock.c b/common/test/run-lock.c
index 5582569c6..579f99b71 100644
--- a/common/test/run-lock.c
+++ b/common/test/run-lock.c
@@ -1,10 +1,7 @@
 #include "../io_lock.c"
-#include <ccan/io/io.h>
-#include <ccan/short_types/short_types.h>
 #include <common/amount.h>
 #include <common/setup.h>
 #include <common/utils.h>
-#include <sys/types.h>
 #include <sys/socket.h>
 #include <stdio.h>
 #include <wire/wire.h>
diff --git a/common/test/run-param.c b/common/test/run-param.c
index b2d486a6c..b74a5a86c 100644
--- a/common/test/run-param.c
+++ b/common/test/run-param.c
@@ -2,16 +2,9 @@
 #include "../json_tok.c"
 #include "../param.c"
 #include <ccan/array_size/array_size.h>
-#include <ccan/err/err.h>
-#include <common/errcode.h>
-#include <common/json.h>
+#include <common/channel_type.h>
 #include <common/setup.h>
-#include <setjmp.h>
-#include <signal.h>
 #include <stdio.h>
-#include <unistd.h>
-#include <wire/channel_type_wiregen.h>
-#include <wire/wire.h>
 
 char *fail_msg = NULL;
 bool failed = false;
diff --git a/common/test/run-psbt_diff.c b/common/test/run-psbt_diff.c
index 5018541fe..4aebab49c 100644
--- a/common/test/run-psbt_diff.c
+++ b/common/test/run-psbt_diff.c
@@ -1,11 +1,6 @@
 #include "config.h"
-#include <assert.h>
-#include <bitcoin/chainparams.h>
-#include <bitcoin/psbt.h>
-#include <bitcoin/tx.h>
 #include <common/setup.h>
 #include <stdio.h>
-#include <wire/wire.h>
 #include "../amount.c"
 #include "../psbt_open.c"
 
diff --git a/common/test/run-softref.c b/common/test/run-softref.c
index f2e0a35d9..1f5368caf 100644
--- a/common/test/run-softref.c
+++ b/common/test/run-softref.c
@@ -1,5 +1,4 @@
 #include <assert.h>
-#include <ccan/short_types/short_types.h>
 #include <common/amount.h>
 #include <common/setup.h>
 #include <common/utils.h>
diff --git a/common/test/run-sphinx-xor_cipher_stream.c b/common/test/run-sphinx-xor_cipher_stream.c
index a9fc241be..bcbea52e3 100644
--- a/common/test/run-sphinx-xor_cipher_stream.c
+++ b/common/test/run-sphinx-xor_cipher_stream.c
@@ -1,8 +1,6 @@
 #include "../sphinx.c"
-#include <assert.h>
 #include <common/setup.h>
 #include <stdio.h>
-#include <unistd.h>
 
 /* AUTOGENERATED MOCKS START */
 /* Generated stub for amount_asset_is_main */
diff --git a/common/test/run-sphinx.c b/common/test/run-sphinx.c
index 6c625000a..4b842f626 100644
--- a/common/test/run-sphinx.c
+++ b/common/test/run-sphinx.c
@@ -2,18 +2,9 @@
 #include "../onion.c"
 #include "../onionreply.c"
 #include "../sphinx.c"
-#include <secp256k1.h>
-#include <ccan/short_types/short_types.h>
-#include <string.h>
 #include <ccan/str/hex/hex.h>
-#include <common/ecdh.h>
 #include <common/setup.h>
-#include <common/sphinx.h>
-#include <common/utils.h>
-#include <err.h>
 #include <stdio.h>
-#include <assert.h>
-#include <unistd.h>
 
 /* AUTOGENERATED MOCKS START */
 /* Generated stub for amount_asset_is_main */
diff --git a/common/test/run-wireaddr.c b/common/test/run-wireaddr.c
index 531d08189..3602ae2c7 100644
--- a/common/test/run-wireaddr.c
+++ b/common/test/run-wireaddr.c
@@ -1,9 +1,7 @@
 #include "../wireaddr.c"
 #include <common/amount.h>
 #include <common/setup.h>
-#include <common/utils.h>
 #include <stdio.h>
-#include <wire/wire.h>
 
 /* AUTOGENERATED MOCKS START */
 /* Generated stub for amount_asset_is_main */
diff --git a/common/type_to_string.c b/common/type_to_string.c
index f90a871a6..82affe9f0 100644
--- a/common/type_to_string.c
+++ b/common/type_to_string.c
@@ -1,12 +1,8 @@
 #include "config.h"
 #include <assert.h>
 #include <bitcoin/preimage.h>
-#include <ccan/crypto/ripemd160/ripemd160.h>
-#include <ccan/crypto/sha256/sha256.h>
 #include <ccan/tal/str/str.h>
 #include <common/type_to_string.h>
-#include <common/utils.h>
-#include <inttypes.h>
 
 /* We need at least one, and these are in CCAN so register it here. */
 REGISTER_TYPE_TO_HEXSTR(sha256);
diff --git a/common/utils.c b/common/utils.c
index 96e0b1188..a9ed0f23c 100644
--- a/common/utils.c
+++ b/common/utils.c
@@ -2,7 +2,6 @@
 #include <bitcoin/chainparams.h>
 #include <ccan/list/list.h>
 #include <ccan/str/hex/hex.h>
-#include <ccan/tal/str/str.h>
 #include <ccan/utf8/utf8.h>
 #include <errno.h>
 #include <locale.h>
diff --git a/common/utxo.c b/common/utxo.c
index 09ad55b73..72da52421 100644
--- a/common/utxo.c
+++ b/common/utxo.c
@@ -1,10 +1,4 @@
 #include "config.h"
-#include <bitcoin/privkey.h>
-#include <bitcoin/psbt.h>
-#include <bitcoin/script.h>
-#include <ccan/ccan/mem/mem.h>
-#include <common/key_derive.h>
-#include <common/utils.h>
 #include <common/utxo.h>
 #include <wire/wire.h>
 
diff --git a/common/wire_error.c b/common/wire_error.c
index 4fd7007eb..416d50a66 100644
--- a/common/wire_error.c
+++ b/common/wire_error.c
@@ -1,7 +1,6 @@
 #include <ccan/mem/mem.h>
 #include <ccan/tal/str/str.h>
 #include <common/type_to_string.h>
-#include <common/utils.h>
 #include <common/wire_error.h>
 #include <wire/peer_wire.h>
 
diff --git a/common/wireaddr.c b/common/wireaddr.c
index 3a0a37840..68f41cf6c 100644
--- a/common/wireaddr.c
+++ b/common/wireaddr.c
@@ -1,24 +1,12 @@
 #include "config.h"
 #include <arpa/inet.h>
 #include <assert.h>
-#include <ccan/build_assert/build_assert.h>
-#include <ccan/err/err.h>
-#include <ccan/io/io.h>
 #include <ccan/mem/mem.h>
-#include <ccan/str/hex/hex.h>
 #include <ccan/tal/str/str.h>
 #include <common/base32.h>
-#include <common/configdir.h>
 #include <common/type_to_string.h>
-#include <common/utils.h>
 #include <common/wireaddr.h>
-#include <errno.h>
-#include <fcntl.h>
 #include <netdb.h>
-#include <netinet/in.h>
-#include <sodium/randombytes.h>
-#include <sys/types.h>
-#include <unistd.h>
 #include <wire/wire.h>
 
 bool wireaddr_eq(const struct wireaddr *a, const struct wireaddr *b)
diff --git a/connectd/connectd.c b/connectd/connectd.c
index 27b005151..822fc385e 100644
--- a/connectd/connectd.c
+++ b/connectd/connectd.c
@@ -9,42 +9,21 @@
  */
 #include <ccan/array_size/array_size.h>
 #include <ccan/asort/asort.h>
-#include <ccan/build_assert/build_assert.h>
-#include <ccan/cast/cast.h>
-#include <ccan/container_of/container_of.h>
-#include <ccan/crypto/hkdf_sha256/hkdf_sha256.h>
-#include <ccan/crypto/siphash24/siphash24.h>
-#include <ccan/endian/endian.h>
 #include <ccan/fdpass/fdpass.h>
-#include <ccan/io/fdpass/fdpass.h>
-#include <ccan/io/io.h>
-#include <ccan/list/list.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 <ccan/timer/timer.h>
 #include <common/bech32.h>
 #include <common/bech32_util.h>
-#include <common/cryptomsg.h>
 #include <common/daemon_conn.h>
-#include <common/decode_array.h>
 #include <common/ecdh_hsmd.h>
-#include <common/errcode.h>
-#include <common/features.h>
 #include <common/jsonrpc_errors.h>
 #include <common/memleak.h>
-#include <common/ping.h>
 #include <common/pseudorand.h>
 #include <common/status.h>
 #include <common/subdaemon.h>
 #include <common/timeout.h>
 #include <common/type_to_string.h>
-#include <common/utils.h>
-#include <common/version.h>
 #include <common/wire_error.h>
-#include <common/wireaddr.h>
 #include <connectd/connectd.h>
 #include <connectd/connectd_gossipd_wiregen.h>
 #include <connectd/connectd_wiregen.h>
@@ -54,25 +33,9 @@
 #include <connectd/tor.h>
 #include <connectd/tor_autoservice.h>
 #include <errno.h>
-#include <gossipd/gossipd_wiregen.h>
-#include <hsmd/hsmd_wiregen.h>
-#include <inttypes.h>
-#include <lightningd/gossip_msg.h>
 #include <netdb.h>
-#include <netinet/in.h>
-#include <secp256k1_ecdh.h>
 #include <sodium.h>
-#include <sodium/randombytes.h>
-#include <stdarg.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <sys/un.h>
-#include <unistd.h>
-#include <wire/peer_wire.h>
-#include <wire/wire_io.h>
 #include <wire/wire_sync.h>
-#include <zlib.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/handshake.c b/connectd/handshake.c
index 38fca6c4b..cc1fb92b4 100644
--- a/connectd/handshake.c
+++ b/connectd/handshake.c
@@ -1,8 +1,6 @@
 #include "config.h"
 #include <assert.h>
-#include <bitcoin/privkey.h>
 #include <bitcoin/pubkey.h>
-#include <ccan/build_assert/build_assert.h>
 #include <ccan/crypto/hkdf_sha256/hkdf_sha256.h>
 #include <ccan/endian/endian.h>
 #include <ccan/io/io.h>
@@ -15,13 +13,9 @@
 #include <common/wireaddr.h>
 #include <connectd/handshake.h>
 #include <errno.h>
-#include <secp256k1.h>
 #include <secp256k1_ecdh.h>
 #include <sodium/crypto_aead_chacha20poly1305.h>
 #include <sodium/randombytes.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <wire/wire.h>
 
 #ifndef SUPERVERBOSE
 #define SUPERVERBOSE(...)
diff --git a/connectd/netaddress.c b/connectd/netaddress.c
index 40cf36d18..1acfa6375 100644
--- a/connectd/netaddress.c
+++ b/connectd/netaddress.c
@@ -1,17 +1,11 @@
 /* -*- c-basic-offset: 4; indent-tabs-mode: nil; -*- */
 #include "config.h"
-#include <arpa/inet.h>
 #include <assert.h>
 #include <common/status.h>
-#include <common/type_to_string.h>
 #include <connectd/netaddress.h>
 #include <errno.h>
 #include <netinet/in.h>
-#include <stdbool.h>
-#include <sys/socket.h>
-#include <sys/types.h>
 #include <unistd.h>
-#include <wire/wire.h>
 
 /* Based on bitcoin's src/netaddress.cpp, hence different naming and styling!
    version 7f31762cb6261806542cc6d1188ca07db98a6950:
diff --git a/connectd/peer_exchange_initmsg.c b/connectd/peer_exchange_initmsg.c
index f4aecacaf..3f49a66f9 100644
--- a/connectd/peer_exchange_initmsg.c
+++ b/connectd/peer_exchange_initmsg.c
@@ -1,9 +1,6 @@
 #include <bitcoin/chainparams.h>
 #include <ccan/io/io.h>
-#include <common/cryptomsg.h>
 #include <common/dev_disconnect.h>
-#include <common/features.h>
-#include <common/per_peer_state.h>
 #include <common/status.h>
 #include <common/wire_error.h>
 #include <connectd/connectd.h>
diff --git a/connectd/tor.c b/connectd/tor.c
index ef1cb798d..4527fe3dd 100644
--- a/connectd/tor.c
+++ b/connectd/tor.c
@@ -1,19 +1,12 @@
 #include <ccan/io/io.h>
-#include <ccan/short_types/short_types.h>
 #include <ccan/tal/str/str.h>
 #include <common/status.h>
 #include <common/utils.h>
-#include <common/wireaddr.h>
 #include <connectd/connectd.h>
 #include <connectd/tor.h>
 #include <errno.h>
 #include <inttypes.h>
-#include <netdb.h>
 #include <netinet/in.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <unistd.h>
 
 #define SOCKS_NOAUTH		0
 #define SOCKS_ERROR 	 0xff
diff --git a/connectd/tor_autoservice.c b/connectd/tor_autoservice.c
index 65cb50f22..7ede2efb0 100644
--- a/connectd/tor_autoservice.c
+++ b/connectd/tor_autoservice.c
@@ -1,27 +1,17 @@
 #include "config.h"
-#include <arpa/inet.h>
-#include <assert.h>
 #include <ccan/err/err.h>
-#include <ccan/io/io.h>
 #include <ccan/rbuf/rbuf.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/str/str.h>
 #include <common/base64.h>
-#include <common/type_to_string.h>
 #include <common/utils.h>
 #include <common/wireaddr.h>
 #include <connectd/tor_autoservice.h>
 #include <errno.h>
-#include <fcntl.h>
 #include <lightningd/log.h>
 #include <netdb.h>
-#include <netinet/in.h>
-#include <sys/socket.h>
-#include <sys/types.h>
 #include <unistd.h>
-#include <wire/wire.h>
 
 
 static void *buf_resize(struct membuf *mb, void *buf, size_t len)
diff --git a/devtools/blindedpath.c b/devtools/blindedpath.c
index 885f1f0c8..73d0319bc 100644
--- a/devtools/blindedpath.c
+++ b/devtools/blindedpath.c
@@ -1,26 +1,17 @@
 #include "config.h"
 #include <assert.h>
-#include <bitcoin/privkey.h>
 #include <ccan/err/err.h>
-#include <ccan/mem/mem.h>
 #include <ccan/opt/opt.h>
 #include <ccan/str/hex/hex.h>
-#include <ccan/tal/tal.h>
 #include <common/blinding.h>
 #include <common/ecdh.h>
-#include <common/hmac.h>
 #include <common/setup.h>
 #include <common/sphinx.h>
 #include <common/type_to_string.h>
-#include <common/utils.h>
 #include <common/version.h>
-#include <secp256k1.h>
 #include <secp256k1_ecdh.h>
 #include <sodium/crypto_aead_chacha20poly1305.h>
-#include <sodium/crypto_auth_hmacsha256.h>
 #include <stdio.h>
-#include <string.h>
-#include <unistd.h>
 
 static bool simpleout = false;
 
diff --git a/devtools/bolt11-cli.c b/devtools/bolt11-cli.c
index 7e2d55630..5ee97f9bb 100644
--- a/devtools/bolt11-cli.c
+++ b/devtools/bolt11-cli.c
@@ -1,15 +1,11 @@
 #include <bitcoin/address.h>
 #include <bitcoin/base58.h>
-#include <bitcoin/chainparams.h>
 #include <bitcoin/privkey.h>
 #include <bitcoin/script.h>
 #include <ccan/err/err.h>
 #include <ccan/opt/opt.h>
-#include <ccan/read_write_all/read_write_all.h>
-#include <ccan/str/str.h>
 #include <ccan/tal/str/str.h>
 #include <ccan/time/time.h>
-#include <common/amount.h>
 #include <common/bech32.h>
 #include <common/bolt11.h>
 #include <common/features.h>
@@ -18,10 +14,6 @@
 #include <common/version.h>
 #include <inttypes.h>
 #include <stdio.h>
-#include <sys/socket.h>
-#include <sys/types.h>
-#include <sys/un.h>
-#include <unistd.h>
 
 #define NO_ERROR 0
 #define ERROR_BAD_DECODE 1
diff --git a/devtools/bolt12-cli.c b/devtools/bolt12-cli.c
index 276fe88a7..7ffdfbcc2 100644
--- a/devtools/bolt12-cli.c
+++ b/devtools/bolt12-cli.c
@@ -1,10 +1,8 @@
 #include <bitcoin/chainparams.h>
-#include <ccan/cast/cast.h>
 #include <ccan/err/err.h>
 #include <ccan/opt/opt.h>
 #include <ccan/tal/str/str.h>
 #include <common/bech32_util.h>
-#include <common/bolt12.h>
 #include <common/bolt12_merkle.h>
 #include <common/features.h>
 #include <common/iso4217.h>
@@ -14,11 +12,7 @@
 #include <inttypes.h>
 #include <secp256k1_schnorrsig.h>
 #include <stdio.h>
-#include <sys/socket.h>
-#include <sys/types.h>
-#include <sys/un.h>
 #include <time.h>
-#include <unistd.h>
 
 #define NO_ERROR 0
 #define ERROR_BAD_DECODE 1
diff --git a/devtools/checkchannels.c b/devtools/checkchannels.c
index 769b11e52..85d4184dd 100644
--- a/devtools/checkchannels.c
+++ b/devtools/checkchannels.c
@@ -3,7 +3,6 @@
 #include <bitcoin/privkey.h>
 #include <bitcoin/script.h>
 #include <bitcoin/short_channel_id.h>
-#include <bitcoin/tx.h>
 #include <ccan/crypto/hkdf_sha256/hkdf_sha256.h>
 #include <ccan/err/err.h>
 #include <ccan/mem/mem.h>
@@ -12,7 +11,6 @@
 #include <ccan/tal/path/path.h>
 #include <common/configdir.h>
 #include <common/node_id.h>
-#include <common/utils.h>
 #include <inttypes.h>
 #include <sqlite3.h>
 
diff --git a/devtools/create-gossipstore.c b/devtools/create-gossipstore.c
index 8fde975a5..0feaa083b 100644
--- a/devtools/create-gossipstore.c
+++ b/devtools/create-gossipstore.c
@@ -1,20 +1,12 @@
-#include <bitcoin/short_channel_id.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/amount.h>
 #include <common/gossip_store.h>
-#include <common/node_id.h>
-#include <common/type_to_string.h>
-#include <common/utils.h>
 #include <fcntl.h>
 #include <gossipd/gossip_store_wiregen.h>
 #include <inttypes.h>
 #include <stdio.h>
-#include <stdlib.h>
-#include <sys/stat.h>
-#include <sys/types.h>
 #include <unistd.h>
 #include <wire/peer_wire.h>
 
diff --git a/devtools/decodemsg.c b/devtools/decodemsg.c
index 79bd38164..03c40d4df 100644
--- a/devtools/decodemsg.c
+++ b/devtools/decodemsg.c
@@ -1,9 +1,6 @@
 #include <ccan/err/err.h>
 #include <ccan/opt/opt.h>
 #include <ccan/tal/grab_file/grab_file.h>
-#include <common/decode_array.h>
-#include <common/utils.h>
-#include <stdio.h>
 #include <unistd.h>
 #if EXPERIMENTAL_FEATURES
   #include <wire/onion_exp_printgen.h>
diff --git a/devtools/dump-gossipstore.c b/devtools/dump-gossipstore.c
index 312915a04..f5a520285 100644
--- a/devtools/dump-gossipstore.c
+++ b/devtools/dump-gossipstore.c
@@ -3,14 +3,9 @@
 #include <ccan/opt/opt.h>
 #include <common/gossip_store.h>
 #include <common/type_to_string.h>
-#include <common/utils.h>
 #include <fcntl.h>
 #include <gossipd/gossip_store_wiregen.h>
-#include <gossipd/gossipd_peerd_wiregen.h>
-#include <inttypes.h>
 #include <stdio.h>
-#include <sys/stat.h>
-#include <sys/types.h>
 #include <unistd.h>
 #include <wire/peer_wire.h>
 
diff --git a/devtools/encodeaddr.c b/devtools/encodeaddr.c
index 4cf8a8252..6ccfa58c2 100644
--- a/devtools/encodeaddr.c
+++ b/devtools/encodeaddr.c
@@ -1,11 +1,8 @@
 #include "config.h"
 #include <assert.h>
-#include <ccan/short_types/short_types.h>
 #include <common/bech32.h>
 #include <common/utils.h>
-#include <stdbool.h>
 #include <stdio.h>
-#include <string.h>
 
 static void test_enc(const char *hrp, const char *hex)
 {
diff --git a/devtools/gossipwith.c b/devtools/gossipwith.c
index 1429c831c..c110c7908 100644
--- a/devtools/gossipwith.c
+++ b/devtools/gossipwith.c
@@ -17,6 +17,7 @@
 #include <netdb.h>
 #include <poll.h>
 #include <secp256k1_ecdh.h>
+#include <stdio.h>
 #include <wire/peer_wire.h>
 
 #define io_write_ simple_write
diff --git a/devtools/lightning-checkmessage.c b/devtools/lightning-checkmessage.c
index acd8020fa..bd82bc552 100644
--- a/devtools/lightning-checkmessage.c
+++ b/devtools/lightning-checkmessage.c
@@ -1,8 +1,6 @@
 #include <bitcoin/pubkey.h>
 #include <bitcoin/shadouble.h>
-#include <ccan/crypto/sha256/sha256.h>
 #include <ccan/err/err.h>
-#include <ccan/short_types/short_types.h>
 #include <common/bech32.h>
 #include <common/utils.h>
 #include <secp256k1_recovery.h>
diff --git a/devtools/mkclose.c b/devtools/mkclose.c
index a93e94458..b9d9f7abd 100644
--- a/devtools/mkclose.c
+++ b/devtools/mkclose.c
@@ -5,20 +5,12 @@
  * lightning/devtools/mkclose 189c40b0728f382fe91c87270926584e48e0af3a6789f37454afee6c7560311d 0 0.00999877btc 253 0.00999877btc 0000000000000000000000000000000000000000000000000000000000000010 0000000000000000000000000000000000000000000000000000000000000020 026957e53b46df017bd6460681d068e1d23a7b027de398272d0b15f59b78d060a9 03a9f795ff2e4c27091f40e8f8277301824d1c3dfa6b0204aa92347314e41b1033
  */
 #include <bitcoin/script.h>
-#include <bitcoin/tx.h>
 #include <ccan/err/err.h>
 #include <ccan/str/hex/hex.h>
-#include <channeld/full_channel.h>
-#include <common/amount.h>
-#include <common/derive_basepoints.h>
 #include <common/htlc_wire.h>
 #include <common/initial_commit_tx.h>
-#include <common/key_derive.h>
-#include <common/keyset.h>
 #include <common/status.h>
 #include <common/type_to_string.h>
-#include <inttypes.h>
-#include <stdarg.h>
 #include <stdio.h>
 
 static bool verbose = false;
diff --git a/devtools/mkcommit.c b/devtools/mkcommit.c
index 221bebffd..049382230 100644
--- a/devtools/mkcommit.c
+++ b/devtools/mkcommit.c
@@ -10,27 +10,21 @@
  */
 #include <bitcoin/chainparams.h>
 #include <bitcoin/script.h>
-#include <bitcoin/tx.h>
 #include <ccan/cast/cast.h>
 #include <ccan/err/err.h>
 #include <ccan/opt/opt.h>
 #include <ccan/str/hex/hex.h>
 #include <ccan/tal/str/str.h>
 #include <channeld/full_channel.h>
-#include <common/amount.h>
 #include <common/blockheight_states.h>
-#include <common/channel_id.h>
 #include <common/channel_type.h>
-#include <common/derive_basepoints.h>
 #include <common/fee_states.h>
 #include <common/htlc_wire.h>
 #include <common/key_derive.h>
-#include <common/keyset.h>
 #include <common/status.h>
 #include <common/type_to_string.h>
 #include <common/version.h>
 #include <inttypes.h>
-#include <stdarg.h>
 #include <stdio.h>
 
 static bool verbose = false;
diff --git a/devtools/mkencoded.c b/devtools/mkencoded.c
index 91d3a1eac..f53fc8677 100644
--- a/devtools/mkencoded.c
+++ b/devtools/mkencoded.c
@@ -3,9 +3,7 @@
 #include <ccan/err/err.h>
 #include <ccan/str/hex/hex.h>
 #include <common/decode_array.h>
-#include <common/utils.h>
 #include <stdio.h>
-#include <wire/wire.h>
 #include <zlib.h>
 
 static NORETURN void usage(void)
diff --git a/devtools/mkfunding.c b/devtools/mkfunding.c
index 507d7874b..c4e2da8d5 100644
--- a/devtools/mkfunding.c
+++ b/devtools/mkfunding.c
@@ -6,15 +6,11 @@
  *
  * lightning/devtools/mkfunding 16835ac8c154b616baac524163f41fb0c4f82c7b972ad35d4d6f18d854f6856b 3 0.03btc 253 16c5027616e940d1e72b4c172557b3b799a93c0582f924441174ea556aadd01c 0000000000000000000000000000000000000000000000000000000000000050 0000000000000000000000000000000000000000000000000000000000000060
  */
-#include <bitcoin/address.h>
 #include <bitcoin/script.h>
-#include <bitcoin/tx.h>
 #include <ccan/err/err.h>
 #include <ccan/str/hex/hex.h>
-#include <common/amount.h>
 #include <common/derive_basepoints.h>
 #include <common/initial_commit_tx.h>
-#include <common/keyset.h>
 #include <common/status.h>
 #include <common/type_to_string.h>
 #include <common/utxo.h>
diff --git a/devtools/mkgossip.c b/devtools/mkgossip.c
index 5e732e483..791bd7971 100644
--- a/devtools/mkgossip.c
+++ b/devtools/mkgossip.c
@@ -8,18 +8,12 @@
  */
 #include "config.h"
 #include <assert.h>
-#include <bitcoin/address.h>
-#include <bitcoin/script.h>
-#include <bitcoin/short_channel_id.h>
-#include <bitcoin/tx.h>
 #include <ccan/crc32c/crc32c.h>
 #include <ccan/err/err.h>
 #include <ccan/opt/opt.h>
 #include <ccan/str/hex/hex.h>
 #include <ccan/tal/str/str.h>
-#include <common/gossip_constants.h>
 #include <common/type_to_string.h>
-#include <common/utils.h>
 #include <inttypes.h>
 #include <stdio.h>
 #include <wire/peer_wire.h>
diff --git a/devtools/mkquery.c b/devtools/mkquery.c
index d63632ba8..3bb4cef7a 100644
--- a/devtools/mkquery.c
+++ b/devtools/mkquery.c
@@ -1,16 +1,7 @@
 /* Generate various query messages. */
 #include "config.h"
-#include <assert.h>
-#include <bitcoin/address.h>
-#include <bitcoin/script.h>
-#include <bitcoin/short_channel_id.h>
-#include <bitcoin/tx.h>
-#include <ccan/crc32c/crc32c.h>
 #include <ccan/err/err.h>
 #include <ccan/str/hex/hex.h>
-#include <common/gossip_constants.h>
-#include <common/utils.h>
-#include <inttypes.h>
 #include <stdio.h>
 #include <wire/peer_wire.h>
 
diff --git a/devtools/onion.c b/devtools/onion.c
index e25440b8d..d486ccbb4 100644
--- a/devtools/onion.c
+++ b/devtools/onion.c
@@ -2,24 +2,15 @@
 #include <assert.h>
 #include <ccan/mem/mem.h>
 #include <ccan/opt/opt.h>
-#include <ccan/read_write_all/read_write_all.h>
-#include <ccan/short_types/short_types.h>
 #include <ccan/str/hex/hex.h>
 #include <ccan/tal/grab_file/grab_file.h>
 #include <ccan/tal/str/str.h>
-#include <common/amount.h>
 #include <common/ecdh.h>
-#include <common/json.h>
 #include <common/json_helpers.h>
 #include <common/onion.h>
 #include <common/sphinx.h>
-#include <common/utils.h>
 #include <common/version.h>
 #include <err.h>
-#include <secp256k1.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
 
 /* We don't actually use this, but common/onion needs it */
 void ecdh(const struct pubkey *point, struct secret *ss)
diff --git a/devtools/print_wire.c b/devtools/print_wire.c
index 044ee514a..f9e591f38 100644
--- a/devtools/print_wire.c
+++ b/devtools/print_wire.c
@@ -4,9 +4,7 @@
 #include <common/type_to_string.h>
 #include <devtools/print_wire.h>
 #include <errno.h>
-#include <inttypes.h>
 #include <stdio.h>
-#include <wire/tlvstream.h>
 
 void printwire_u8(const char *fieldname, const u8 *v)
 {
diff --git a/devtools/route.c b/devtools/route.c
index 1bd3c627c..3fab83f8d 100644
--- a/devtools/route.c
+++ b/devtools/route.c
@@ -1,12 +1,8 @@
 #include <ccan/err/err.h>
 #include <ccan/opt/opt.h>
 #include <ccan/time/time.h>
-#include <common/amount.h>
 #include <common/dijkstra.h>
 #include <common/gossmap.h>
-#include <common/node_id.h>
-#include <common/pseudorand.h>
-#include <common/random_select.h>
 #include <common/route.h>
 #include <common/type_to_string.h>
 #include <devtools/clean_topo.h>
diff --git a/devtools/topology.c b/devtools/topology.c
index 640f822fa..5fb3d7d7e 100644
--- a/devtools/topology.c
+++ b/devtools/topology.c
@@ -3,12 +3,8 @@
 #include <ccan/err/err.h>
 #include <ccan/opt/opt.h>
 #include <ccan/time/time.h>
-#include <common/amount.h>
 #include <common/dijkstra.h>
 #include <common/gossmap.h>
-#include <common/node_id.h>
-#include <common/pseudorand.h>
-#include <common/random_select.h>
 #include <common/route.h>
 #include <common/type_to_string.h>
 #include <devtools/clean_topo.h>
diff --git a/gossipd/gossip_generation.c b/gossipd/gossip_generation.c
index deaf5564b..f74db6634 100644
--- a/gossipd/gossip_generation.c
+++ b/gossipd/gossip_generation.c
@@ -7,7 +7,6 @@
 #include <common/status.h>
 #include <common/timeout.h>
 #include <common/type_to_string.h>
-#include <common/utils.h>
 #include <common/wireaddr.h>
 #include <errno.h>
 #include <gossipd/gossip_generation.h>
@@ -16,7 +15,6 @@
 #include <gossipd/gossipd.h>
 #include <gossipd/gossipd_peerd_wiregen.h>
 #include <hsmd/hsmd_wiregen.h>
-#include <wire/peer_wire.h>
 #include <wire/wire_sync.h>
 
 /* Create a node_announcement with the given signature. It may be NULL in the
diff --git a/gossipd/gossip_store.c b/gossipd/gossip_store.c
index 4764f8b18..b5ac792a3 100644
--- a/gossipd/gossip_store.c
+++ b/gossipd/gossip_store.c
@@ -1,28 +1,20 @@
 #include "gossip_store.h"
 
-#include <bitcoin/chainparams.h>
 #include <ccan/array_size/array_size.h>
 #include <ccan/crc32c/crc32c.h>
-#include <ccan/endian/endian.h>
 #include <ccan/noerr/noerr.h>
 #include <ccan/read_write_all/read_write_all.h>
 #include <ccan/tal/str/str.h>
 #include <common/gossip_store.h>
 #include <common/private_channel_announcement.h>
 #include <common/status.h>
-#include <common/type_to_string.h>
-#include <common/utils.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <gossipd/gossip_store_wiregen.h>
-#include <gossipd/gossipd_peerd_wiregen.h>
-#include <gossipd/gossipd_wiregen.h>
-#include <stdio.h>
 #include <sys/stat.h>
 #include <sys/uio.h>
 #include <unistd.h>
 #include <wire/peer_wire.h>
-#include <wire/wire.h>
 
 #define GOSSIP_STORE_TEMP_FILENAME "gossip_store.tmp"
 
diff --git a/gossipd/gossipd.c b/gossipd/gossipd.c
index 538e4b251..8e939b503 100644
--- a/gossipd/gossipd.c
+++ b/gossipd/gossipd.c
@@ -10,29 +10,11 @@
  * The gossip protocol itself is fairly simple, but has some twists which
  * add complexity to this daemon.
  */
-#include <bitcoin/chainparams.h>
-#include <ccan/array_size/array_size.h>
-#include <ccan/build_assert/build_assert.h>
 #include <ccan/cast/cast.h>
-#include <ccan/container_of/container_of.h>
-#include <ccan/crypto/hkdf_sha256/hkdf_sha256.h>
-#include <ccan/crypto/siphash24/siphash24.h>
-#include <ccan/endian/endian.h>
-#include <ccan/fdpass/fdpass.h>
-#include <ccan/io/fdpass/fdpass.h>
-#include <ccan/io/io.h>
-#include <ccan/mem/mem.h>
-#include <ccan/noerr/noerr.h>
-#include <ccan/take/take.h>
 #include <ccan/tal/str/str.h>
-#include <common/bech32.h>
-#include <common/bech32_util.h>
 #include <common/blinding.h>
-#include <common/cryptomsg.h>
-#include <common/daemon.h>
 #include <common/daemon_conn.h>
 #include <common/ecdh_hsmd.h>
-#include <common/features.h>
 #include <common/lease_rates.h>
 #include <common/memleak.h>
 #include <common/ping.h>
@@ -42,36 +24,18 @@
 #include <common/subdaemon.h>
 #include <common/timeout.h>
 #include <common/type_to_string.h>
-#include <common/utils.h>
-#include <common/version.h>
 #include <common/wire_error.h>
-#include <common/wireaddr.h>
 #include <connectd/connectd_gossipd_wiregen.h>
 #include <errno.h>
-#include <fcntl.h>
-#include <gossipd/broadcast.h>
 #include <gossipd/gossip_generation.h>
 #include <gossipd/gossip_store_wiregen.h>
 #include <gossipd/gossipd.h>
 #include <gossipd/gossipd_peerd_wiregen.h>
 #include <gossipd/gossipd_wiregen.h>
 #include <gossipd/queries.h>
-#include <gossipd/routing.h>
 #include <gossipd/seeker.h>
-#include <inttypes.h>
 #include <lightningd/gossip_msg.h>
-#include <netdb.h>
-#include <netinet/in.h>
-#include <secp256k1_ecdh.h>
 #include <sodium/crypto_aead_chacha20poly1305.h>
-#include <sodium/randombytes.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <sys/un.h>
-#include <unistd.h>
-#include <wire/wire_io.h>
-#include <wire/wire_sync.h>
 
 /*~ A channel consists of a `struct half_chan` for each direction, each of
  * which has a `flags` word from the `channel_update`; bit 1 is
diff --git a/gossipd/queries.c b/gossipd/queries.c
index afc2422cd..2da843891 100644
--- a/gossipd/queries.c
+++ b/gossipd/queries.c
@@ -3,7 +3,6 @@
 #include <ccan/array_size/array_size.h>
 #include <ccan/asort/asort.h>
 #include <ccan/crc32c/crc32c.h>
-#include <ccan/tal/tal.h>
 #include <common/daemon_conn.h>
 #include <common/decode_array.h>
 #include <common/status.h>
@@ -14,9 +13,6 @@
 #include <gossipd/gossipd_wiregen.h>
 #include <gossipd/queries.h>
 #include <gossipd/routing.h>
-#include <gossipd/seeker.h>
-#include <wire/peer_wire.h>
-#include <wire/wire.h>
 #include <zlib.h>
 
 #if DEVELOPER
diff --git a/gossipd/routing.c b/gossipd/routing.c
index 54b70312c..f6cab15c1 100644
--- a/gossipd/routing.c
+++ b/gossipd/routing.c
@@ -1,27 +1,18 @@
 #include "routing.h"
-#include <arpa/inet.h>
-#include <bitcoin/block.h>
 #include <bitcoin/chainparams.h>
 #include <bitcoin/script.h>
 #include <ccan/array_size/array_size.h>
-#include <ccan/endian/endian.h>
-#include <ccan/mem/mem.h>
 #include <ccan/tal/str/str.h>
-#include <common/features.h>
 #include <common/memleak.h>
 #include <common/pseudorand.h>
 #include <common/status.h>
 #include <common/timeout.h>
 #include <common/type_to_string.h>
 #include <common/wire_error.h>
-#include <common/wireaddr.h>
 #include <gossipd/gossip_generation.h>
 #include <gossipd/gossip_store_wiregen.h>
 #include <gossipd/gossipd.h>
-#include <gossipd/gossipd_peerd_wiregen.h>
 #include <gossipd/gossipd_wiregen.h>
-#include <inttypes.h>
-#include <wire/peer_wire.h>
 
 #ifndef SUPERVERBOSE
 #define SUPERVERBOSE(...)
diff --git a/gossipd/seeker.c b/gossipd/seeker.c
index 75b50d4fe..476d0a012 100644
--- a/gossipd/seeker.c
+++ b/gossipd/seeker.c
@@ -1,23 +1,17 @@
 /* This contains the code which actively seeks out gossip from peers */
 #include <bitcoin/chainparams.h>
-#include <bitcoin/short_channel_id.h>
 #include <ccan/array_size/array_size.h>
 #include <ccan/asort/asort.h>
-#include <ccan/list/list.h>
-#include <ccan/mem/mem.h>
 #include <ccan/tal/str/str.h>
-#include <ccan/tal/tal.h>
 #include <common/decode_array.h>
 #include <common/pseudorand.h>
 #include <common/random_select.h>
 #include <common/status.h>
 #include <common/timeout.h>
-#include <common/type_to_string.h>
 #include <gossipd/gossipd.h>
 #include <gossipd/queries.h>
 #include <gossipd/routing.h>
 #include <gossipd/seeker.h>
-#include <wire/peer_wire.h>
 
 #define GOSSIP_SEEKER_INTERVAL(seeker) \
 	DEV_FAST_GOSSIP((seeker)->daemon->rstate->dev_fast_gossip, 5, 60)
diff --git a/gossipd/test/run-check_node_announcement.c b/gossipd/test/run-check_node_announcement.c
index 995ff193f..dd2202d7c 100644
--- a/gossipd/test/run-check_node_announcement.c
+++ b/gossipd/test/run-check_node_announcement.c
@@ -1,8 +1,8 @@
 #include "../gossip_generation.c"
+#include <common/channel_type.h>
 #include <common/json_stream.h>
 #include <common/setup.h>
 #include <stdio.h>
-#include <wire/channel_type_wiregen.h>
 
 /* AUTOGENERATED MOCKS START */
 /* Generated stub for find_peer */
diff --git a/gossipd/test/run-extended-info.c b/gossipd/test/run-extended-info.c
index 3cba50113..38cfc3fbc 100644
--- a/gossipd/test/run-extended-info.c
+++ b/gossipd/test/run-extended-info.c
@@ -5,10 +5,8 @@
 #include "../queries.c"
 #include <ccan/str/hex/hex.h>
 #include <common/channel_type.h>
-#include <common/json.h>
 #include <common/json_helpers.h>
 #include <common/json_stream.h>
-#include <common/memleak.h>
 #include <stdio.h>
 
 #ifdef NDEBUG
diff --git a/gossipd/test/run-next_block_range.c b/gossipd/test/run-next_block_range.c
index b8a7bdaa3..e193d3f5d 100644
--- a/gossipd/test/run-next_block_range.c
+++ b/gossipd/test/run-next_block_range.c
@@ -2,9 +2,7 @@
 #include <ccan/err/err.h>
 #include <common/channel_type.h>
 #include <common/json_stream.h>
-#include <common/memleak.h>
 #include <common/wireaddr.h>
-#include <stdarg.h>
 #include <stdio.h>
 
 /* AUTOGENERATED MOCKS START */
diff --git a/hsmd/hsmd.c b/hsmd/hsmd.c
index ea40c9f0c..780898449 100644
--- a/hsmd/hsmd.c
+++ b/hsmd/hsmd.c
@@ -6,39 +6,26 @@
  * which indicates what it's allowed to ask for.  We're entirely driven
  * by request, response.
  */
-#include <bitcoin/privkey.h>
-#include <bitcoin/pubkey.h>
 #include <ccan/array_size/array_size.h>
-#include <ccan/crypto/hkdf_sha256/hkdf_sha256.h>
 #include <ccan/intmap/intmap.h>
 #include <ccan/io/fdpass/fdpass.h>
-#include <ccan/io/io.h>
 #include <ccan/noerr/noerr.h>
 #include <ccan/read_write_all/read_write_all.h>
-#include <ccan/take/take.h>
 #include <ccan/tal/str/str.h>
-#include <common/daemon.h>
 #include <common/daemon_conn.h>
-#include <common/derive_basepoints.h>
 #include <common/hsm_encryption.h>
 #include <common/memleak.h>
-#include <common/node_id.h>
 #include <common/status.h>
 #include <common/status_wiregen.h>
 #include <common/subdaemon.h>
 #include <common/type_to_string.h>
-#include <common/utils.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <hsmd/capabilities.h>
 /*~ _wiregen files are autogenerated by tools/generate-wire.py */
-#include <hsmd/hsmd_wiregen.h>
 #include <hsmd/libhsmd.h>
-#include <inttypes.h>
 #include <sys/socket.h>
 #include <sys/stat.h>
-#include <unistd.h>
-#include <wally_bip32.h>
 #include <wire/wire_io.h>
 
 /*~ Each subdaemon is started with stdin connected to lightningd (for status
diff --git a/hsmd/libhsmd.c b/hsmd/libhsmd.c
index 541d812de..f5f4e6db3 100644
--- a/hsmd/libhsmd.c
+++ b/hsmd/libhsmd.c
@@ -12,9 +12,7 @@
 #include <secp256k1_ecdh.h>
 #include <secp256k1_schnorrsig.h>
 #include <sodium/utils.h>
-#include <wally_bip32.h>
 #include <wally_psbt.h>
-#include <wire/peer_wire.h>
 
 #if DEVELOPER
 /* If they specify --dev-force-privkey it ends up in here. */
diff --git a/lightningd/bitcoind.c b/lightningd/bitcoind.c
index 19a7b8a88..1c67914b5 100644
--- a/lightningd/bitcoind.c
+++ b/lightningd/bitcoind.c
@@ -12,22 +12,10 @@
 #include "lightningd.h"
 #include "log.h"
 #include <ccan/array_size/array_size.h>
-#include <ccan/cast/cast.h>
 #include <ccan/io/io.h>
-#include <ccan/pipecmd/pipecmd.h>
-#include <ccan/str/hex/hex.h>
-#include <ccan/str/str.h>
-#include <ccan/take/take.h>
-#include <ccan/tal/grab_file/grab_file.h>
-#include <ccan/tal/path/path.h>
 #include <ccan/tal/str/str.h>
-#include <common/configdir.h>
 #include <common/json_helpers.h>
 #include <common/memleak.h>
-#include <common/timeout.h>
-#include <common/utils.h>
-#include <errno.h>
-#include <inttypes.h>
 #include <lightningd/chaintopology.h>
 #include <lightningd/io_loop_with_timers.h>
 #include <lightningd/plugin.h>
diff --git a/lightningd/chaintopology.c b/lightningd/chaintopology.c
index 9f724dce2..17244bb02 100644
--- a/lightningd/chaintopology.c
+++ b/lightningd/chaintopology.c
@@ -10,23 +10,14 @@
 #include "log.h"
 #include "watch.h"
 #include <ccan/array_size/array_size.h>
-#include <ccan/asort/asort.h>
-#include <ccan/build_assert/build_assert.h>
 #include <ccan/io/io.h>
 #include <ccan/tal/str/str.h>
-#include <common/coin_mvt.h>
-#include <common/configdir.h>
-#include <common/features.h>
 #include <common/htlc_tx.h>
 #include <common/json_command.h>
-#include <common/jsonrpc_errors.h>
 #include <common/memleak.h>
 #include <common/param.h>
 #include <common/timeout.h>
 #include <common/type_to_string.h>
-#include <common/utils.h>
-#include <inttypes.h>
-#include <lightningd/channel_control.h>
 #include <lightningd/coin_mvts.h>
 #include <lightningd/gossip_control.h>
 #include <lightningd/io_loop_with_timers.h>
diff --git a/lightningd/channel.c b/lightningd/channel.c
index 7dfff4570..9c4c3a509 100644
--- a/lightningd/channel.c
+++ b/lightningd/channel.c
@@ -1,29 +1,18 @@
-#include <bitcoin/psbt.h>
-#include <bitcoin/script.h>
-#include <ccan/crypto/hkdf_sha256/hkdf_sha256.h>
 #include <ccan/tal/str/str.h>
 #include <common/blockheight_states.h>
 #include <common/closing_fee.h>
 #include <common/fee_states.h>
 #include <common/json_command.h>
 #include <common/json_helpers.h>
-#include <common/jsonrpc_errors.h>
-#include <common/utils.h>
 #include <common/wire_error.h>
 #include <connectd/connectd_wiregen.h>
 #include <errno.h>
 #include <hsmd/hsmd_wiregen.h>
-#include <inttypes.h>
 #include <lightningd/channel.h>
 #include <lightningd/channel_state_names_gen.h>
 #include <lightningd/connect_control.h>
-#include <lightningd/hsm_control.h>
-#include <lightningd/jsonrpc.h>
-#include <lightningd/lightningd.h>
-#include <lightningd/log.h>
 #include <lightningd/notification.h>
 #include <lightningd/opening_common.h>
-#include <lightningd/opening_control.h>
 #include <lightningd/peer_control.h>
 #include <lightningd/subd.h>
 #include <wallet/txfilter.h>
diff --git a/lightningd/channel_control.c b/lightningd/channel_control.c
index 392210ce5..d91cbe698 100644
--- a/lightningd/channel_control.c
+++ b/lightningd/channel_control.c
@@ -1,43 +1,25 @@
-#include <bitcoin/pubkey.h>
-#include <bitcoin/script.h>
 #include <ccan/cast/cast.h>
 #include <channeld/channeld_wiregen.h>
-#include <common/channel_id.h>
-#include <common/coin_mvt.h>
-#include <common/features.h>
-#include <common/gossip_constants.h>
 #include <common/json_command.h>
 #include <common/json_helpers.h>
 #include <common/json_tok.h>
-#include <common/jsonrpc_errors.h>
 #include <common/memleak.h>
 #include <common/param.h>
-#include <common/per_peer_state.h>
-#include <common/psbt_open.h>
 #include <common/shutdown_scriptpubkey.h>
-#include <common/timeout.h>
 #include <common/type_to_string.h>
-#include <common/tx_roles.h>
-#include <common/utils.h>
 #include <common/wire_error.h>
 #include <errno.h>
 #include <hsmd/capabilities.h>
-#include <inttypes.h>
+#include <lightningd/chaintopology.h>
 #include <lightningd/channel.h>
 #include <lightningd/channel_control.h>
-#include <lightningd/chaintopology.h>
 #include <lightningd/closing_control.h>
 #include <lightningd/coin_mvts.h>
 #include <lightningd/dual_open_control.h>
 #include <lightningd/hsm_control.h>
-#include <lightningd/jsonrpc.h>
-#include <lightningd/lightningd.h>
-#include <lightningd/log.h>
 #include <lightningd/notification.h>
 #include <lightningd/peer_control.h>
-#include <lightningd/subd.h>
 #include <wire/common_wiregen.h>
-#include <wire/wire_sync.h>
 
 static void update_feerates(struct lightningd *ld, struct channel *channel)
 {
diff --git a/lightningd/connect_control.c b/lightningd/connect_control.c
index 1c058a5cf..f26d39247 100644
--- a/lightningd/connect_control.c
+++ b/lightningd/connect_control.c
@@ -1,38 +1,23 @@
 #include <ccan/err/err.h>
-#include <ccan/fdpass/fdpass.h>
-#include <ccan/list/list.h>
 #include <ccan/tal/str/str.h>
 #include <common/configdir.h>
-#include <common/errcode.h>
-#include <common/features.h>
 #include <common/json_command.h>
 #include <common/json_helpers.h>
-#include <common/json_stream.h>
 #include <common/json_tok.h>
-#include <common/jsonrpc_errors.h>
 #include <common/memleak.h>
-#include <common/node_id.h>
 #include <common/param.h>
-#include <common/pseudorand.h>
 #include <common/timeout.h>
 #include <common/type_to_string.h>
-#include <common/wireaddr.h>
 #include <connectd/connectd_wiregen.h>
-#include <errno.h>
 #include <hsmd/capabilities.h>
 #include <lightningd/channel.h>
 #include <lightningd/connect_control.h>
 #include <lightningd/dual_open_control.h>
 #include <lightningd/hsm_control.h>
-#include <lightningd/json.h>
 #include <lightningd/jsonrpc.h>
 #include <lightningd/lightningd.h>
-#include <lightningd/log.h>
 #include <lightningd/opening_common.h>
 #include <lightningd/peer_control.h>
-#include <lightningd/subd.h>
-#include <wire/peer_wire.h>
-#include <wire/wire_sync.h>
 
 struct connect {
 	struct list_node list;
diff --git a/lightningd/datastore.c b/lightningd/datastore.c
index 14b229b30..a58a8f115 100644
--- a/lightningd/datastore.c
+++ b/lightningd/datastore.c
@@ -2,10 +2,8 @@
 #include <common/json_command.h>
 #include <common/json_tok.h>
 #include <common/param.h>
-#include <lightningd/json.h>
 #include <lightningd/jsonrpc.h>
 #include <lightningd/lightningd.h>
-#include <wallet/wallet.h>
 
 static void json_add_datastore(struct json_stream *response,
 			       const char **key, const u8 *data,
diff --git a/lightningd/dual_open_control.c b/lightningd/dual_open_control.c
index 5633a0060..ea490748d 100644
--- a/lightningd/dual_open_control.c
+++ b/lightningd/dual_open_control.c
@@ -2,33 +2,18 @@
  * dualopend subdaemons. It manages the callbacks and database
  * saves and funding tx watching for a channel open */
 
-#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/take/take.h>
-#include <ccan/tal/tal.h>
 #include <ccan/tal/str/str.h>
-#include <ccan/short_types/short_types.h>
-#include <common/amount.h>
 #include <common/blockheight_states.h>
-#include <common/channel_config.h>
-#include <common/channel_id.h>
-#include <common/derive_basepoints.h>
-#include <common/features.h>
-#include <common/fee_states.h>
-#include <common/htlc.h>
 #include <common/json_command.h>
 #include <common/json_helpers.h>
 #include <common/json_tok.h>
-#include <common/lease_rates.h>
 #include <common/param.h>
-#include <common/per_peer_state.h>
 #include <common/psbt_open.h>
 #include <common/shutdown_scriptpubkey.h>
 #include <common/type_to_string.h>
-#include <connectd/connectd_wiregen.h>
 #include <errno.h>
 #include <hsmd/capabilities.h>
 #include <lightningd/chaintopology.h>
@@ -37,14 +22,13 @@
 #include <lightningd/closing_control.h>
 #include <lightningd/dual_open_control.h>
 #include <lightningd/hsm_control.h>
+#include <lightningd/json.h>
 #include <lightningd/notification.h>
 #include <lightningd/opening_common.h>
 #include <lightningd/peer_control.h>
 #include <lightningd/plugin_hook.h>
-#include <lightningd/json.h>
 #include <openingd/dualopend_wiregen.h>
 #include <wire/common_wiregen.h>
-#include <wire/peer_wire.h>
 
 struct commit_rcvd {
 	struct channel *channel;
diff --git a/lightningd/gossip_control.c b/lightningd/gossip_control.c
index 6716616c2..a78fc722f 100644
--- a/lightningd/gossip_control.c
+++ b/lightningd/gossip_control.c
@@ -4,40 +4,17 @@
 #include "lightningd.h"
 #include "peer_control.h"
 #include "subd.h"
-#include <ccan/array_size/array_size.h>
-#include <ccan/crypto/siphash24/siphash24.h>
 #include <ccan/err/err.h>
-#include <ccan/fdpass/fdpass.h>
-#include <ccan/json_escape/json_escape.h>
-#include <ccan/take/take.h>
-#include <ccan/tal/str/str.h>
-#include <common/amount.h>
-#include <common/features.h>
 #include <common/json_command.h>
 #include <common/json_helpers.h>
 #include <common/json_tok.h>
-#include <common/jsonrpc_errors.h>
-#include <common/lease_rates.h>
 #include <common/param.h>
-#include <common/type_to_string.h>
-#include <common/utils.h>
-#include <errno.h>
 #include <gossipd/gossipd_wiregen.h>
 #include <hsmd/capabilities.h>
-#include <inttypes.h>
-#include <lightningd/connect_control.h>
-#include <lightningd/gossip_msg.h>
 #include <lightningd/hsm_control.h>
-#include <lightningd/json.h>
 #include <lightningd/jsonrpc.h>
-#include <lightningd/log.h>
 #include <lightningd/onion_message.h>
-#include <lightningd/options.h>
 #include <lightningd/ping.h>
-#include <sodium/randombytes.h>
-#include <string.h>
-#include <wire/peer_wire.h>
-#include <wire/wire_sync.h>
 
 static void got_txout(struct bitcoind *bitcoind,
 		      const struct bitcoin_tx_output *output,
diff --git a/lightningd/gossip_msg.c b/lightningd/gossip_msg.c
index 7cdf681df..6b51248a7 100644
--- a/lightningd/gossip_msg.c
+++ b/lightningd/gossip_msg.c
@@ -3,7 +3,6 @@
 #include <common/wireaddr.h>
 #include <lightningd/gossip_msg.h>
 #include <wire/peer_wire.h>
-#include <wire/wire.h>
 
 struct gossip_getnodes_entry *fromwire_gossip_getnodes_entry(const tal_t *ctx,
 	const u8 **pptr, size_t *max)
diff --git a/lightningd/hsm_control.c b/lightningd/hsm_control.c
index 2299bb627..3c54694cd 100644
--- a/lightningd/hsm_control.c
+++ b/lightningd/hsm_control.c
@@ -3,30 +3,17 @@
 #include "subd.h"
 #include <ccan/err/err.h>
 #include <ccan/fdpass/fdpass.h>
-#include <ccan/io/io.h>
-#include <ccan/take/take.h>
 #include <common/ecdh.h>
 #include <common/hsm_encryption.h>
-#include <common/json.h>
 #include <common/json_helpers.h>
-#include <common/jsonrpc_errors.h>
 #include <common/param.h>
-#include <common/status.h>
 #include <common/type_to_string.h>
-#include <common/utils.h>
 #include <errno.h>
 #include <hsmd/hsmd_wiregen.h>
-#include <inttypes.h>
-#include <lightningd/bitcoind.h>
-#include <lightningd/hsm_control.h>
 #include <lightningd/json.h>
 #include <lightningd/jsonrpc.h>
-#include <lightningd/log.h>
-#include <lightningd/log_status.h>
-#include <string.h>
 #include <sys/socket.h>
 #include <sys/stat.h>
-#include <sys/types.h>
 #include <wally_bip32.h>
 #include <wire/wire_sync.h>
 
diff --git a/lightningd/htlc_end.c b/lightningd/htlc_end.c
index 0e0b98f6f..8bcdc7bde 100644
--- a/lightningd/htlc_end.c
+++ b/lightningd/htlc_end.c
@@ -1,14 +1,11 @@
 #include <ccan/cast/cast.h>
 #include <ccan/crypto/siphash24/siphash24.h>
 #include <ccan/tal/str/str.h>
-#include <ccan/tal/tal.h>
 #include <common/htlc.h>
-#include <common/memleak.h>
 #include <common/pseudorand.h>
 #include <common/type_to_string.h>
 #include <lightningd/htlc_end.h>
 #include <lightningd/log.h>
-#include <stdio.h>
 
 size_t hash_htlc_key(const struct htlc_key *k)
 {
diff --git a/lightningd/htlc_set.c b/lightningd/htlc_set.c
index a53d264b8..8db291a1e 100644
--- a/lightningd/htlc_set.c
+++ b/lightningd/htlc_set.c
@@ -1,11 +1,9 @@
 #include <common/features.h>
 #include <common/timeout.h>
 #include <common/type_to_string.h>
-#include <lightningd/htlc_end.h>
 #include <lightningd/htlc_set.h>
 #include <lightningd/invoice.h>
 #include <lightningd/lightningd.h>
-#include <lightningd/peer_htlcs.h>
 
 /* If an HTLC times out, we need to free entire set, since we could be processing
  * it in invoice.c right now. */
diff --git a/lightningd/invoice.c b/lightningd/invoice.c
index 912854617..162bf4475 100644
--- a/lightningd/invoice.c
+++ b/lightningd/invoice.c
@@ -2,45 +2,26 @@
 #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>
-#include <common/amount.h>
-#include <common/bech32.h>
-#include <common/bolt11.h>
 #include <common/bolt11_json.h>
-#include <common/bolt12.h>
 #include <common/bolt12_merkle.h>
 #include <common/configdir.h>
-#include <common/features.h>
 #include <common/json_command.h>
 #include <common/json_helpers.h>
 #include <common/json_tok.h>
-#include <common/jsonrpc_errors.h>
 #include <common/onion.h>
 #include <common/overflows.h>
 #include <common/param.h>
 #include <common/random_select.h>
 #include <common/timeout.h>
 #include <common/type_to_string.h>
-#include <common/utils.h>
 #include <errno.h>
-#include <gossipd/gossipd_wiregen.h>
 #include <hsmd/hsmd_wiregen.h>
-#include <inttypes.h>
 #include <lightningd/channel.h>
-#include <lightningd/hsm_control.h>
-#include <lightningd/json.h>
-#include <lightningd/jsonrpc.h>
-#include <lightningd/lightningd.h>
-#include <lightningd/log.h>
 #include <lightningd/notification.h>
-#include <lightningd/options.h>
-#include <lightningd/peer_control.h>
-#include <lightningd/peer_htlcs.h>
 #include <lightningd/plugin_hook.h>
 #include <lightningd/routehint.h>
-#include <lightningd/subd.h>
 #include <sodium/randombytes.h>
 #include <wire/wire_sync.h>
 
diff --git a/lightningd/io_loop_with_timers.c b/lightningd/io_loop_with_timers.c
index 6078a22b0..7daa1f375 100644
--- a/lightningd/io_loop_with_timers.c
+++ b/lightningd/io_loop_with_timers.c
@@ -1,11 +1,8 @@
 #include "io_loop_with_timers.h"
 
 #include <ccan/io/io.h>
-#include <ccan/timer/timer.h>
 #include <common/timeout.h>
 #include <lightningd/lightningd.h>
-#include <wallet/db.h>
-#include <wallet/wallet.h>
 
 void *io_loop_with_timers(struct lightningd *ld)
 {
diff --git a/lightningd/json.c b/lightningd/json.c
index 0dfda2c11..73d1837aa 100644
--- a/lightningd/json.c
+++ b/lightningd/json.c
@@ -1,29 +1,9 @@
-#include <arpa/inet.h>
-#include <bitcoin/address.h>
-#include <bitcoin/base58.h>
-#include <bitcoin/script.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 <common/bech32.h>
-#include <common/channel_id.h>
-#include <common/json.h>
 #include <common/json_command.h>
 #include <common/json_helpers.h>
 #include <common/json_tok.h>
-#include <common/jsonrpc_errors.h>
-#include <common/memleak.h>
-#include <common/param.h>
-#include <common/type_to_string.h>
-#include <common/utils.h>
-#include <gossipd/routing.h>
 #include <lightningd/chaintopology.h>
 #include <lightningd/json.h>
-#include <lightningd/jsonrpc.h>
-#include <lightningd/options.h>
-#include <sys/socket.h>
-#include <wire/wire.h>
 
 struct command_result *param_pubkey(struct command *cmd, const char *name,
 				    const char *buffer, const jsmntok_t *tok,
diff --git a/lightningd/jsonrpc.c b/lightningd/jsonrpc.c
index 360d490df..09c0559e1 100644
--- a/lightningd/jsonrpc.c
+++ b/lightningd/jsonrpc.c
@@ -14,41 +14,24 @@
  */
 /* eg: { "jsonrpc":"2.0", "method" : "dev-echo", "params" : [ "hello", "Arabella!" ], "id" : "1" } */
 #include "ccan/config.h"
-#include <arpa/inet.h>
 #include <ccan/asort/asort.h>
 #include <ccan/err/err.h>
 #include <ccan/io/io.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/configdir.h>
 #include <common/json_command.h>
 #include <common/json_helpers.h>
 #include <common/json_tok.h>
-#include <common/jsonrpc_errors.h>
 #include <common/memleak.h>
 #include <common/param.h>
 #include <common/timeout.h>
-#include <common/utils.h>
-#include <common/version.h>
-#include <common/wireaddr.h>
-#include <errno.h>
 #include <fcntl.h>
-#include <lightningd/chaintopology.h>
-#include <lightningd/json.h>
 #include <lightningd/jsonrpc.h>
-#include <lightningd/log.h>
-#include <lightningd/memdump.h>
-#include <lightningd/options.h>
 #include <lightningd/plugin_hook.h>
-#include <stdio.h>
 #include <sys/socket.h>
 #include <sys/stat.h>
-#include <sys/types.h>
 #include <sys/un.h>
-#include <wallet/db.h>
 
 
 /* Dummy structure. */
diff --git a/lightningd/lightningd.c b/lightningd/lightningd.c
index ddf733e29..19cf2a485 100644
--- a/lightningd/lightningd.c
+++ b/lightningd/lightningd.c
@@ -27,7 +27,6 @@
 /*~ This is Ian Lance Taylor's libbacktrace.  It turns out that it's
  * horrifically difficult to obtain a decent backtrace in C; the standard
  * backtrace function is useless in most programs. */
-#include <backtrace.h>
 
 /*~ These headers are from CCAN: http://ccodearchive.net.
  *
@@ -40,17 +39,9 @@
  * in detail below.
  */
 #include <ccan/array_size/array_size.h>
-#include <ccan/cast/cast.h>
-#include <ccan/crypto/hkdf_sha256/hkdf_sha256.h>
-#include <ccan/err/err.h>
-#include <ccan/io/fdpass/fdpass.h>
-#include <ccan/io/io.h>
-#include <ccan/json_escape/json_escape.h>
-#include <ccan/noerr/noerr.h>
 #include <ccan/opt/opt.h>
 #include <ccan/pipecmd/pipecmd.h>
 #include <ccan/read_write_all/read_write_all.h>
-#include <ccan/take/take.h>
 #include <ccan/tal/grab_file/grab_file.h>
 #include <ccan/tal/path/path.h>
 #include <ccan/tal/str/str.h>
@@ -59,37 +50,26 @@
  *  (separate daemons, or the lightning-cli program). */
 #include <common/daemon.h>
 #include <common/ecdh_hsmd.h>
-#include <common/features.h>
 #include <common/hsm_encryption.h>
 #include <common/memleak.h>
 #include <common/timeout.h>
 #include <common/type_to_string.h>
-#include <common/utils.h>
 #include <common/version.h>
 
 #include <errno.h>
 #include <fcntl.h>
 #include <header_versions_gen.h>
-#include <lightningd/bitcoind.h>
 #include <lightningd/chaintopology.h>
 #include <lightningd/channel.h>
 #include <lightningd/channel_control.h>
 #include <lightningd/coin_mvts.h>
 #include <lightningd/connect_control.h>
-#include <lightningd/invoice.h>
 #include <lightningd/io_loop_with_timers.h>
-#include <lightningd/jsonrpc.h>
-#include <lightningd/log.h>
-#include <lightningd/memdump.h>
 #include <lightningd/onchain_control.h>
 #include <lightningd/options.h>
 #include <lightningd/plugin.h>
-#include <signal.h>
-#include <sodium.h>
 #include <sys/resource.h>
 #include <sys/stat.h>
-#include <sys/types.h>
-#include <unistd.h>
 #include <wallet/txfilter.h>
 #include <wally_bip32.h>
 
diff --git a/lightningd/log.c b/lightningd/log.c
index 10e530554..3d8385eee 100644
--- a/lightningd/log.c
+++ b/lightningd/log.c
@@ -1,9 +1,5 @@
 #include "log.h"
-#include <backtrace-supported.h>
-#include <backtrace.h>
-#include <ccan/array_size/array_size.h>
 #include <ccan/err/err.h>
-#include <ccan/htable/htable_type.h>
 #include <ccan/io/io.h>
 #include <ccan/opt/opt.h>
 #include <ccan/read_write_all/read_write_all.h>
@@ -12,24 +8,13 @@
 #include <ccan/tal/str/str.h>
 #include <common/json_command.h>
 #include <common/json_helpers.h>
-#include <common/jsonrpc_errors.h>
 #include <common/memleak.h>
 #include <common/param.h>
-#include <common/pseudorand.h>
-#include <common/utils.h>
 #include <errno.h>
 #include <fcntl.h>
-#include <inttypes.h>
-#include <lightningd/json.h>
-#include <lightningd/jsonrpc.h>
-#include <lightningd/lightningd.h>
 #include <lightningd/notification.h>
-#include <lightningd/options.h>
 #include <signal.h>
 #include <stdio.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <unistd.h>
 
 /* What logging level to use if they didn't specify */
 #define DEFAULT_LOGLEVEL LOG_INFORM
diff --git a/lightningd/memdump.c b/lightningd/memdump.c
index 85695ef86..0996ab83b 100644
--- a/lightningd/memdump.c
+++ b/lightningd/memdump.c
@@ -2,11 +2,8 @@
 #include "memdump.h"
 #if DEVELOPER
 #include <backtrace.h>
-#include <ccan/strmap/strmap.h>
 #include <ccan/tal/str/str.h>
-#include <common/daemon.h>
 #include <common/json_command.h>
-#include <common/jsonrpc_errors.h>
 #include <common/memleak.h>
 #include <common/param.h>
 #include <common/timeout.h>
@@ -17,11 +14,9 @@
 #include <lightningd/chaintopology.h>
 #include <lightningd/jsonrpc.h>
 #include <lightningd/lightningd.h>
-#include <lightningd/log.h>
 #include <lightningd/opening_common.h>
 #include <lightningd/peer_control.h>
 #include <lightningd/subd.h>
-#include <stdio.h>
 #include <wire/wire_sync.h>
 
 static void json_add_ptr(struct json_stream *response, const char *name,
diff --git a/lightningd/notification.c b/lightningd/notification.c
index e81be3956..31782ceac 100644
--- a/lightningd/notification.c
+++ b/lightningd/notification.c
@@ -1,10 +1,7 @@
-#include <ccan/array_size/array_size.h>
 #include <common/json_helpers.h>
 #include <common/type_to_string.h>
 #include <lightningd/channel.h>
-#include <lightningd/json.h>
 #include <lightningd/notification.h>
-#include <lightningd/peer_htlcs.h>
 
 static struct notification *find_notification_by_topic(const char* topic)
 {
diff --git a/lightningd/offer.c b/lightningd/offer.c
index a2bf006cb..3021f7596 100644
--- a/lightningd/offer.c
+++ b/lightningd/offer.c
@@ -1,21 +1,16 @@
 #include <ccan/cast/cast.h>
-#include <common/bolt12.h>
 #include <common/bolt12_merkle.h>
-#include <common/configdir.h>
 #include <common/json_command.h>
 #include <common/json_helpers.h>
 #include <common/json_tok.h>
-#include <common/jsonrpc_errors.h>
 #include <common/param.h>
 #include <common/type_to_string.h>
-#include <common/utils.h>
 #include <errno.h>
 #include <hsmd/hsmd_wiregen.h>
 #include <lightningd/jsonrpc.h>
 #include <lightningd/lightningd.h>
 #include <secp256k1_schnorrsig.h>
 #include <sodium/randombytes.h>
-#include <wallet/wallet.h>
 #include <wire/wire_sync.h>
 
 static void json_populate_offer(struct json_stream *response,
diff --git a/lightningd/onchain_control.c b/lightningd/onchain_control.c
index 135f00e7b..b29c5ce0a 100644
--- a/lightningd/onchain_control.c
+++ b/lightningd/onchain_control.c
@@ -1,8 +1,6 @@
 #include <bitcoin/feerate.h>
-#include <bitcoin/script.h>
 #include <common/key_derive.h>
 #include <common/type_to_string.h>
-#include <common/utils.h>
 #include <errno.h>
 #include <hsmd/capabilities.h>
 #include <inttypes.h>
@@ -10,14 +8,11 @@
 #include <lightningd/channel.h>
 #include <lightningd/coin_mvts.h>
 #include <lightningd/hsm_control.h>
-#include <lightningd/log.h>
 #include <lightningd/onchain_control.h>
 #include <lightningd/peer_control.h>
 #include <lightningd/subd.h>
-#include <lightningd/watch.h>
 #include <onchaind/onchaind_wiregen.h>
 #include <wallet/txfilter.h>
-#include <wire/wire_sync.h>
 
 /* We dump all the known preimages when onchaind starts up. */
 static void onchaind_tell_fulfill(struct channel *channel)
diff --git a/lightningd/onion_message.c b/lightningd/onion_message.c
index 822a784c5..1fe66bac6 100644
--- a/lightningd/onion_message.c
+++ b/lightningd/onion_message.c
@@ -4,7 +4,6 @@
 #include <common/type_to_string.h>
 #include <gossipd/gossipd_wiregen.h>
 #include <lightningd/channel.h>
-#include <lightningd/lightningd.h>
 #include <lightningd/onion_message.h>
 #include <lightningd/peer_control.h>
 #include <lightningd/plugin_hook.h>
diff --git a/lightningd/opening_common.c b/lightningd/opening_common.c
index c77d7bd60..9cd3872e9 100644
--- a/lightningd/opening_common.c
+++ b/lightningd/opening_common.c
@@ -1,19 +1,15 @@
 #include <ccan/ccan/tal/str/str.h>
 #include <common/json_command.h>
-#include <common/jsonrpc_errors.h>
 #include <common/type_to_string.h>
 #include <common/wire_error.h>
 #include <connectd/connectd_wiregen.h>
 #include <lightningd/channel.h>
 #include <lightningd/channel_control.h>
-#include <lightningd/log.h>
 #include <lightningd/notification.h>
 #include <lightningd/opening_common.h>
 #include <lightningd/peer_control.h>
 #include <lightningd/subd.h>
-#include <openingd/dualopend_wiregen.h>
 #include <openingd/openingd_wiregen.h>
-#include <wallet/wallet.h>
 
 static void destroy_uncommitted_channel(struct uncommitted_channel *uc)
 {
diff --git a/lightningd/opening_control.c b/lightningd/opening_control.c
index 0ff94494c..855805533 100644
--- a/lightningd/opening_control.c
+++ b/lightningd/opening_control.c
@@ -1,50 +1,32 @@
 #include "bitcoin/feerate.h"
-#include <bitcoin/privkey.h>
 #include <bitcoin/psbt.h>
-#include <bitcoin/script.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/channel_config.h>
 #include <common/configdir.h>
-#include <common/features.h>
 #include <common/fee_states.h>
 #include <common/json_command.h>
 #include <common/json_helpers.h>
 #include <common/json_tok.h>
-#include <common/jsonrpc_errors.h>
-#include <common/key_derive.h>
 #include <common/param.h>
-#include <common/penalty_base.h>
-#include <common/per_peer_state.h>
 #include <common/type_to_string.h>
-#include <common/utils.h>
-#include <common/wire_error.h>
-#include <connectd/connectd_wiregen.h>
 #include <errno.h>
 #include <hsmd/capabilities.h>
 #include <lightningd/chaintopology.h>
 #include <lightningd/channel.h>
 #include <lightningd/channel_control.h>
-#include <lightningd/closing_control.h>
 #include <lightningd/hsm_control.h>
 #include <lightningd/json.h>
-#include <lightningd/jsonrpc.h>
-#include <lightningd/lightningd.h>
 #include <lightningd/notification.h>
 #include <lightningd/opening_common.h>
 #include <lightningd/opening_control.h>
-#include <lightningd/options.h>
 #include <lightningd/plugin_hook.h>
 #include <lightningd/subd.h>
 #include <openingd/openingd_wiregen.h>
-#include <string.h>
 #include <wally_psbt.h>
 #include <wire/common_wiregen.h>
-#include <wire/wire.h>
-#include <wire/wire_sync.h>
 
 void json_add_uncommitted_channel(struct json_stream *response,
 				  const struct uncommitted_channel *uc)
diff --git a/lightningd/options.c b/lightningd/options.c
index 2cabdccf8..969f5ef85 100644
--- a/lightningd/options.c
+++ b/lightningd/options.c
@@ -1,52 +1,28 @@
 #include <ccan/array_size/array_size.h>
 #include <ccan/err/err.h>
-#include <ccan/json_escape/json_escape.h>
 #include <ccan/mem/mem.h>
 #include <ccan/opt/opt.h>
 #include <ccan/opt/private.h>
-#include <ccan/read_write_all/read_write_all.h>
-#include <ccan/short_types/short_types.h>
 #include <ccan/str/hex/hex.h>
 #include <ccan/tal/path/path.h>
 #include <ccan/tal/str/str.h>
-#include <common/base64.h>
-#include <common/channel_id.h>
 #include <common/configdir.h>
-#include <common/derive_basepoints.h>
 #include <common/features.h>
 #include <common/hsm_encryption.h>
 #include <common/json_command.h>
 #include <common/json_tok.h>
-#include <common/jsonrpc_errors.h>
-#include <common/memleak.h>
 #include <common/param.h>
 #include <common/type_to_string.h>
-#include <common/utils.h>
 #include <common/version.h>
 #include <common/wireaddr.h>
 #include <dirent.h>
 #include <errno.h>
-#include <fcntl.h>
-#include <inttypes.h>
-#include <lightningd/bitcoind.h>
 #include <lightningd/chaintopology.h>
-#include <lightningd/json.h>
-#include <lightningd/jsonrpc.h>
-#include <lightningd/lightningd.h>
-#include <lightningd/log.h>
 #include <lightningd/options.h>
 #include <lightningd/plugin.h>
 #include <lightningd/subd.h>
-#include <sodium.h>
-#include <stdio.h>
-#include <string.h>
-#include <sys/socket.h>
 #include <sys/stat.h>
-#include <sys/types.h>
 #include <sys/wait.h>
-#include <termios.h>
-#include <unistd.h>
-#include <wire/wire.h>
 
 /* Declare opt_add_addr here, because we we call opt_add_addr
  * and opt_announce_addr vice versa
diff --git a/lightningd/pay.c b/lightningd/pay.c
index 6d1f2c65d..44782c97d 100644
--- a/lightningd/pay.c
+++ b/lightningd/pay.c
@@ -1,32 +1,20 @@
 #include "pay.h"
-#include <ccan/str/hex/hex.h>
 #include <ccan/tal/str/str.h>
-#include <common/bolt11.h>
-#include <common/bolt12.h>
 #include <common/bolt12_merkle.h>
 #include <common/json_command.h>
 #include <common/json_helpers.h>
 #include <common/json_tok.h>
-#include <common/jsonrpc_errors.h>
 #include <common/onion.h>
 #include <common/onionreply.h>
 #include <common/param.h>
 #include <common/route.h>
 #include <common/timeout.h>
 #include <common/type_to_string.h>
-#include <gossipd/gossipd_wiregen.h>
-#include <lightningd/channel.h>
 #include <lightningd/chaintopology.h>
+#include <lightningd/channel.h>
 #include <lightningd/json.h>
-#include <lightningd/jsonrpc.h>
-#include <lightningd/lightningd.h>
-#include <lightningd/log.h>
 #include <lightningd/notification.h>
-#include <lightningd/options.h>
 #include <lightningd/peer_control.h>
-#include <lightningd/peer_htlcs.h>
-#include <lightningd/subd.h>
-#include <sodium/randombytes.h>
 
 /* Routing failure object */
 struct routing_failure {
diff --git a/lightningd/peer_htlcs.c b/lightningd/peer_htlcs.c
index bcea016be..607e99f35 100644
--- a/lightningd/peer_htlcs.c
+++ b/lightningd/peer_htlcs.c
@@ -1,47 +1,27 @@
-#include <bitcoin/preimage.h>
-#include <bitcoin/tx.h>
-#include <ccan/build_assert/build_assert.h>
 #include <ccan/cast/cast.h>
-#include <ccan/crypto/ripemd160/ripemd160.h>
-#include <ccan/mem/mem.h>
 #include <ccan/tal/str/str.h>
 #include <channeld/channeld_wiregen.h>
 #include <common/blinding.h>
-#include <common/coin_mvt.h>
 #include <common/configdir.h>
 #include <common/ecdh.h>
 #include <common/json_command.h>
 #include <common/json_helpers.h>
 #include <common/json_tok.h>
-#include <common/jsonrpc_errors.h>
 #include <common/onion.h>
 #include <common/onionreply.h>
-#include <common/overflows.h>
 #include <common/param.h>
-#include <common/sphinx.h>
 #include <common/timeout.h>
 #include <common/type_to_string.h>
-#include <common/utils.h>
 #include <gossipd/gossipd_wiregen.h>
-#include <lightningd/channel.h>
 #include <lightningd/chaintopology.h>
+#include <lightningd/channel.h>
 #include <lightningd/coin_mvts.h>
-#include <lightningd/htlc_end.h>
-#include <lightningd/htlc_set.h>
-#include <lightningd/json.h>
-#include <lightningd/jsonrpc.h>
-#include <lightningd/lightningd.h>
-#include <lightningd/log.h>
-#include <lightningd/options.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 <wallet/wallet.h>
-#include <wire/onion_wire.h>
-#include <wire/wire_sync.h>
 
 #ifndef SUPERVERBOSE
 #define SUPERVERBOSE(...)
diff --git a/lightningd/ping.c b/lightningd/ping.c
index e1bcd4963..9eb946222 100644
--- a/lightningd/ping.c
+++ b/lightningd/ping.c
@@ -1,17 +1,9 @@
-#include <channeld/channeld_wiregen.h>
 #include <common/json_command.h>
 #include <common/json_tok.h>
-#include <common/jsonrpc_errors.h>
 #include <common/param.h>
-#include <common/sphinx.h>
-#include <common/utils.h>
 #include <gossipd/gossipd_wiregen.h>
-#include <lightningd/htlc_end.h>
-#include <lightningd/json.h>
 #include <lightningd/jsonrpc.h>
 #include <lightningd/lightningd.h>
-#include <lightningd/log.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 4675bde78..39e6e480c 100644
--- a/lightningd/plugin.c
+++ b/lightningd/plugin.c
@@ -2,7 +2,6 @@
 #include <ccan/ccan/tal/grab_file/grab_file.h>
 #include <ccan/crc32c/crc32c.h>
 #include <ccan/io/io.h>
-#include <ccan/list/list.h>
 #include <ccan/mem/mem.h>
 #include <ccan/opt/opt.h>
 #include <ccan/pipecmd/pipecmd.h>
@@ -15,20 +14,15 @@
 #include <common/json_helpers.h>
 #include <common/memleak.h>
 #include <common/timeout.h>
-#include <common/utils.h>
 #include <common/version.h>
 #include <dirent.h>
 #include <errno.h>
 #include <lightningd/io_loop_with_timers.h>
-#include <lightningd/json.h>
 #include <lightningd/notification.h>
-#include <lightningd/options.h>
 #include <lightningd/plugin.h>
 #include <lightningd/plugin_control.h>
 #include <lightningd/plugin_hook.h>
-#include <signal.h>
 #include <sys/stat.h>
-#include <sys/types.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 4a35c9550..05f5e6723 100644
--- a/lightningd/plugin_control.c
+++ b/lightningd/plugin_control.c
@@ -1,4 +1,3 @@
-#include <ccan/opt/opt.h>
 #include <ccan/tal/str/str.h>
 #include <common/json_command.h>
 #include <common/json_tok.h>
@@ -7,11 +6,7 @@
 #include <common/timeout.h>
 #include <errno.h>
 #include <lightningd/notification.h>
-#include <lightningd/options.h>
 #include <lightningd/plugin_control.h>
-#include <lightningd/plugin_hook.h>
-#include <sys/stat.h>
-#include <sys/types.h>
 #include <unistd.h>
 
 /* A dummy structure used to give multiple arguments to callbacks. */
diff --git a/lightningd/plugin_hook.c b/lightningd/plugin_hook.c
index 16c62b187..b6643e7d7 100644
--- a/lightningd/plugin_hook.c
+++ b/lightningd/plugin_hook.c
@@ -1,12 +1,6 @@
-#include <ccan/asort/asort.h>
 #include <ccan/io/io.h>
-#include <ccan/list/list.h>
-#include <common/configdir.h>
 #include <common/memleak.h>
-#include <lightningd/jsonrpc.h>
 #include <lightningd/plugin_hook.h>
-#include <wallet/db.h>
-#include <wallet/db_common.h>
 
 /* Struct containing all the information needed to deserialize and
  * dispatch an eventual plugin_hook response. */
diff --git a/lightningd/routehint.c b/lightningd/routehint.c
index 6e833fcfb..4da52679a 100644
--- a/lightningd/routehint.c
+++ b/lightningd/routehint.c
@@ -1,11 +1,9 @@
 #include <common/bolt11.h>
 #include <common/json_helpers.h>
 #include <common/type_to_string.h>
-#include <common/utils.h>
 #include <gossipd/gossipd_wiregen.h>
 #include <lightningd/channel.h>
 #include <lightningd/lightningd.h>
-#include <lightningd/log.h>
 #include <lightningd/peer_control.h>
 #include <lightningd/routehint.h>
 
diff --git a/lightningd/signmessage.c b/lightningd/signmessage.c
index 4c0b0d280..d0d38f42c 100644
--- a/lightningd/signmessage.c
+++ b/lightningd/signmessage.c
@@ -1,21 +1,12 @@
 #include <common/bech32.h>
-#include <common/hash_u5.h>
 #include <common/json_command.h>
 #include <common/json_helpers.h>
 #include <common/json_tok.h>
-#include <common/jsonrpc_errors.h>
 #include <common/param.h>
-#include <common/type_to_string.h>
-#include <common/utils.h>
 #include <errno.h>
-#include <gossipd/gossipd_wiregen.h>
 #include <hsmd/hsmd_wiregen.h>
 #include <lightningd/json.h>
-#include <lightningd/jsonrpc.h>
-#include <lightningd/lightningd.h>
 #include <lightningd/plugin.h>
-#include <lightningd/subd.h>
-#include <string.h>
 #include <wire/wire_sync.h>
 
 /* These tables copied from zbase32 src:
diff --git a/lightningd/subd.c b/lightningd/subd.c
index 0a9b0c2be..765367bdb 100644
--- a/lightningd/subd.c
+++ b/lightningd/subd.c
@@ -1,34 +1,20 @@
-#include <ccan/array_size/array_size.h>
 #include <ccan/err/err.h>
 #include <ccan/io/fdpass/fdpass.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/path/path.h>
 #include <ccan/tal/str/str.h>
-#include <common/crypto_state.h>
 #include <common/memleak.h>
 #include <common/peer_status_wiregen.h>
-#include <common/per_peer_state.h>
 #include <common/status_wiregen.h>
 #include <common/version.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <lightningd/lightningd.h>
-#include <lightningd/log.h>
 #include <lightningd/log_status.h>
-#include <lightningd/peer_control.h>
 #include <lightningd/subd.h>
-#include <signal.h>
-#include <stdarg.h>
 #include <sys/socket.h>
-#include <sys/stat.h>
-#include <sys/types.h>
 #include <sys/wait.h>
-#include <unistd.h>
-#include <wallet/db.h>
 #include <wire/common_wiregen.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 b10e03ef6..411b3add8 100644
--- a/lightningd/test/run-find_my_abspath.c
+++ b/lightningd/test/run-find_my_abspath.c
@@ -5,7 +5,6 @@ int unused_main(int argc, char *argv[]);
 #include "../io_loop_with_timers.c"
 #include "../lightningd.c"
 #include "../subd.c"
-#include <common/amount.h>
 
 /* AUTOGENERATED MOCKS START */
 /* Generated stub for activate_peers */
diff --git a/lightningd/test/run-invoice-select-inchan.c b/lightningd/test/run-invoice-select-inchan.c
index 30b5d883c..b182cc01a 100644
--- a/lightningd/test/run-invoice-select-inchan.c
+++ b/lightningd/test/run-invoice-select-inchan.c
@@ -4,6 +4,7 @@
 #include <ccan/alignof/alignof.h>
 #include <common/errcode.h>
 #include <common/setup.h>
+#include <stdio.h>
 
 bool deprecated_apis = false;
 
diff --git a/lightningd/test/run-jsonrpc.c b/lightningd/test/run-jsonrpc.c
index b56537605..3505dfd79 100644
--- a/lightningd/test/run-jsonrpc.c
+++ b/lightningd/test/run-jsonrpc.c
@@ -2,6 +2,7 @@
 #include "../jsonrpc.c"
 #include "../json.c"
 #include <common/setup.h>
+#include <stdio.h>
 
 /* AUTOGENERATED MOCKS START */
 /* Generated stub for db_begin_transaction_ */
diff --git a/lightningd/test/run-log-pruning.c b/lightningd/test/run-log-pruning.c
index df384865c..f1150f276 100644
--- a/lightningd/test/run-log-pruning.c
+++ b/lightningd/test/run-log-pruning.c
@@ -1,5 +1,4 @@
 #include "../log.c"
-#include <common/wireaddr.h>
 
 /* AUTOGENERATED MOCKS START */
 /* Generated stub for command_fail */
diff --git a/lightningd/watch.c b/lightningd/watch.c
index c011b8a10..34cc8ce4e 100644
--- a/lightningd/watch.c
+++ b/lightningd/watch.c
@@ -26,18 +26,10 @@
  *
  * WE ASSUME NO MALLEABILITY!  This requires segregated witness.
  */
-#include <bitcoin/script.h>
-#include <ccan/crypto/siphash24/siphash24.h>
-#include <ccan/ptrint/ptrint.h>
-#include <common/pseudorand.h>
-#include <common/timeout.h>
 #include <common/type_to_string.h>
-#include <lightningd/bitcoind.h>
-#include <lightningd/channel.h>
 #include <lightningd/chaintopology.h>
+#include <lightningd/channel.h>
 #include <lightningd/lightningd.h>
-#include <lightningd/log.h>
-#include <lightningd/peer_control.h>
 #include <lightningd/watch.h>
 
 /* Watching an output */
diff --git a/onchaind/onchaind.c b/onchaind/onchaind.c
index 249d4d9a9..425a5da74 100644
--- a/onchaind/onchaind.c
+++ b/onchaind/onchaind.c
@@ -1,17 +1,10 @@
 #include <bitcoin/feerate.h>
-#include <bitcoin/psbt.h>
 #include <bitcoin/script.h>
 #include <ccan/asort/asort.h>
-#include <ccan/crypto/shachain/shachain.h>
 #include <ccan/mem/mem.h>
 #include <ccan/tal/str/str.h>
-#include <common/amount.h>
-#include <common/coin_mvt.h>
-#include <common/daemon.h>
-#include <common/derive_basepoints.h>
 #include <common/htlc_tx.h>
 #include <common/initial_commit_tx.h>
-#include <common/key_derive.h>
 #include <common/keyset.h>
 #include <common/lease_rates.h>
 #include <common/memleak.h>
@@ -20,16 +13,9 @@
 #include <common/status.h>
 #include <common/subdaemon.h>
 #include <common/type_to_string.h>
-#include <common/utils.h>
-#include <common/version.h>
-#include <common/wallet.h>
-#include <errno.h>
 #include <hsmd/hsmd_wiregen.h>
-#include <inttypes.h>
-#include <lightningd/channel_state.h>
 #include <onchaind/onchain_types.h>
 #include <onchaind/onchaind_wiregen.h>
-#include <stdio.h>
 #include <unistd.h>
 #include <wire/wire_sync.h>
   #include "onchain_types_names_gen.h"
diff --git a/onchaind/onchaind_wire.c b/onchaind/onchaind_wire.c
index 22b13427d..8548b97b5 100644
--- a/onchaind/onchaind_wire.c
+++ b/onchaind/onchaind_wire.c
@@ -1,6 +1,5 @@
 #include <common/htlc_wire.h>
 #include <onchaind/onchaind_wire.h>
-#include <wire/wire.h>
 
 void towire_htlc_stub(u8 **pptr, const struct htlc_stub *htlc_stub)
 {
diff --git a/onchaind/test/run-grind_feerate-bug.c b/onchaind/test/run-grind_feerate-bug.c
index 4defad9d9..e8e7f3092 100644
--- a/onchaind/test/run-grind_feerate-bug.c
+++ b/onchaind/test/run-grind_feerate-bug.c
@@ -4,6 +4,7 @@
 */
 #include <ccan/str/hex/hex.h>
 #include <common/setup.h>
+#include <stdio.h>
 
 #define main test_main
 int test_main(int argc, char *argv[]);
diff --git a/onchaind/test/run-grind_feerate.c b/onchaind/test/run-grind_feerate.c
index aeae019a0..5cc725f6f 100644
--- a/onchaind/test/run-grind_feerate.c
+++ b/onchaind/test/run-grind_feerate.c
@@ -3,6 +3,7 @@
 #include <common/daemon.h>
 #include <common/setup.h>
 #include <common/status.h>
+#include <stdio.h>
 
 #undef status_debug
 #define status_debug(...)
diff --git a/onchaind/test/run-onchainstress.c b/onchaind/test/run-onchainstress.c
index 60f851ed9..0044a3e9f 100644
--- a/onchaind/test/run-onchainstress.c
+++ b/onchaind/test/run-onchainstress.c
@@ -5,6 +5,7 @@
 #include <ccan/str/hex/hex.h>
 #include <common/dev_disconnect.h>
 #include <common/onionreply.h>
+#include <common/version.h>
 #include <err.h>
 #include <zlib.h>
 
diff --git a/openingd/common.c b/openingd/common.c
index 7326bc48b..0a869bfa0 100644
--- a/openingd/common.c
+++ b/openingd/common.c
@@ -1,5 +1,4 @@
 #include <ccan/ccan/tal/str/str.h>
-#include <common/amount.h>
 #include <common/channel_config.h>
 #include <common/features.h>
 #include <common/initial_commit_tx.h>
diff --git a/openingd/dualopend.c b/openingd/dualopend.c
index 5f23fba65..0721cc716 100644
--- a/openingd/dualopend.c
+++ b/openingd/dualopend.c
@@ -11,56 +11,36 @@
  * new and improved, two-party opening protocol, which allows bother peers to
  * contribute inputs to the transaction
  */
-#include <bitcoin/feerate.h>
-#include <bitcoin/privkey.h>
 #include <bitcoin/script.h>
-#include <bitcoin/tx.h>
-#include <bitcoin/varint.h>
 #include <ccan/array_size/array_size.h>
 #include <ccan/cast/cast.h>
 #include <ccan/mem/mem.h>
-#include <ccan/take/take.h>
 #include <ccan/tal/str/str.h>
-#include <ccan/time/time.h>
-#include <ccan/fdpass/fdpass.h>
-#include <ccan/short_types/short_types.h>
-#include <common/amount.h>
 #include <common/billboard.h>
 #include <common/blockheight_states.h>
-#include <common/channel_config.h>
-#include <common/channel_id.h>
 #include <common/channel_type.h>
 #include <common/crypto_sync.h>
-#include <common/fee_states.h>
 #include <common/gossip_rcvd_filter.h>
 #include <common/gossip_store.h>
-#include <common/htlc.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/penalty_base.h>
-#include <common/per_peer_state.h>
 #include <common/psbt_internal.h>
 #include <common/psbt_open.h>
 #include <common/read_peer_msg.h>
 #include <common/setup.h>
 #include <common/status.h>
 #include <common/subdaemon.h>
-#include <common/tx_roles.h>
 #include <common/type_to_string.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 <openingd/common.h>
 #include <openingd/dualopend_wiregen.h>
 #include <unistd.h>
 #include <wire/common_wiregen.h>
-#include <wire/peer_wire.h>
 #include <wire/wire_sync.h>
 
 /* stdin == lightningd, 3 == peer, 4 == gossipd, 5 = gossip_store, 6 = hsmd */
diff --git a/openingd/openingd.c b/openingd/openingd.c
index ecaa02aed..14429cb31 100644
--- a/openingd/openingd.c
+++ b/openingd/openingd.c
@@ -7,52 +7,31 @@
  * there's nothing permanent about the channel: lightningd will only have to
  * commit to the database once openingd succeeds.
  */
-#include <bitcoin/block.h>
-#include <bitcoin/chainparams.h>
-#include <bitcoin/privkey.h>
-#include <bitcoin/psbt.h>
 #include <bitcoin/script.h>
 #include <ccan/array_size/array_size.h>
 #include <ccan/breakpoint/breakpoint.h>
-#include <ccan/cast/cast.h>
-#include <ccan/fdpass/fdpass.h>
-#include <ccan/mem/mem.h>
 #include <ccan/tal/str/str.h>
 #include <common/channel_type.h>
 #include <common/crypto_sync.h>
-#include <common/derive_basepoints.h>
 #include <common/fee_states.h>
 #include <common/gossip_rcvd_filter.h>
 #include <common/gossip_store.h>
 #include <common/initial_channel.h>
-#include <common/initial_commit_tx.h>
-#include <common/key_derive.h>
 #include <common/memleak.h>
-#include <common/overflows.h>
 #include <common/peer_billboard.h>
 #include <common/peer_failed.h>
-#include <common/peer_status_wiregen.h>
-#include <common/penalty_base.h>
 #include <common/read_peer_msg.h>
 #include <common/shutdown_scriptpubkey.h>
 #include <common/status.h>
 #include <common/subdaemon.h>
 #include <common/type_to_string.h>
-#include <common/version.h>
 #include <common/wire_error.h>
 #include <errno.h>
-#include <gossipd/gossipd_peerd_wiregen.h>
 #include <hsmd/hsmd_wiregen.h>
-#include <inttypes.h>
 #include <openingd/common.h>
 #include <openingd/openingd_wiregen.h>
-#include <poll.h>
-#include <secp256k1.h>
-#include <stdio.h>
-#include <wally_bip32.h>
 #include <wire/common_wiregen.h>
 #include <wire/peer_wire.h>
-#include <wire/wire.h>
 #include <wire/wire_sync.h>
 
 /* stdin == lightningd, 3 == peer, 4 == gossipd, 5 = gossip_store, 6 = hsmd */
diff --git a/plugins/autoclean.c b/plugins/autoclean.c
index a5da39b26..3218dc65f 100644
--- a/plugins/autoclean.c
+++ b/plugins/autoclean.c
@@ -1,10 +1,5 @@
 #include <ccan/array_size/array_size.h>
-#include <ccan/json_out/json_out.h>
-#include <ccan/tal/str/str.h>
-#include <ccan/time/time.h>
 #include <common/json_tok.h>
-#include <common/utils.h>
-#include <inttypes.h>
 #include <plugins/libplugin.h>
 
 static u64 cycle_seconds = 0, expired_by = 86400;
diff --git a/plugins/bcli.c b/plugins/bcli.c
index 2a619a24e..b626099f1 100644
--- a/plugins/bcli.c
+++ b/plugins/bcli.c
@@ -1,24 +1,13 @@
 #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/cast/cast.h>
 #include <ccan/io/io.h>
-#include <ccan/json_out/json_out.h>
 #include <ccan/pipecmd/pipecmd.h>
-#include <ccan/str/hex/hex.h>
-#include <ccan/take/take.h>
 #include <ccan/tal/grab_file/grab_file.h>
-#include <ccan/tal/path/path.h>
 #include <ccan/tal/str/str.h>
-#include <common/json_helpers.h>
 #include <common/json_tok.h>
 #include <common/memleak.h>
-#include <common/utils.h>
 #include <errno.h>
-#include <inttypes.h>
 #include <plugins/libplugin.h>
 
 /* Bitcoind's web server has a default of 4 threads, with queue depth 16.
diff --git a/plugins/fetchinvoice.c b/plugins/fetchinvoice.c
index 62f470b8a..37b642214 100644
--- a/plugins/fetchinvoice.c
+++ b/plugins/fetchinvoice.c
@@ -1,15 +1,10 @@
 #include <bitcoin/chainparams.h>
-#include <bitcoin/preimage.h>
 #include <ccan/array_size/array_size.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 <ccan/time/time.h>
-#include <ccan/utf8/utf8.h>
 #include <common/blindedpath.h>
-#include <common/bolt11.h>
-#include <common/bolt12.h>
 #include <common/bolt12_merkle.h>
 #include <common/dijkstra.h>
 #include <common/gossmap.h>
@@ -19,9 +14,7 @@
 #include <common/overflows.h>
 #include <common/route.h>
 #include <common/type_to_string.h>
-#include <common/utils.h>
 #include <errno.h>
-#include <inttypes.h>
 #include <plugins/libplugin.h>
 #include <secp256k1_schnorrsig.h>
 #include <sodium.h>
diff --git a/plugins/funder.c b/plugins/funder.c
index b0bb2416d..1caf3273e 100644
--- a/plugins/funder.c
+++ b/plugins/funder.c
@@ -10,26 +10,17 @@
  */
 #include "config.h"
 #include <bitcoin/feerate.h>
-#include <bitcoin/psbt.h>
 #include <ccan/array_size/array_size.h>
 #include <ccan/json_out/json_out.h>
-#include <ccan/list/list.h>
 #include <ccan/tal/str/str.h>
-#include <common/channel_id.h>
-#include <common/json.h>
-#include <common/json_helpers.h>
 #include <common/json_stream.h>
 #include <common/json_tok.h>
-#include <common/lease_rates.h>
 #include <common/memleak.h>
-#include <common/node_id.h>
 #include <common/overflows.h>
 #include <common/psbt_open.h>
 #include <common/type_to_string.h>
-#include <common/utils.h>
 #include <plugins/funder_policy.h>
 #include <plugins/libplugin.h>
-#include <wire/peer_wire.h>
 
 /* In-progress channel opens */
 static struct list_head pending_opens;
diff --git a/plugins/funder_policy.c b/plugins/funder_policy.c
index 50c45be3b..b079637e6 100644
--- a/plugins/funder_policy.c
+++ b/plugins/funder_policy.c
@@ -2,7 +2,6 @@
 #include <bitcoin/script.h>
 #include <ccan/tal/str/str.h>
 #include <common/lease_rates.h>
-#include <common/node_id.h>
 #include <common/pseudorand.h>
 #include <common/type_to_string.h>
 #include <inttypes.h>
diff --git a/plugins/keysend.c b/plugins/keysend.c
index 07f2ea40c..e0a8e36f4 100644
--- a/plugins/keysend.c
+++ b/plugins/keysend.c
@@ -1,15 +1,10 @@
-#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/gossmap.h>
 #include <common/json_tok.h>
 #include <common/type_to_string.h>
 #include <plugins/libplugin-pay.h>
-#include <plugins/libplugin.h>
 #include <sodium.h>
-#include <wire/onion_wire.h>
 
 #define PREIMAGE_TLV_TYPE 5482373484
 #define KEYSEND_FEATUREBIT 55
diff --git a/plugins/libplugin-pay.c b/plugins/libplugin-pay.c
index 7ade24b93..ea4c1a3cd 100644
--- a/plugins/libplugin-pay.c
+++ b/plugins/libplugin-pay.c
@@ -1,9 +1,7 @@
-#include <bitcoin/preimage.h>
 #include <ccan/array_size/array_size.h>
 #include <ccan/tal/str/str.h>
 #include <common/dijkstra.h>
 #include <common/gossmap.h>
-#include <common/json_helpers.h>
 #include <common/json_stream.h>
 #include <common/memleak.h>
 #include <common/pseudorand.h>
diff --git a/plugins/libplugin.c b/plugins/libplugin.c
index 21bf429bd..71ac8159b 100644
--- a/plugins/libplugin.c
+++ b/plugins/libplugin.c
@@ -1,6 +1,5 @@
 #include <bitcoin/chainparams.h>
 #include <bitcoin/privkey.h>
-#include <ccan/err/err.h>
 #include <ccan/io/io.h>
 #include <ccan/json_out/json_out.h>
 #include <ccan/read_write_all/read_write_all.h>
@@ -9,17 +8,11 @@
 #include <common/json_stream.h>
 #include <common/memleak.h>
 #include <common/route.h>
-#include <common/utils.h>
 #include <errno.h>
 #include <plugins/libplugin.h>
-#include <poll.h>
-#include <stdarg.h>
 #include <stdio.h>
-#include <string.h>
 #include <sys/socket.h>
-#include <sys/types.h>
 #include <sys/un.h>
-#include <unistd.h>
 
 #define READ_CHUNKSIZE 4096
 
diff --git a/plugins/offers.c b/plugins/offers.c
index 3eae1a88d..656f422f0 100644
--- a/plugins/offers.c
+++ b/plugins/offers.c
@@ -5,12 +5,9 @@
 #include <common/bech32.h>
 #include <common/bolt11.h>
 #include <common/bolt11_json.h>
-#include <common/bolt12.h>
 #include <common/bolt12_merkle.h>
 #include <common/iso4217.h>
 #include <common/json_stream.h>
-#include <common/utils.h>
-#include <plugins/libplugin.h>
 #include <plugins/offers.h>
 #include <plugins/offers_inv_hook.h>
 #include <plugins/offers_invreq_hook.h>
diff --git a/plugins/offers_inv_hook.c b/plugins/offers_inv_hook.c
index 7551117e2..2e6ad7eff 100644
--- a/plugins/offers_inv_hook.c
+++ b/plugins/offers_inv_hook.c
@@ -1,13 +1,6 @@
-#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/bolt12.h>
 #include <common/bolt12_merkle.h>
-#include <common/json_stream.h>
-#include <common/overflows.h>
 #include <common/type_to_string.h>
 #include <plugins/offers.h>
 #include <plugins/offers_inv_hook.h>
diff --git a/plugins/offers_invreq_hook.c b/plugins/offers_invreq_hook.c
index 9c8eba0a1..4a0d6a956 100644
--- a/plugins/offers_invreq_hook.c
+++ b/plugins/offers_invreq_hook.c
@@ -1,13 +1,10 @@
 #include <bitcoin/chainparams.h>
 #include <bitcoin/preimage.h>
-#include <ccan/cast/cast.h>
 #include <ccan/tal/str/str.h>
 #include <common/bech32_util.h>
-#include <common/bolt12.h>
 #include <common/bolt12_merkle.h>
 #include <common/iso4217.h>
 #include <common/json_stream.h>
-#include <common/jsonrpc_errors.h>
 #include <common/overflows.h>
 #include <common/type_to_string.h>
 #include <plugins/offers.h>
diff --git a/plugins/offers_offer.c b/plugins/offers_offer.c
index 4b2960c4f..9769d25bc 100644
--- a/plugins/offers_offer.c
+++ b/plugins/offers_offer.c
@@ -3,11 +3,9 @@
 #include <ccan/tal/str/str.h>
 #include <common/bolt12.h>
 #include <common/iso4217.h>
-#include <common/json_stream.h>
 #include <common/json_tok.h>
 #include <common/overflows.h>
 #include <plugins/offers_offer.h>
-#include <wire/onion_wire.h>
 
 static bool msat_or_any(const char *buffer,
 			const jsmntok_t *tok,
diff --git a/plugins/pay.c b/plugins/pay.c
index a002b4d1b..176ef9cbf 100644
--- a/plugins/pay.c
+++ b/plugins/pay.c
@@ -4,29 +4,17 @@
 #include <ccan/cast/cast.h>
 #include <ccan/crypto/siphash24/siphash24.h>
 #include <ccan/htable/htable_type.h>
-#include <ccan/intmap/intmap.h>
 #include <ccan/json_out/json_out.h>
 #include <ccan/str/hex/hex.h>
 #include <ccan/tal/str/str.h>
-#include <common/amount.h>
-#include <common/bolt11.h>
-#include <common/bolt12.h>
 #include <common/bolt12_merkle.h>
-#include <common/errcode.h>
-#include <common/features.h>
-#include <common/gossip_constants.h>
 #include <common/gossmap.h>
 #include <common/json_stream.h>
 #include <common/json_tok.h>
 #include <common/pseudorand.h>
 #include <common/type_to_string.h>
-#include <inttypes.h>
 #include <plugins/libplugin-pay.h>
-#include <plugins/libplugin.h>
-#include <stdint.h>
 #include <stdio.h>
-#include <wire/onion_defs.h>
-#include <wire/wire.h>
 
 /* Public key of this node. */
 static struct node_id my_id;
diff --git a/plugins/spender/fundchannel.c b/plugins/spender/fundchannel.c
index 799e09117..3b829f76d 100644
--- a/plugins/spender/fundchannel.c
+++ b/plugins/spender/fundchannel.c
@@ -1,6 +1,4 @@
 #include <ccan/array_size/array_size.h>
-#include <ccan/compiler/compiler.h>
-#include <common/json.h>
 #include <common/json_stream.h>
 #include <common/json_tok.h>
 #include <plugins/spender/fundchannel.h>
diff --git a/plugins/spender/main.c b/plugins/spender/main.c
index a1f23e050..717613319 100644
--- a/plugins/spender/main.c
+++ b/plugins/spender/main.c
@@ -1,5 +1,3 @@
-#include <common/utils.h>
-#include <plugins/libplugin.h>
 #include <plugins/spender/fundchannel.h>
 #include <plugins/spender/multifundchannel.h>
 #include <plugins/spender/multiwithdraw.h>
diff --git a/plugins/spender/multifundchannel.c b/plugins/spender/multifundchannel.c
index a60d425db..e2ada2bd1 100644
--- a/plugins/spender/multifundchannel.c
+++ b/plugins/spender/multifundchannel.c
@@ -1,35 +1,16 @@
 #include "config.h"
-#include <assert.h>
-#include <bitcoin/chainparams.h>
 #include <bitcoin/psbt.h>
 #include <bitcoin/script.h>
-#include <bitcoin/tx.h>
 #include <ccan/array_size/array_size.h>
-#include <ccan/compiler/compiler.h>
-#include <ccan/crypto/sha256/sha256.h>
-#include <ccan/json_out/json_out.h>
-#include <ccan/str/str.h>
 #include <ccan/tal/str/str.h>
-#include <ccan/take/take.h>
 #include <common/addr.h>
-#include <common/amount.h>
-#include <common/features.h>
-#include <common/json.h>
 #include <common/json_stream.h>
 #include <common/json_tok.h>
-#include <common/jsonrpc_errors.h>
-#include <common/lease_rates.h>
-#include <common/node_id.h>
 #include <common/psbt_open.h>
 #include <common/pseudorand.h>
-#include <common/tx_roles.h>
 #include <common/type_to_string.h>
-#include <common/utils.h>
 #include <plugins/spender/multifundchannel.h>
 #include <plugins/spender/openchannel.h>
-#include <stdarg.h>
-#include <stdlib.h>
-#include <string.h>
 
 extern const struct chainparams *chainparams;
 
diff --git a/plugins/spender/multiwithdraw.c b/plugins/spender/multiwithdraw.c
index e53a56b9f..941c84d6a 100644
--- a/plugins/spender/multiwithdraw.c
+++ b/plugins/spender/multiwithdraw.c
@@ -1,20 +1,13 @@
 #include <bitcoin/chainparams.h>
 #include <bitcoin/psbt.h>
-#include <bitcoin/tx.h>
 #include <ccan/array_size/array_size.h>
 #include <ccan/json_out/json_out.h>
-#include <ccan/take/take.h>
 #include <ccan/tal/str/str.h>
-#include <common/amount.h>
-#include <common/json.h>
-#include <common/json_helpers.h>
 #include <common/json_stream.h>
 #include <common/json_tok.h>
 #include <common/pseudorand.h>
 #include <common/type_to_string.h>
 #include <plugins/spender/multiwithdraw.h>
-#include <stdarg.h>
-#include <stdlib.h>
 #include <wally_psbt.h>
 
 /*-----------------------------------------------------------------------------
diff --git a/plugins/spender/openchannel.c b/plugins/spender/openchannel.c
index d8c6392bd..34704d450 100644
--- a/plugins/spender/openchannel.c
+++ b/plugins/spender/openchannel.c
@@ -1,18 +1,13 @@
 #include "config.h"
-#include <assert.h>
 #include <bitcoin/psbt.h>
 #include <ccan/ccan/array_size/array_size.h>
-#include <ccan/ccan/cast/cast.h>
 #include <ccan/ccan/mem/mem.h>
-#include <ccan/ccan/tal/str/str.h>
 #include <common/json_stream.h>
 #include <common/lease_rates.h>
 #include <common/psbt_open.h>
 #include <common/type_to_string.h>
-#include <common/utils.h>
 #include <plugins/spender/multifundchannel.h>
 #include <plugins/spender/openchannel.h>
-#include <wally_psbt.h>
 
 static struct list_head mfc_commands;
 
diff --git a/plugins/test/run-funder_policy.c b/plugins/test/run-funder_policy.c
index c2eeee527..eecaa89e4 100644
--- a/plugins/test/run-funder_policy.c
+++ b/plugins/test/run-funder_policy.c
@@ -1,10 +1,6 @@
 #include "../funder_policy.c"
-#include <assert.h>
 #include <ccan/array_size/array_size.h>
-#include <common/bigsize.h>
-#include <common/channel_id.h>
 #include <common/setup.h>
-#include <inttypes.h>
 #include <stdio.h>
 
 /* AUTOGENERATED MOCKS START */
diff --git a/plugins/test/run-route-overlong.c b/plugins/test/run-route-overlong.c
index 4398cd90e..8d24b8f16 100644
--- a/plugins/test/run-route-overlong.c
+++ b/plugins/test/run-route-overlong.c
@@ -3,7 +3,6 @@
 #include <common/gossip_store.h>
 #include <stdio.h>
 #include <unistd.h>
-#include <wire/peer_wire.h>
 
 /* AUTOGENERATED MOCKS START */
 /* Generated stub for command_finished */
diff --git a/plugins/topology.c b/plugins/topology.c
index 1cd6edad6..11462fc22 100644
--- a/plugins/topology.c
+++ b/plugins/topology.c
@@ -2,9 +2,7 @@
 #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/tal/str/str.h>
-#include <ccan/time/time.h>
 #include <common/dijkstra.h>
 #include <common/gossmap.h>
 #include <common/json_stream.h>
@@ -13,12 +11,9 @@
 #include <common/pseudorand.h>
 #include <common/route.h>
 #include <common/type_to_string.h>
-#include <common/utils.h>
 #include <common/wireaddr.h>
 #include <errno.h>
-#include <inttypes.h>
 #include <plugins/libplugin.h>
-#include <wire/peer_wire.h>
 
 /* Access via get_gossmap() */
 static struct gossmap *global_gossmap;
diff --git a/plugins/txprepare.c b/plugins/txprepare.c
index 3e628b94c..dcb514a49 100644
--- a/plugins/txprepare.c
+++ b/plugins/txprepare.c
@@ -1,21 +1,11 @@
-#include <bitcoin/chainparams.h>
-#include <bitcoin/feerate.h>
 #include <bitcoin/psbt.h>
-#include <bitcoin/script.h>
 #include <ccan/array_size/array_size.h>
-#include <ccan/cast/cast.h>
-#include <ccan/json_out/json_out.h>
-#include <ccan/list/list.h>
-#include <ccan/tal/str/str.h>
 #include <common/addr.h>
-#include <common/amount.h>
-#include <common/features.h>
 #include <common/json_stream.h>
 #include <common/json_tok.h>
 #include <common/memleak.h>
 #include <common/pseudorand.h>
 #include <common/type_to_string.h>
-#include <common/utils.h>
 #include <plugins/libplugin.h>
 #include <wally_psbt.h>
 
diff --git a/tests/fuzz/fuzz-addr.c b/tests/fuzz/fuzz-addr.c
index aff51d57e..57c54ac47 100644
--- a/tests/fuzz/fuzz-addr.c
+++ b/tests/fuzz/fuzz-addr.c
@@ -1,8 +1,6 @@
 #include "common/utils.h"
-#include <stdint.h>
 #include <tests/fuzz/libfuzz.h>
 
-#include <ccan/ccan/tal/tal.h>
 #include <common/addr.h>
 #include <common/setup.h>
 
diff --git a/tests/fuzz/fuzz-amount.c b/tests/fuzz/fuzz-amount.c
index 512ff2d19..3a7864e1d 100644
--- a/tests/fuzz/fuzz-amount.c
+++ b/tests/fuzz/fuzz-amount.c
@@ -1,11 +1,8 @@
 #include "config.h"
 #include <assert.h>
-#include <stdint.h>
 #include <tests/fuzz/libfuzz.h>
 
-#include <ccan/tal/tal.h>
 #include <common/amount.h>
-#include <common/utils.h>
 
 void init(int *argc, char ***argv)
 {
diff --git a/tests/fuzz/fuzz-base32-64.c b/tests/fuzz/fuzz-base32-64.c
index edc68445f..13661a3ca 100644
--- a/tests/fuzz/fuzz-base32-64.c
+++ b/tests/fuzz/fuzz-base32-64.c
@@ -1,7 +1,5 @@
 #include "config.h"
 #include <assert.h>
-#include <stdint.h>
-#include <string.h>
 #include <tests/fuzz/libfuzz.h>
 
 #include <common/base32.h>
diff --git a/tests/fuzz/fuzz-bigsize.c b/tests/fuzz/fuzz-bigsize.c
index 52af33877..b994db622 100644
--- a/tests/fuzz/fuzz-bigsize.c
+++ b/tests/fuzz/fuzz-bigsize.c
@@ -1,10 +1,7 @@
 #include "config.h"
 #include <assert.h>
-#include <stdint.h>
-#include <string.h>
 #include <tests/fuzz/libfuzz.h>
 
-#include <ccan/tal/tal.h>
 #include <common/bigsize.h>
 
 void init(int *argc, char ***argv)
diff --git a/tests/fuzz/fuzz-bip32.c b/tests/fuzz/fuzz-bip32.c
index a21e9ad21..2c104c6d5 100644
--- a/tests/fuzz/fuzz-bip32.c
+++ b/tests/fuzz/fuzz-bip32.c
@@ -1,10 +1,6 @@
 #include "config.h"
-#include <assert.h>
-#include <stdint.h>
-#include <string.h>
 #include <tests/fuzz/libfuzz.h>
 
-#include <ccan/tal/tal.h>
 #include <common/bip32.h>
 #include <wally_bip32.h>
 
diff --git a/tests/fuzz/fuzz-channel_id.c b/tests/fuzz/fuzz-channel_id.c
index 4b0931edf..b2d9307e5 100644
--- a/tests/fuzz/fuzz-channel_id.c
+++ b/tests/fuzz/fuzz-channel_id.c
@@ -2,11 +2,8 @@
 #include <assert.h>
 #include <bitcoin/pubkey.h>
 #include <bitcoin/tx.h>
-#include <stdint.h>
-#include <string.h>
 #include <tests/fuzz/libfuzz.h>
 
-#include <ccan/tal/tal.h>
 #include <common/channel_id.h>
 #include <wire/wire.h>
 
diff --git a/tests/fuzz/fuzz-close_tx.c b/tests/fuzz/fuzz-close_tx.c
index 11236107f..ebbef9a46 100644
--- a/tests/fuzz/fuzz-close_tx.c
+++ b/tests/fuzz/fuzz-close_tx.c
@@ -1,15 +1,10 @@
 #include "config.h"
 #include <assert.h>
-#include <stdint.h>
-#include <string.h>
 #include <tests/fuzz/libfuzz.h>
 
 #include <bitcoin/pubkey.h>
 #include <bitcoin/chainparams.h>
 #include <bitcoin/script.h>
-#include <bitcoin/tx.h>
-#include <ccan/tal/tal.h>
-#include <common/amount.h>
 #include <common/close_tx.h>
 #include <common/setup.h>
 #include <common/utils.h>
diff --git a/tests/fuzz/fuzz-descriptor_checksum.c b/tests/fuzz/fuzz-descriptor_checksum.c
index c37412bd6..7b37efc83 100644
--- a/tests/fuzz/fuzz-descriptor_checksum.c
+++ b/tests/fuzz/fuzz-descriptor_checksum.c
@@ -1,6 +1,5 @@
 #include <tests/fuzz/libfuzz.h>
 
-#include <ccan/tal/tal.h>
 #include <common/descriptor_checksum.h>
 
 void init(int *argc, char ***argv)
diff --git a/tests/fuzz/fuzz-hsm_encryption.c b/tests/fuzz/fuzz-hsm_encryption.c
index 9505d4b5d..1f0a861e2 100644
--- a/tests/fuzz/fuzz-hsm_encryption.c
+++ b/tests/fuzz/fuzz-hsm_encryption.c
@@ -2,12 +2,8 @@
 #include <assert.h>
 #include <tests/fuzz/libfuzz.h>
 
-#include <bitcoin/privkey.h>
 #include <ccan/mem/mem.h>
-#include <ccan/short_types/short_types.h>
-#include <ccan/tal/tal.h>
 #include <common/hsm_encryption.h>
-#include <common/utils.h>
 
 void init(int *argc, char ***argv)
 {
diff --git a/tests/fuzz/libfuzz.c b/tests/fuzz/libfuzz.c
index 1907a5b16..91aceddd3 100644
--- a/tests/fuzz/libfuzz.c
+++ b/tests/fuzz/libfuzz.c
@@ -1,11 +1,8 @@
 #include <tests/fuzz/libfuzz.h>
 
 #include <assert.h>
-#include <ccan/tal/tal.h>
 #include <ccan/isaac/isaac64.h>
 #include <common/pseudorand.h>
-#include <common/utils.h>
-#include <string.h>
 
 int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size);
 int LLVMFuzzerInitialize(int *argc, char ***argv);
diff --git a/tests/plugins/test_libplugin.c b/tests/plugins/test_libplugin.c
index 464a9722d..7320ad5db 100644
--- a/tests/plugins/test_libplugin.c
+++ b/tests/plugins/test_libplugin.c
@@ -1,6 +1,5 @@
 #include <ccan/array_size/array_size.h>
 #include <ccan/tal/str/str.h>
-#include <common/json_stream.h>
 #include <common/json_tok.h>
 #include <common/memleak.h>
 #include <plugins/libplugin.h>
diff --git a/tests/plugins/test_selfdisable_after_getmanifest.c b/tests/plugins/test_selfdisable_after_getmanifest.c
index e740bf0fc..69c07c3e1 100644
--- a/tests/plugins/test_selfdisable_after_getmanifest.c
+++ b/tests/plugins/test_selfdisable_after_getmanifest.c
@@ -1,6 +1,5 @@
 #include <ccan/err/err.h>
 #include <ccan/read_write_all/read_write_all.h>
-#include <ccan/tal/tal.h>
 #include <ccan/tal/str/str.h>
 #include <common/json.h>
 #include <common/setup.h>
diff --git a/tools/check-bolt.c b/tools/check-bolt.c
index 94e8f7479..c915fb174 100644
--- a/tools/check-bolt.c
+++ b/tools/check-bolt.c
@@ -2,14 +2,11 @@
  * they're accurate. */
 #include <ccan/err/err.h>
 #include <ccan/opt/opt.h>
-#include <ccan/str/str.h>
 #include <ccan/tal/grab_file/grab_file.h>
 #include <ccan/tal/path/path.h>
 #include <ccan/tal/str/str.h>
-#include <ccan/tal/tal.h>
 #include <common/utils.h>
 #include <dirent.h>
-#include <sys/types.h>
 
 static bool verbose = false;
 
diff --git a/tools/headerversions.c b/tools/headerversions.c
index fc33eec22..83f1df53f 100644
--- a/tools/headerversions.c
+++ b/tools/headerversions.c
@@ -14,9 +14,6 @@
 #else
 # define IF_SQLITE3(...)
 #endif
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <unistd.h>
 #include <zlib.h>
 
 static const char template[] =
diff --git a/tools/hsmtool.c b/tools/hsmtool.c
index 809841b0c..74e5d3408 100644
--- a/tools/hsmtool.c
+++ b/tools/hsmtool.c
@@ -1,10 +1,8 @@
-#include <bitcoin/privkey.h>
 #include <ccan/array_size/array_size.h>
 #include <ccan/crypto/hkdf_sha256/hkdf_sha256.h>
 #include <ccan/err/err.h>
 #include <ccan/noerr/noerr.h>
 #include <ccan/read_write_all/read_write_all.h>
-#include <ccan/str/str.h>
 #include <ccan/tal/path/path.h>
 #include <ccan/tal/str/str.h>
 #include <common/bech32.h>
@@ -14,11 +12,9 @@
 #include <common/hsm_encryption.h>
 #include <common/node_id.h>
 #include <common/type_to_string.h>
-#include <common/utils.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <inttypes.h>
-#include <limits.h>
 #include <sys/stat.h>
 #include <unistd.h>
 #include <wally_bip32.h>
diff --git a/tools/test/run-test-wire.c b/tools/test/run-test-wire.c
index 65b52a964..5b8e3ec1b 100644
--- a/tools/test/run-test-wire.c
+++ b/tools/test/run-test-wire.c
@@ -4,7 +4,6 @@
 #include <assert.h>
 #include <stdio.h>
 
-#include <common/utils.h>
 
 /* AUTOGENERATED MOCKS START */
 /* Generated stub for fromwire_peektype */
diff --git a/wallet/db.c b/wallet/db.c
index 32fbd62bc..7184ad7ff 100644
--- a/wallet/db.c
+++ b/wallet/db.c
@@ -1,26 +1,17 @@
 #include "db.h"
 
-#include <bitcoin/psbt.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/channel_id.h>
-#include <common/derive_basepoints.h>
 #include <common/key_derive.h>
-#include <common/node_id.h>
 #include <common/onionreply.h>
 #include <common/version.h>
 #include <errno.h>
 #include <hsmd/hsmd_wiregen.h>
-#include <inttypes.h>
 #include <lightningd/channel.h>
-#include <lightningd/lightningd.h>
-#include <lightningd/log.h>
 #include <lightningd/plugin_hook.h>
 #include <wallet/db_common.h>
-#include <wallet/wallet.h>
-#include <wally_bip32.h>
 #include <wire/wire_sync.h>
 
 #define NSEC_IN_SEC 1000000000
diff --git a/wallet/db_postgres.c b/wallet/db_postgres.c
index 60463638d..55b6ad0b7 100644
--- a/wallet/db_postgres.c
+++ b/wallet/db_postgres.c
@@ -2,7 +2,6 @@
 #include <ccan/ccan/tal/str/str.h>
 #include <ccan/endian/endian.h>
 #include <lightningd/log.h>
-#include <stdio.h>
 #include <wallet/db_common.h>
 
 #if HAVE_POSTGRES
diff --git a/wallet/db_postgres_sqlgen.c b/wallet/db_postgres_sqlgen.c
index 4ecc4d7d2..861e736d1 100644
--- a/wallet/db_postgres_sqlgen.c
+++ b/wallet/db_postgres_sqlgen.c
@@ -2074,4 +2074,4 @@ struct db_query db_postgres_queries[] = {
 
 #endif /* LIGHTNINGD_WALLET_GEN_DB_POSTGRES */
 
-// SHA256STAMP:998001f2c1b3d3d1c6e4324a4a808cc2ed915b918bfdef88e259901b7fa2a735
+// SHA256STAMP:d812809c7895cea0ed904084e48c523ea01a8cd9525e4b6be1b4e05bec2a90d1
diff --git a/wallet/db_sqlite3.c b/wallet/db_sqlite3.c
index 282e2b6a0..754419852 100644
--- a/wallet/db_sqlite3.c
+++ b/wallet/db_sqlite3.c
@@ -1,8 +1,6 @@
 #include "db_sqlite3_sqlgen.c"
 #include <ccan/ccan/tal/str/str.h>
 #include <lightningd/log.h>
-#include <stdio.h>
-#include <wallet/db_common.h>
 
 #if HAVE_SQLITE3
   #include <sqlite3.h>
diff --git a/wallet/db_sqlite3_sqlgen.c b/wallet/db_sqlite3_sqlgen.c
index 58ddd8949..eff5466ec 100644
--- a/wallet/db_sqlite3_sqlgen.c
+++ b/wallet/db_sqlite3_sqlgen.c
@@ -2074,4 +2074,4 @@ struct db_query db_sqlite3_queries[] = {
 
 #endif /* LIGHTNINGD_WALLET_GEN_DB_SQLITE3 */
 
-// SHA256STAMP:998001f2c1b3d3d1c6e4324a4a808cc2ed915b918bfdef88e259901b7fa2a735
+// SHA256STAMP:d812809c7895cea0ed904084e48c523ea01a8cd9525e4b6be1b4e05bec2a90d1
diff --git a/wallet/invoices.c b/wallet/invoices.c
index 9314defa5..95ab4cb03 100644
--- a/wallet/invoices.c
+++ b/wallet/invoices.c
@@ -1,17 +1,8 @@
 #include "db.h"
 #include "invoices.h"
 #include "wallet.h"
-#include <assert.h>
-#include <ccan/list/list.h>
 #include <ccan/tal/str/str.h>
-#include <ccan/time/time.h>
-#include <ccan/timer/timer.h>
-#include <common/amount.h>
 #include <common/timeout.h>
-#include <common/utils.h>
-#include <lightningd/invoice.h>
-#include <sodium/randombytes.h>
-#include <string.h>
 
 struct invoice_waiter {
 	/* Is this waiter already triggered? */
diff --git a/wallet/reservation.c b/wallet/reservation.c
index 45d9ec35c..646852451 100644
--- a/wallet/reservation.c
+++ b/wallet/reservation.c
@@ -1,13 +1,11 @@
 /* Dealing with reserving UTXOs */
 #include <bitcoin/psbt.h>
 #include <bitcoin/script.h>
-#include <bitcoin/tx.h>
 #include <ccan/cast/cast.h>
 #include <ccan/mem/mem.h>
 #include <common/json_command.h>
 #include <common/json_helpers.h>
 #include <common/json_tok.h>
-#include <common/jsonrpc_errors.h>
 #include <common/key_derive.h>
 #include <common/param.h>
 #include <common/type_to_string.h>
@@ -16,8 +14,6 @@
 #include <lightningd/jsonrpc.h>
 #include <lightningd/lightningd.h>
 #include <wallet/txfilter.h>
-#include <wallet/wallet.h>
-#include <wallet/walletrpc.h>
 #include <wally_psbt.h>
 
 /* 12 hours is usually enough reservation time */
diff --git a/wallet/statements_gettextgen.po b/wallet/statements_gettextgen.po
index b15751107..dcf34f25c 100644
--- a/wallet/statements_gettextgen.po
+++ b/wallet/statements_gettextgen.po
@@ -1,1372 +1,1372 @@
-#: wallet/db.c:74
+#: wallet/db.c:65
 msgid "CREATE TABLE version (version INTEGER)"
 msgstr ""
 
-#: wallet/db.c:75
+#: wallet/db.c:66
 msgid "INSERT INTO version VALUES (1)"
 msgstr ""
 
-#: wallet/db.c:76
+#: wallet/db.c:67
 msgid "CREATE TABLE outputs (  prev_out_tx BLOB, prev_out_index INTEGER, value BIGINT, type INTEGER, status INTEGER, keyindex INTEGER, PRIMARY KEY (prev_out_tx, prev_out_index));"
 msgstr ""
 
-#: wallet/db.c:85
+#: wallet/db.c:76
 msgid "CREATE TABLE vars (  name VARCHAR(32), val VARCHAR(255), PRIMARY KEY (name));"
 msgstr ""
 
-#: wallet/db.c:91
+#: wallet/db.c:82
 msgid "CREATE TABLE shachains (  id BIGSERIAL, min_index BIGINT, num_valid BIGINT, PRIMARY KEY (id));"
 msgstr ""
 
-#: wallet/db.c:98
+#: wallet/db.c:89
 msgid "CREATE TABLE shachain_known (  shachain_id BIGINT REFERENCES shachains(id) ON DELETE CASCADE, pos INTEGER, idx BIGINT, hash BLOB, PRIMARY KEY (shachain_id, pos));"
 msgstr ""
 
-#: wallet/db.c:106
+#: wallet/db.c:97
 msgid "CREATE TABLE peers (  id BIGSERIAL, node_id BLOB UNIQUE, address TEXT, PRIMARY KEY (id));"
 msgstr ""
 
-#: wallet/db.c:113
+#: wallet/db.c:104
 msgid "CREATE TABLE channels (  id BIGSERIAL,  peer_id BIGINT REFERENCES peers(id) ON DELETE CASCADE,  short_channel_id TEXT,  channel_config_local BIGINT,  channel_config_remote BIGINT,  state INTEGER,  funder INTEGER,  channel_flags INTEGER,  minimum_depth INTEGER,  next_index_local BIGINT,  next_index_remote BIGINT,  next_htlc_id BIGINT,  funding_tx_id BLOB,  funding_tx_outnum INTEGER,  funding_satoshi BIGINT,  funding_locked_remote INTEGER,  push_msatoshi BIGINT,  msatoshi_local BIGINT,  fundingkey_remote BLOB,  revocation_basepoint_remote BLOB,  payment_basepoint_remote BLOB,  htlc_basepoint_remote BLOB,  delayed_payment_basepoint_remote BLOB,  per_commit_remote BLOB,  old_per_commit_remote BLOB,  local_feerate_per_kw INTEGER,  remote_feerate_per_kw INTEGER,  shachain_remote_id BIGINT,  shutdown_scriptpubkey_remote BLOB,  shutdown_keyidx_local BIGINT,  last_sent_commit_state BIGINT,  last_sent_commit_id INTEGER,  last_tx BLOB,  last_sig BLOB,  closing_fee_received INTEGER,  closing_sig_received BLOB,  PRIMARY KEY (id));"
 msgstr ""
 
-#: wallet/db.c:155
+#: wallet/db.c:146
 msgid "CREATE TABLE channel_configs (  id BIGSERIAL,  dust_limit_satoshis BIGINT,  max_htlc_value_in_flight_msat BIGINT,  channel_reserve_satoshis BIGINT,  htlc_minimum_msat BIGINT,  to_self_delay INTEGER,  max_accepted_htlcs INTEGER,  PRIMARY KEY (id));"
 msgstr ""
 
-#: wallet/db.c:166
+#: wallet/db.c:157
 msgid "CREATE TABLE channel_htlcs (  id BIGSERIAL,  channel_id BIGINT REFERENCES channels(id) ON DELETE CASCADE,  channel_htlc_id BIGINT,  direction INTEGER,  origin_htlc BIGINT,  msatoshi BIGINT,  cltv_expiry INTEGER,  payment_hash BLOB,  payment_key BLOB,  routing_onion BLOB,  failuremsg BLOB,  malformed_onion INTEGER,  hstate INTEGER,  shared_secret BLOB,  PRIMARY KEY (id),  UNIQUE (channel_id, channel_htlc_id, direction));"
 msgstr ""
 
-#: wallet/db.c:186
+#: wallet/db.c:177
 msgid "CREATE TABLE invoices (  id BIGSERIAL,  state INTEGER,  msatoshi BIGINT,  payment_hash BLOB,  payment_key BLOB,  label TEXT,  PRIMARY KEY (id),  UNIQUE (label),  UNIQUE (payment_hash));"
 msgstr ""
 
-#: wallet/db.c:198
+#: wallet/db.c:189
 msgid "CREATE TABLE payments (  id BIGSERIAL,  timestamp INTEGER,  status INTEGER,  payment_hash BLOB,  direction INTEGER,  destination BLOB,  msatoshi BIGINT,  PRIMARY KEY (id),  UNIQUE (payment_hash));"
 msgstr ""
 
-#: wallet/db.c:211
+#: wallet/db.c:202
 msgid "ALTER TABLE invoices ADD expiry_time BIGINT;"
 msgstr ""
 
-#: wallet/db.c:212
+#: wallet/db.c:203
 msgid "UPDATE invoices SET expiry_time=9223372036854775807;"
 msgstr ""
 
-#: wallet/db.c:214
+#: wallet/db.c:205
 msgid "ALTER TABLE invoices ADD pay_index BIGINT;"
 msgstr ""
 
-#: wallet/db.c:215
+#: wallet/db.c:206
 msgid "CREATE UNIQUE INDEX invoices_pay_index ON invoices(pay_index);"
 msgstr ""
 
-#: wallet/db.c:217
+#: wallet/db.c:208
 msgid "UPDATE invoices SET pay_index=id WHERE state=1;"
 msgstr ""
 
-#: wallet/db.c:220
+#: wallet/db.c:211
 msgid "INSERT INTO vars(name, val)  VALUES('next_pay_index',     COALESCE((SELECT MAX(pay_index) FROM invoices WHERE state=1), 0) + 1  );"
 msgstr ""
 
-#: wallet/db.c:229
+#: wallet/db.c:220
 msgid "ALTER TABLE channels ADD first_blocknum BIGINT;"
 msgstr ""
 
-#: wallet/db.c:230
+#: wallet/db.c:221
 msgid "UPDATE channels SET first_blocknum=1 WHERE short_channel_id IS NOT NULL;"
 msgstr ""
 
-#: wallet/db.c:232
+#: wallet/db.c:223
 msgid "ALTER TABLE outputs ADD COLUMN channel_id BIGINT;"
 msgstr ""
 
-#: wallet/db.c:233
+#: wallet/db.c:224
 msgid "ALTER TABLE outputs ADD COLUMN peer_id BLOB;"
 msgstr ""
 
-#: wallet/db.c:234
+#: wallet/db.c:225
 msgid "ALTER TABLE outputs ADD COLUMN commitment_point BLOB;"
 msgstr ""
 
-#: wallet/db.c:235
+#: wallet/db.c:226
 msgid "ALTER TABLE invoices ADD COLUMN msatoshi_received BIGINT;"
 msgstr ""
 
-#: wallet/db.c:237
+#: wallet/db.c:228
 msgid "UPDATE invoices SET msatoshi_received=0 WHERE state=1;"
 msgstr ""
 
-#: wallet/db.c:238
+#: wallet/db.c:229
 msgid "ALTER TABLE channels ADD COLUMN last_was_revoke INTEGER;"
 msgstr ""
 
-#: wallet/db.c:242 wallet/db.c:535
+#: wallet/db.c:233 wallet/db.c:526
 msgid "ALTER TABLE payments RENAME TO temp_payments;"
 msgstr ""
 
-#: wallet/db.c:243
+#: wallet/db.c:234
 msgid "CREATE TABLE payments (  id BIGSERIAL,  timestamp INTEGER,  status INTEGER,  payment_hash BLOB,  destination BLOB,  msatoshi BIGINT,  PRIMARY KEY (id),  UNIQUE (payment_hash));"
 msgstr ""
 
-#: wallet/db.c:254
+#: wallet/db.c:245
 msgid "INSERT INTO payments SELECT id, timestamp, status, payment_hash, destination, msatoshi FROM temp_payments WHERE direction=1;"
 msgstr ""
 
-#: wallet/db.c:257 wallet/db.c:610
+#: wallet/db.c:248 wallet/db.c:601
 msgid "DROP TABLE temp_payments;"
 msgstr ""
 
-#: wallet/db.c:259
+#: wallet/db.c:250
 msgid "ALTER TABLE payments ADD COLUMN payment_preimage BLOB;"
 msgstr ""
 
-#: wallet/db.c:261
+#: wallet/db.c:252
 msgid "ALTER TABLE payments ADD COLUMN path_secrets BLOB;"
 msgstr ""
 
-#: wallet/db.c:264
+#: wallet/db.c:255
 msgid "ALTER TABLE invoices ADD paid_timestamp BIGINT;"
 msgstr ""
 
-#: wallet/db.c:265
+#: wallet/db.c:256
 msgid "UPDATE invoices   SET paid_timestamp = CURRENT_TIMESTAMP() WHERE state = 1;"
 msgstr ""
 
-#: wallet/db.c:273
+#: wallet/db.c:264
 msgid "ALTER TABLE payments ADD COLUMN route_nodes BLOB;"
 msgstr ""
 
-#: wallet/db.c:274
+#: wallet/db.c:265
 msgid "ALTER TABLE payments ADD COLUMN route_channels BLOB;"
 msgstr ""
 
-#: wallet/db.c:275
+#: wallet/db.c:266
 msgid "CREATE TABLE htlc_sigs (channelid INTEGER REFERENCES channels(id) ON DELETE CASCADE, signature BLOB);"
 msgstr ""
 
-#: wallet/db.c:278
+#: wallet/db.c:269
 msgid "CREATE INDEX channel_idx ON htlc_sigs (channelid)"
 msgstr ""
 
-#: wallet/db.c:280
+#: wallet/db.c:271
 msgid "DELETE FROM channels WHERE state=1"
 msgstr ""
 
-#: wallet/db.c:282
+#: wallet/db.c:273
 msgid "CREATE TABLE db_upgrades (upgrade_from INTEGER, lightning_version TEXT);"
 msgstr ""
 
-#: wallet/db.c:286 wallet/db.c:476
+#: wallet/db.c:277 wallet/db.c:467
 msgid "DELETE FROM peers WHERE id NOT IN (SELECT peer_id FROM channels);"
 msgstr ""
 
-#: wallet/db.c:290
+#: wallet/db.c:281
 msgid "UPDATE channels SET STATE = 8 WHERE state > 8;"
 msgstr ""
 
-#: wallet/db.c:292
+#: wallet/db.c:283
 msgid "ALTER TABLE invoices ADD bolt11 TEXT;"
 msgstr ""
 
-#: wallet/db.c:296
+#: wallet/db.c:287
 msgid "CREATE TABLE blocks (height INT, hash BLOB, prev_hash BLOB, UNIQUE(height));"
 msgstr ""
 
-#: wallet/db.c:306
+#: wallet/db.c:297
 msgid "ALTER TABLE outputs ADD COLUMN confirmation_height INTEGER REFERENCES blocks(height) ON DELETE SET NULL;"
 msgstr ""
 
-#: wallet/db.c:309
+#: wallet/db.c:300
 msgid "ALTER TABLE outputs ADD COLUMN spend_height INTEGER REFERENCES blocks(height) ON DELETE SET NULL;"
 msgstr ""
 
-#: wallet/db.c:313
+#: wallet/db.c:304
 msgid "CREATE INDEX output_height_idx ON outputs (confirmation_height, spend_height);"
 msgstr ""
 
-#: wallet/db.c:316
+#: wallet/db.c:307
 msgid "CREATE TABLE utxoset ( txid BLOB, outnum INT, blockheight INT REFERENCES blocks(height) ON DELETE CASCADE, spendheight INT REFERENCES blocks(height) ON DELETE SET NULL, txindex INT, scriptpubkey BLOB, satoshis BIGINT, PRIMARY KEY(txid, outnum));"
 msgstr ""
 
-#: wallet/db.c:326
+#: wallet/db.c:317
 msgid "CREATE INDEX short_channel_id ON utxoset (blockheight, txindex, outnum)"
 msgstr ""
 
-#: wallet/db.c:331
+#: wallet/db.c:322
 msgid "CREATE INDEX utxoset_spend ON utxoset (spendheight)"
 msgstr ""
 
-#: wallet/db.c:333
+#: wallet/db.c:324
 msgid "UPDATE channels SET shutdown_keyidx_local=0 WHERE shutdown_keyidx_local = -1;"
 msgstr ""
 
-#: wallet/db.c:339
+#: wallet/db.c:330
 msgid "ALTER TABLE payments ADD failonionreply BLOB;"
 msgstr ""
 
-#: wallet/db.c:341
+#: wallet/db.c:332
 msgid "ALTER TABLE payments ADD faildestperm INTEGER;"
 msgstr ""
 
-#: wallet/db.c:343
+#: wallet/db.c:334
 msgid "ALTER TABLE payments ADD failindex INTEGER;"
 msgstr ""
 
-#: wallet/db.c:345
+#: wallet/db.c:336
 msgid "ALTER TABLE payments ADD failcode INTEGER;"
 msgstr ""
 
-#: wallet/db.c:346
+#: wallet/db.c:337
 msgid "ALTER TABLE payments ADD failnode BLOB;"
 msgstr ""
 
-#: wallet/db.c:347
+#: wallet/db.c:338
 msgid "ALTER TABLE payments ADD failchannel TEXT;"
 msgstr ""
 
-#: wallet/db.c:349
+#: wallet/db.c:340
 msgid "ALTER TABLE payments ADD failupdate BLOB;"
 msgstr ""
 
-#: wallet/db.c:353
+#: wallet/db.c:344
 msgid "UPDATE payments   SET path_secrets = NULL     , route_nodes = NULL     , route_channels = NULL WHERE status <> 0;"
 msgstr ""
 
-#: wallet/db.c:360
+#: wallet/db.c:351
 msgid "ALTER TABLE channels ADD in_payments_offered INTEGER DEFAULT 0;"
 msgstr ""
 
-#: wallet/db.c:361
+#: wallet/db.c:352
 msgid "ALTER TABLE channels ADD in_payments_fulfilled INTEGER DEFAULT 0;"
 msgstr ""
 
-#: wallet/db.c:362
+#: wallet/db.c:353
 msgid "ALTER TABLE channels ADD in_msatoshi_offered BIGINT DEFAULT 0;"
 msgstr ""
 
-#: wallet/db.c:363
+#: wallet/db.c:354
 msgid "ALTER TABLE channels ADD in_msatoshi_fulfilled BIGINT DEFAULT 0;"
 msgstr ""
 
-#: wallet/db.c:364
+#: wallet/db.c:355
 msgid "ALTER TABLE channels ADD out_payments_offered INTEGER DEFAULT 0;"
 msgstr ""
 
-#: wallet/db.c:365
+#: wallet/db.c:356
 msgid "ALTER TABLE channels ADD out_payments_fulfilled INTEGER DEFAULT 0;"
 msgstr ""
 
-#: wallet/db.c:366
+#: wallet/db.c:357
 msgid "ALTER TABLE channels ADD out_msatoshi_offered BIGINT DEFAULT 0;"
 msgstr ""
 
-#: wallet/db.c:367
+#: wallet/db.c:358
 msgid "ALTER TABLE channels ADD out_msatoshi_fulfilled BIGINT DEFAULT 0;"
 msgstr ""
 
-#: wallet/db.c:368
+#: wallet/db.c:359
 msgid "UPDATE channels   SET  in_payments_offered = 0,  in_payments_fulfilled = 0     ,  in_msatoshi_offered = 0,  in_msatoshi_fulfilled = 0     , out_payments_offered = 0, out_payments_fulfilled = 0     , out_msatoshi_offered = 0, out_msatoshi_fulfilled = 0     ;"
 msgstr ""
 
-#: wallet/db.c:377
+#: wallet/db.c:368
 msgid "ALTER TABLE payments ADD msatoshi_sent BIGINT;"
 msgstr ""
 
-#: wallet/db.c:378
+#: wallet/db.c:369
 msgid "UPDATE payments SET msatoshi_sent = msatoshi;"
 msgstr ""
 
-#: wallet/db.c:380
+#: wallet/db.c:371
 msgid "DELETE FROM utxoset WHERE blockheight IN (  SELECT DISTINCT(blockheight)  FROM utxoset LEFT OUTER JOIN blocks on (blockheight = blocks.height)   WHERE blocks.hash IS NULL);"
 msgstr ""
 
-#: wallet/db.c:388
+#: wallet/db.c:379
 msgid "ALTER TABLE channels ADD min_possible_feerate INTEGER;"
 msgstr ""
 
-#: wallet/db.c:389
+#: wallet/db.c:380
 msgid "ALTER TABLE channels ADD max_possible_feerate INTEGER;"
 msgstr ""
 
-#: wallet/db.c:392
+#: wallet/db.c:383
 msgid "UPDATE channels SET min_possible_feerate=0, max_possible_feerate=250000;"
 msgstr ""
 
-#: wallet/db.c:396
+#: wallet/db.c:387
 msgid "ALTER TABLE channels ADD msatoshi_to_us_min BIGINT;"
 msgstr ""
 
-#: wallet/db.c:397
+#: wallet/db.c:388
 msgid "ALTER TABLE channels ADD msatoshi_to_us_max BIGINT;"
 msgstr ""
 
-#: wallet/db.c:398
+#: wallet/db.c:389
 msgid "UPDATE channels   SET msatoshi_to_us_min = msatoshi_local     , msatoshi_to_us_max = msatoshi_local     ;"
 msgstr ""
 
-#: wallet/db.c:407
+#: wallet/db.c:398
 msgid "CREATE TABLE transactions (  id BLOB, blockheight INTEGER REFERENCES blocks(height) ON DELETE SET NULL, txindex INTEGER, rawtx BLOB, PRIMARY KEY (id));"
 msgstr ""
 
-#: wallet/db.c:416
+#: wallet/db.c:407
 msgid "ALTER TABLE payments ADD faildetail TEXT;"
 msgstr ""
 
-#: wallet/db.c:417
+#: wallet/db.c:408
 msgid "UPDATE payments   SET faildetail = 'unspecified payment failure reason' WHERE status = 2;"
 msgstr ""
 
-#: wallet/db.c:422
+#: wallet/db.c:413
 msgid "CREATE TABLE channeltxs (  id BIGSERIAL, channel_id BIGINT REFERENCES channels(id) ON DELETE CASCADE, type INTEGER, transaction_id BLOB REFERENCES transactions(id) ON DELETE CASCADE, input_num INTEGER, blockheight INTEGER REFERENCES blocks(height) ON DELETE CASCADE, PRIMARY KEY(id));"
 msgstr ""
 
-#: wallet/db.c:438
+#: wallet/db.c:429
 msgid "DELETE FROM blocks WHERE height > (SELECT MIN(first_blocknum) FROM channels);"
 msgstr ""
 
-#: wallet/db.c:444
+#: wallet/db.c:435
 msgid "INSERT INTO blocks (height) VALUES ((SELECT MIN(first_blocknum) FROM channels)) ON CONFLICT(height) DO NOTHING;"
 msgstr ""
 
-#: wallet/db.c:448
+#: wallet/db.c:439
 msgid "DELETE FROM blocks WHERE height IS NULL;"
 msgstr ""
 
-#: wallet/db.c:450
+#: wallet/db.c:441
 msgid "ALTER TABLE invoices ADD description TEXT;"
 msgstr ""
 
-#: wallet/db.c:452
+#: wallet/db.c:443
 msgid "ALTER TABLE payments ADD description TEXT;"
 msgstr ""
 
-#: wallet/db.c:454
+#: wallet/db.c:445
 msgid "ALTER TABLE channels ADD future_per_commitment_point BLOB;"
 msgstr ""
 
-#: wallet/db.c:456
+#: wallet/db.c:447
 msgid "ALTER TABLE channels ADD last_sent_commit BLOB;"
 msgstr ""
 
-#: wallet/db.c:461
+#: wallet/db.c:452
 msgid "CREATE TABLE forwarded_payments (  in_htlc_id BIGINT REFERENCES channel_htlcs(id) ON DELETE SET NULL, out_htlc_id BIGINT REFERENCES channel_htlcs(id) ON DELETE SET NULL, in_channel_scid BIGINT, out_channel_scid BIGINT, in_msatoshi BIGINT, out_msatoshi BIGINT, state INTEGER, UNIQUE(in_htlc_id, out_htlc_id));"
 msgstr ""
 
-#: wallet/db.c:473
+#: wallet/db.c:464
 msgid "ALTER TABLE payments ADD faildirection INTEGER;"
 msgstr ""
 
-#: wallet/db.c:478
+#: wallet/db.c:469
 msgid "ALTER TABLE outputs ADD scriptpubkey BLOB;"
 msgstr ""
 
-#: wallet/db.c:480
+#: wallet/db.c:471
 msgid "ALTER TABLE payments ADD bolt11 TEXT;"
 msgstr ""
 
-#: wallet/db.c:482
+#: wallet/db.c:473
 msgid "ALTER TABLE channels ADD feerate_base INTEGER;"
 msgstr ""
 
-#: wallet/db.c:483
+#: wallet/db.c:474
 msgid "ALTER TABLE channels ADD feerate_ppm INTEGER;"
 msgstr ""
 
-#: wallet/db.c:485
+#: wallet/db.c:476
 msgid "ALTER TABLE channel_htlcs ADD received_time BIGINT"
 msgstr ""
 
-#: wallet/db.c:486
+#: wallet/db.c:477
 msgid "ALTER TABLE forwarded_payments ADD received_time BIGINT"
 msgstr ""
 
-#: wallet/db.c:487
+#: wallet/db.c:478
 msgid "ALTER TABLE forwarded_payments ADD resolved_time BIGINT"
 msgstr ""
 
-#: wallet/db.c:488
+#: wallet/db.c:479
 msgid "ALTER TABLE channels ADD remote_upfront_shutdown_script BLOB;"
 msgstr ""
 
-#: wallet/db.c:491
+#: wallet/db.c:482
 msgid "ALTER TABLE forwarded_payments ADD failcode INTEGER;"
 msgstr ""
 
-#: wallet/db.c:493
+#: wallet/db.c:484
 msgid "ALTER TABLE channels ADD remote_ann_node_sig BLOB;"
 msgstr ""
 
-#: wallet/db.c:494
+#: wallet/db.c:485
 msgid "ALTER TABLE channels ADD remote_ann_bitcoin_sig BLOB;"
 msgstr ""
 
-#: wallet/db.c:496
+#: wallet/db.c:487
 msgid "ALTER TABLE transactions ADD type BIGINT;"
 msgstr ""
 
-#: wallet/db.c:501
+#: wallet/db.c:492
 msgid "ALTER TABLE transactions ADD channel_id BIGINT;"
 msgstr ""
 
-#: wallet/db.c:503
+#: wallet/db.c:494
 msgid "UPDATE channels SET short_channel_id = REPLACE(short_channel_id, ':', 'x') WHERE short_channel_id IS NOT NULL;"
 msgstr ""
 
-#: wallet/db.c:506
+#: wallet/db.c:497
 msgid "UPDATE payments SET failchannel = REPLACE(failchannel, ':', 'x') WHERE failchannel IS NOT NULL;"
 msgstr ""
 
-#: wallet/db.c:509
+#: wallet/db.c:500
 msgid "ALTER TABLE channels ADD COLUMN option_static_remotekey INTEGER DEFAULT 0;"
 msgstr ""
 
-#: wallet/db.c:511
+#: wallet/db.c:502
 msgid "ALTER TABLE vars ADD COLUMN intval INTEGER"
 msgstr ""
 
-#: wallet/db.c:512
+#: wallet/db.c:503
 msgid "ALTER TABLE vars ADD COLUMN blobval BLOB"
 msgstr ""
 
-#: wallet/db.c:513
+#: wallet/db.c:504
 msgid "UPDATE vars SET intval = CAST(val AS INTEGER) WHERE name IN ('bip32_max_index', 'last_processed_block', 'next_pay_index')"
 msgstr ""
 
-#: wallet/db.c:514
+#: wallet/db.c:505
 msgid "UPDATE vars SET blobval = CAST(val AS BLOB) WHERE name = 'genesis_hash'"
 msgstr ""
 
-#: wallet/db.c:515
+#: wallet/db.c:506
 msgid "CREATE TABLE transaction_annotations (  txid BLOB, idx INTEGER, location INTEGER, type INTEGER, channel BIGINT REFERENCES channels(id), UNIQUE(txid, idx));"
 msgstr ""
 
-#: wallet/db.c:527
+#: wallet/db.c:518
 msgid "ALTER TABLE channels ADD shutdown_scriptpubkey_local BLOB;"
 msgstr ""
 
-#: wallet/db.c:530
+#: wallet/db.c:521
 msgid "UPDATE forwarded_payments SET received_time=0 WHERE received_time IS NULL;"
 msgstr ""
 
-#: wallet/db.c:532
+#: wallet/db.c:523
 msgid "ALTER TABLE invoices ADD COLUMN features BLOB DEFAULT '';"
 msgstr ""
 
-#: wallet/db.c:536
+#: wallet/db.c:527
 msgid "CREATE TABLE payments ( id BIGSERIAL, timestamp INTEGER, status INTEGER, payment_hash BLOB, destination BLOB, msatoshi BIGINT, payment_preimage BLOB, path_secrets BLOB, route_nodes BLOB, route_channels BLOB, failonionreply BLOB, faildestperm INTEGER, failindex INTEGER, failcode INTEGER, failnode BLOB, failchannel TEXT, failupdate BLOB, msatoshi_sent BIGINT, faildetail TEXT, description TEXT, faildirection INTEGER, bolt11 TEXT, total_msat BIGINT, partid BIGINT, PRIMARY KEY (id), UNIQUE (payment_hash, partid))"
 msgstr ""
 
-#: wallet/db.c:563
+#: wallet/db.c:554
 msgid "INSERT INTO payments (id, timestamp, status, payment_hash, destination, msatoshi, payment_preimage, path_secrets, route_nodes, route_channels, failonionreply, faildestperm, failindex, failcode, failnode, failchannel, failupdate, msatoshi_sent, faildetail, description, faildirection, bolt11)SELECT id, timestamp, status, payment_hash, destination, msatoshi, payment_preimage, path_secrets, route_nodes, route_channels, failonionreply, faildestperm, failindex, failcode, failnode, failchannel, failupdate, msatoshi_sent, faildetail, description, faildirection, bolt11 FROM temp_payments;"
 msgstr ""
 
-#: wallet/db.c:608
+#: wallet/db.c:599
 msgid "UPDATE payments SET total_msat = msatoshi;"
 msgstr ""
 
-#: wallet/db.c:609
+#: wallet/db.c:600
 msgid "UPDATE payments SET partid = 0;"
 msgstr ""
 
-#: wallet/db.c:611
+#: wallet/db.c:602
 msgid "ALTER TABLE channel_htlcs ADD partid BIGINT;"
 msgstr ""
 
-#: wallet/db.c:612
+#: wallet/db.c:603
 msgid "UPDATE channel_htlcs SET partid = 0;"
 msgstr ""
 
-#: wallet/db.c:613
+#: wallet/db.c:604
 msgid "CREATE TABLE channel_feerates (  channel_id BIGINT REFERENCES channels(id) ON DELETE CASCADE,  hstate INTEGER,  feerate_per_kw INTEGER,  UNIQUE (channel_id, hstate));"
 msgstr ""
 
-#: wallet/db.c:624
+#: wallet/db.c:615
 msgid "INSERT INTO channel_feerates(channel_id, hstate, feerate_per_kw) SELECT id, 4, local_feerate_per_kw FROM channels WHERE funder = 0;"
 msgstr ""
 
-#: wallet/db.c:628
+#: wallet/db.c:619
 msgid "INSERT INTO channel_feerates(channel_id, hstate, feerate_per_kw) SELECT id, 1, remote_feerate_per_kw FROM channels WHERE funder = 0 and local_feerate_per_kw != remote_feerate_per_kw;"
 msgstr ""
 
-#: wallet/db.c:633
+#: wallet/db.c:624
 msgid "INSERT INTO channel_feerates(channel_id, hstate, feerate_per_kw) SELECT id, 14, remote_feerate_per_kw FROM channels WHERE funder = 1;"
 msgstr ""
 
-#: wallet/db.c:637
+#: wallet/db.c:628
 msgid "INSERT INTO channel_feerates(channel_id, hstate, feerate_per_kw) SELECT id, 11, local_feerate_per_kw FROM channels WHERE funder = 1 and local_feerate_per_kw != remote_feerate_per_kw;"
 msgstr ""
 
-#: wallet/db.c:641
+#: wallet/db.c:632
 msgid "INSERT INTO vars (name, intval) VALUES ('data_version', 0);"
 msgstr ""
 
-#: wallet/db.c:644
+#: wallet/db.c:635
 msgid "ALTER TABLE channel_htlcs ADD localfailmsg BLOB;"
 msgstr ""
 
-#: wallet/db.c:645
+#: wallet/db.c:636
 msgid "UPDATE channel_htlcs SET localfailmsg=decode('2002', 'hex') WHERE malformed_onion != 0 AND direction = 1;"
 msgstr ""
 
-#: wallet/db.c:646
+#: wallet/db.c:637
 msgid "ALTER TABLE channels ADD our_funding_satoshi BIGINT DEFAULT 0;"
 msgstr ""
 
-#: wallet/db.c:647
+#: wallet/db.c:638
 msgid "CREATE TABLE penalty_bases (  channel_id BIGINT REFERENCES channels(id) ON DELETE CASCADE, commitnum BIGINT, txid BLOB, outnum INTEGER, amount BIGINT, PRIMARY KEY (channel_id, commitnum));"
 msgstr ""
 
-#: wallet/db.c:657
+#: wallet/db.c:648
 msgid "ALTER TABLE channel_htlcs ADD we_filled INTEGER;"
 msgstr ""
 
-#: wallet/db.c:659
+#: wallet/db.c:650
 msgid "INSERT INTO vars (name, intval) VALUES ('coin_moves_count', 0);"
 msgstr ""
 
-#: wallet/db.c:661
+#: wallet/db.c:652
 msgid "ALTER TABLE outputs ADD reserved_til INTEGER DEFAULT NULL;"
 msgstr ""
 
-#: wallet/db.c:664
+#: wallet/db.c:655
 msgid "ALTER TABLE channels ADD COLUMN option_anchor_outputs INTEGER DEFAULT 0;"
 msgstr ""
 
-#: wallet/db.c:667
+#: wallet/db.c:658
 msgid "ALTER TABLE outputs ADD option_anchor_outputs INTEGER DEFAULT 0;"
 msgstr ""
 
-#: wallet/db.c:669
+#: wallet/db.c:660
 msgid "ALTER TABLE channels ADD full_channel_id BLOB DEFAULT NULL;"
 msgstr ""
 
-#: wallet/db.c:670
+#: wallet/db.c:661
 msgid "ALTER TABLE channels ADD funding_psbt BLOB DEFAULT NULL;"
 msgstr ""
 
-#: wallet/db.c:672
+#: wallet/db.c:663
 msgid "ALTER TABLE channels ADD closer INTEGER DEFAULT 2;"
 msgstr ""
 
-#: wallet/db.c:673
+#: wallet/db.c:664
 msgid "ALTER TABLE channels ADD state_change_reason INTEGER DEFAULT 0;"
 msgstr ""
 
-#: wallet/db.c:674
+#: wallet/db.c:665
 msgid "CREATE TABLE channel_state_changes (  channel_id BIGINT REFERENCES channels(id) ON DELETE CASCADE,  timestamp BIGINT,  old_state INTEGER,  new_state INTEGER,  cause INTEGER,  message TEXT);"
 msgstr ""
 
-#: wallet/db.c:682
+#: wallet/db.c:673
 msgid "CREATE TABLE offers (  offer_id BLOB, bolt12 TEXT, label TEXT, status INTEGER, PRIMARY KEY (offer_id));"
 msgstr ""
 
-#: wallet/db.c:690
+#: wallet/db.c:681
 msgid "ALTER TABLE invoices ADD COLUMN local_offer_id BLOB DEFAULT NULL REFERENCES offers(offer_id);"
 msgstr ""
 
-#: wallet/db.c:692
+#: wallet/db.c:683
 msgid "ALTER TABLE payments ADD COLUMN local_offer_id BLOB DEFAULT NULL REFERENCES offers(offer_id);"
 msgstr ""
 
-#: wallet/db.c:693
+#: wallet/db.c:684
 msgid "ALTER TABLE channels ADD funding_tx_remote_sigs_received INTEGER DEFAULT 0;"
 msgstr ""
 
-#: wallet/db.c:696
+#: wallet/db.c:687
 msgid "CREATE INDEX forwarded_payments_out_htlc_id ON forwarded_payments (out_htlc_id);"
 msgstr ""
 
-#: wallet/db.c:698
+#: wallet/db.c:689
 msgid "UPDATE channel_htlcs SET malformed_onion = 0 WHERE malformed_onion IS NULL"
 msgstr ""
 
-#: wallet/db.c:700
+#: wallet/db.c:691
 msgid "CREATE INDEX forwarded_payments_state ON forwarded_payments (state)"
 msgstr ""
 
-#: wallet/db.c:701
+#: wallet/db.c:692
 msgid "CREATE TABLE channel_funding_inflights (  channel_id BIGSERIAL REFERENCES channels(id) ON DELETE CASCADE, funding_tx_id BLOB, funding_tx_outnum INTEGER, funding_feerate INTEGER, funding_satoshi BIGINT, our_funding_satoshi BIGINT, funding_psbt BLOB, last_tx BLOB, last_sig BLOB, funding_tx_remote_sigs_received INTEGER, PRIMARY KEY (channel_id, funding_tx_id));"
 msgstr ""
 
-#: wallet/db.c:715
+#: wallet/db.c:706
 msgid "ALTER TABLE channels ADD revocation_basepoint_local BLOB"
 msgstr ""
 
-#: wallet/db.c:716
+#: wallet/db.c:707
 msgid "ALTER TABLE channels ADD payment_basepoint_local BLOB"
 msgstr ""
 
-#: wallet/db.c:717
+#: wallet/db.c:708
 msgid "ALTER TABLE channels ADD htlc_basepoint_local BLOB"
 msgstr ""
 
-#: wallet/db.c:718
+#: wallet/db.c:709
 msgid "ALTER TABLE channels ADD delayed_payment_basepoint_local BLOB"
 msgstr ""
 
-#: wallet/db.c:719
+#: wallet/db.c:710
 msgid "ALTER TABLE channels ADD funding_pubkey_local BLOB"
 msgstr ""
 
-#: wallet/db.c:722
+#: wallet/db.c:713
 msgid "ALTER TABLE channels ADD shutdown_wrong_txid BLOB DEFAULT NULL"
 msgstr ""
 
-#: wallet/db.c:723
+#: wallet/db.c:714
 msgid "ALTER TABLE channels ADD shutdown_wrong_outnum INTEGER DEFAULT NULL"
 msgstr ""
 
-#: wallet/db.c:726
+#: wallet/db.c:717
 msgid "ALTER TABLE channels ADD local_static_remotekey_start BIGINT DEFAULT 0"
 msgstr ""
 
-#: wallet/db.c:728
+#: wallet/db.c:719
 msgid "ALTER TABLE channels ADD remote_static_remotekey_start BIGINT DEFAULT 0"
 msgstr ""
 
-#: wallet/db.c:731
+#: wallet/db.c:722
 msgid "UPDATE channels SET remote_static_remotekey_start = 9223372036854775807, local_static_remotekey_start = 9223372036854775807 WHERE option_static_remotekey = 0"
 msgstr ""
 
-#: wallet/db.c:736
+#: wallet/db.c:727
 msgid "ALTER TABLE channel_funding_inflights ADD lease_commit_sig BLOB DEFAULT NULL"
 msgstr ""
 
-#: wallet/db.c:737
+#: wallet/db.c:728
 msgid "ALTER TABLE channel_funding_inflights ADD lease_chan_max_msat BIGINT DEFAULT NULL"
 msgstr ""
 
-#: wallet/db.c:738
+#: wallet/db.c:729
 msgid "ALTER TABLE channel_funding_inflights ADD lease_chan_max_ppt INTEGER DEFAULT NULL"
 msgstr ""
 
-#: wallet/db.c:739
+#: wallet/db.c:730
 msgid "ALTER TABLE channel_funding_inflights ADD lease_expiry INTEGER DEFAULT 0"
 msgstr ""
 
-#: wallet/db.c:740
+#: wallet/db.c:731
 msgid "ALTER TABLE channel_funding_inflights ADD lease_blockheight_start INTEGER DEFAULT 0"
 msgstr ""
 
-#: wallet/db.c:741
+#: wallet/db.c:732
 msgid "ALTER TABLE channels ADD lease_commit_sig BLOB DEFAULT NULL"
 msgstr ""
 
-#: wallet/db.c:742
+#: wallet/db.c:733
 msgid "ALTER TABLE channels ADD lease_chan_max_msat INTEGER DEFAULT NULL"
 msgstr ""
 
-#: wallet/db.c:743
+#: wallet/db.c:734
 msgid "ALTER TABLE channels ADD lease_chan_max_ppt INTEGER DEFAULT NULL"
 msgstr ""
 
-#: wallet/db.c:744
+#: wallet/db.c:735
 msgid "ALTER TABLE channels ADD lease_expiry INTEGER DEFAULT 0"
 msgstr ""
 
-#: wallet/db.c:745
+#: wallet/db.c:736
 msgid "CREATE TABLE channel_blockheights (  channel_id BIGINT REFERENCES channels(id) ON DELETE CASCADE,  hstate INTEGER,  blockheight INTEGER,  UNIQUE (channel_id, hstate));"
 msgstr ""
 
-#: wallet/db.c:752
+#: wallet/db.c:743
 msgid "ALTER TABLE outputs ADD csv_lock INTEGER DEFAULT 1;"
 msgstr ""
 
-#: wallet/db.c:753
+#: wallet/db.c:744
 msgid "CREATE TABLE datastore (  key BLOB,  data BLOB,  generation BIGINT,  PRIMARY KEY (key));"
 msgstr ""
 
-#: wallet/db.c:760
+#: wallet/db.c:751
 msgid "CREATE INDEX channel_state_changes_channel_id ON channel_state_changes (channel_id);"
 msgstr ""
 
-#: wallet/db.c:988
+#: wallet/db.c:979
 msgid "UPDATE vars SET intval = intval + 1 WHERE name = 'data_version' AND intval = ?"
 msgstr ""
 
-#: wallet/db.c:1088
+#: wallet/db.c:1079
 msgid "SELECT version FROM version LIMIT 1"
 msgstr ""
 
-#: wallet/db.c:1150
+#: wallet/db.c:1141
 msgid "UPDATE version SET version=?;"
 msgstr ""
 
-#: wallet/db.c:1158
+#: wallet/db.c:1149
 msgid "INSERT INTO db_upgrades VALUES (?, ?);"
 msgstr ""
 
-#: wallet/db.c:1170
+#: wallet/db.c:1161
 msgid "SELECT intval FROM vars WHERE name = 'data_version'"
 msgstr ""
 
-#: wallet/db.c:1197
+#: wallet/db.c:1188
 msgid "SELECT intval FROM vars WHERE name= ? LIMIT 1"
 msgstr ""
 
-#: wallet/db.c:1213
+#: wallet/db.c:1204
 msgid "UPDATE vars SET intval=? WHERE name=?;"
 msgstr ""
 
-#: wallet/db.c:1222
+#: wallet/db.c:1213
 msgid "INSERT INTO vars (name, intval) VALUES (?, ?);"
 msgstr ""
 
-#: wallet/db.c:1236
+#: wallet/db.c:1227
 msgid "UPDATE channels SET feerate_base = ?, feerate_ppm = ?;"
 msgstr ""
 
-#: wallet/db.c:1257
+#: wallet/db.c:1248
 msgid "UPDATE channels SET our_funding_satoshi = funding_satoshi WHERE funder = 0;"
 msgstr ""
 
-#: wallet/db.c:1273
+#: wallet/db.c:1264
 msgid "SELECT type, keyindex, prev_out_tx, prev_out_index, channel_id, peer_id, commitment_point FROM outputs WHERE scriptpubkey IS NULL;"
 msgstr ""
 
-#: wallet/db.c:1335
+#: wallet/db.c:1326
 msgid "UPDATE outputs SET scriptpubkey = ? WHERE prev_out_tx = ?    AND prev_out_index = ?"
 msgstr ""
 
-#: wallet/db.c:1360
+#: wallet/db.c:1351
 msgid "SELECT id, funding_tx_id, funding_tx_outnum FROM channels;"
 msgstr ""
 
-#: wallet/db.c:1379
+#: wallet/db.c:1370
 msgid "UPDATE channels SET full_channel_id = ? WHERE id = ?;"
 msgstr ""
 
-#: wallet/db.c:1400
+#: wallet/db.c:1391
 msgid "SELECT  channels.id, peers.node_id FROM  channels JOIN  peers ON (peers.id = channels.peer_id)"
 msgstr ""
 
-#: wallet/db.c:1433
+#: wallet/db.c:1424
 msgid "UPDATE channels SET  revocation_basepoint_local = ?, payment_basepoint_local = ?, htlc_basepoint_local = ?, delayed_payment_basepoint_local = ?, funding_pubkey_local = ? WHERE id = ?;"
 msgstr ""
 
-#: wallet/db.c:1466
+#: wallet/db.c:1457
 msgid "INSERT INTO channel_blockheights  (channel_id, hstate, blockheight) SELECT id, 4, 0 FROM channels WHERE funder = 0;"
 msgstr ""
 
-#: wallet/db.c:1474
+#: wallet/db.c:1465
 msgid "INSERT INTO channel_blockheights  (channel_id, hstate, blockheight) SELECT id, 14, 0 FROM channels WHERE funder = 1;"
 msgstr ""
 
-#: wallet/db.c:1486
+#: wallet/db.c:1477
 msgid "SELECT   c.id, p.node_id, c.fundingkey_remote, inflight.last_tx, inflight.last_sig, inflight.funding_satoshi, inflight.funding_tx_id FROM channels c  LEFT OUTER JOIN peers p   ON p.id = c.peer_id  LEFT OUTER JOIN   channel_funding_inflights inflight   ON c.id = inflight.channel_id WHERE inflight.last_tx IS NOT NULL;"
 msgstr ""
 
-#: wallet/db.c:1553
+#: wallet/db.c:1544
 msgid "UPDATE channel_funding_inflights SET last_tx = ? WHERE channel_id = ?   AND funding_tx_id = ?;"
 msgstr ""
 
-#: wallet/db.c:1577
+#: wallet/db.c:1568
 msgid "SELECT   c.id, p.node_id, c.last_tx, c.funding_satoshi, c.fundingkey_remote, c.last_sig FROM channels c  LEFT OUTER JOIN peers p  ON p.id = c.peer_id;"
 msgstr ""
 
-#: wallet/db.c:1644
+#: wallet/db.c:1635
 msgid "UPDATE channels SET last_tx = ? WHERE id = ?;"
 msgstr ""
 
-#: wallet/invoices.c:135
+#: wallet/invoices.c:126
 msgid "UPDATE invoices   SET state = ? WHERE state = ?   AND expiry_time <= ?;"
 msgstr ""
 
-#: wallet/invoices.c:183
+#: wallet/invoices.c:174
 msgid "SELECT id  FROM invoices WHERE state = ?   AND expiry_time <= ?"
 msgstr ""
 
-#: wallet/invoices.c:222
+#: wallet/invoices.c:213
 msgid "SELECT MIN(expiry_time)  FROM invoices WHERE state = ?;"
 msgstr ""
 
-#: wallet/invoices.c:289
+#: wallet/invoices.c:280
 msgid "INSERT INTO invoices            ( payment_hash, payment_key, state            , msatoshi, label, expiry_time            , pay_index, msatoshi_received            , paid_timestamp, bolt11, description, features, local_offer_id)     VALUES ( ?, ?, ?            , ?, ?, ?            , NULL, NULL            , NULL, ?, ?, ?, ?);"
 msgstr ""
 
-#: wallet/invoices.c:344
+#: wallet/invoices.c:335
 msgid "SELECT id  FROM invoices WHERE label = ?;"
 msgstr ""
 
-#: wallet/invoices.c:366
+#: wallet/invoices.c:357
 msgid "SELECT id  FROM invoices WHERE payment_hash = ?;"
 msgstr ""
 
-#: wallet/invoices.c:387
+#: wallet/invoices.c:378
 msgid "SELECT id  FROM invoices WHERE payment_hash = ?   AND state = ?;"
 msgstr ""
 
-#: wallet/invoices.c:411
+#: wallet/invoices.c:402
 msgid "DELETE FROM invoices WHERE id=?;"
 msgstr ""
 
-#: wallet/invoices.c:431
+#: wallet/invoices.c:422
 msgid "DELETE FROM invoices WHERE state = ?   AND expiry_time <= ?;"
 msgstr ""
 
-#: wallet/invoices.c:445
+#: wallet/invoices.c:436
 msgid "SELECT  state, payment_key, payment_hash, label, msatoshi, expiry_time, pay_index, msatoshi_received, paid_timestamp, bolt11, description, features, local_offer_id FROM invoices ORDER BY id;"
 msgstr ""
 
-#: wallet/invoices.c:503
+#: wallet/invoices.c:494
 msgid "SELECT state FROM invoices WHERE id = ?;"
 msgstr ""
 
-#: wallet/invoices.c:521
+#: wallet/invoices.c:512
 msgid "SELECT local_offer_id FROM invoices WHERE id = ?;"
 msgstr ""
 
-#: wallet/invoices.c:553
+#: wallet/invoices.c:544
 msgid "UPDATE invoices   SET state=?     , pay_index=?     , msatoshi_received=?     , paid_timestamp=? WHERE id=?;"
 msgstr ""
 
-#: wallet/invoices.c:612
+#: wallet/invoices.c:603
 msgid "SELECT id  FROM invoices WHERE pay_index IS NOT NULL   AND pay_index > ? ORDER BY pay_index ASC LIMIT 1;"
 msgstr ""
 
-#: wallet/invoices.c:661
+#: wallet/invoices.c:652
 msgid "SELECT  state, payment_key, payment_hash, label, msatoshi, expiry_time, pay_index, msatoshi_received, paid_timestamp, bolt11, description, features, local_offer_id FROM invoices WHERE id = ?;"
 msgstr ""
 
-#: wallet/wallet.c:72
+#: wallet/wallet.c:64
 msgid "SELECT txid, outnum FROM utxoset WHERE spendheight is NULL"
 msgstr ""
 
-#: wallet/wallet.c:113 wallet/wallet.c:617
+#: wallet/wallet.c:105 wallet/wallet.c:609
 msgid "SELECT * from outputs WHERE prev_out_tx=? AND prev_out_index=?"
 msgstr ""
 
-#: wallet/wallet.c:127
+#: wallet/wallet.c:119
 msgid "INSERT INTO outputs (  prev_out_tx, prev_out_index, value, type, status, keyindex, channel_id, peer_id, commitment_point, option_anchor_outputs, confirmation_height, spend_height, scriptpubkey) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?);"
 msgstr ""
 
-#: wallet/wallet.c:245
+#: wallet/wallet.c:237
 msgid "UPDATE outputs SET status=? WHERE status=? AND prev_out_tx=? AND prev_out_index=?"
 msgstr ""
 
-#: wallet/wallet.c:253
+#: wallet/wallet.c:245
 msgid "UPDATE outputs SET status=? WHERE prev_out_tx=? AND prev_out_index=?"
 msgstr ""
 
-#: wallet/wallet.c:272
+#: wallet/wallet.c:264
 msgid "SELECT  prev_out_tx, prev_out_index, value, type, status, keyindex, channel_id, peer_id, commitment_point, option_anchor_outputs, confirmation_height, spend_height, scriptpubkey , reserved_til , csv_lock FROM outputs"
 msgstr ""
 
-#: wallet/wallet.c:290
+#: wallet/wallet.c:282
 msgid "SELECT  prev_out_tx, prev_out_index, value, type, status, keyindex, channel_id, peer_id, commitment_point, option_anchor_outputs, confirmation_height, spend_height, scriptpubkey , reserved_til , csv_lock FROM outputs WHERE status= ? "
 msgstr ""
 
-#: wallet/wallet.c:329
+#: wallet/wallet.c:321
 msgid "SELECT  prev_out_tx, prev_out_index, value, type, status, keyindex, channel_id, peer_id, commitment_point, option_anchor_outputs, confirmation_height, spend_height, scriptpubkey, reserved_til, csv_lock FROM outputs WHERE channel_id IS NOT NULL AND confirmation_height IS NULL"
 msgstr ""
 
-#: wallet/wallet.c:367
+#: wallet/wallet.c:359
 msgid "SELECT  prev_out_tx, prev_out_index, value, type, status, keyindex, channel_id, peer_id, commitment_point, option_anchor_outputs, confirmation_height, spend_height, scriptpubkey, reserved_til, csv_lock FROM outputs WHERE prev_out_tx = ? AND prev_out_index = ?"
 msgstr ""
 
-#: wallet/wallet.c:460
+#: wallet/wallet.c:452
 msgid "UPDATE outputs SET status=?, reserved_til=? WHERE prev_out_tx=? AND prev_out_index=?"
 msgstr ""
 
-#: wallet/wallet.c:563
+#: wallet/wallet.c:555
 msgid "SELECT  prev_out_tx, prev_out_index, value, type, status, keyindex, channel_id, peer_id, commitment_point, option_anchor_outputs, confirmation_height, spend_height, scriptpubkey , reserved_til, csv_lock FROM outputs WHERE status = ? OR (status = ? AND reserved_til <= ?)ORDER BY RANDOM();"
 msgstr ""
 
-#: wallet/wallet.c:631
+#: wallet/wallet.c:623
 msgid "INSERT INTO outputs (  prev_out_tx, prev_out_index, value, type, status, keyindex, channel_id, peer_id, commitment_point, option_anchor_outputs, confirmation_height, spend_height, scriptpubkey, csv_lock) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?);"
 msgstr ""
 
-#: wallet/wallet.c:738
+#: wallet/wallet.c:730
 msgid "INSERT INTO shachains (min_index, num_valid) VALUES (?, 0);"
 msgstr ""
 
-#: wallet/wallet.c:782
+#: wallet/wallet.c:774
 msgid "UPDATE shachains SET num_valid=?, min_index=? WHERE id=?"
 msgstr ""
 
-#: wallet/wallet.c:789
+#: wallet/wallet.c:781
 msgid "UPDATE shachain_known SET idx=?, hash=? WHERE shachain_id=? AND pos=?"
 msgstr ""
 
-#: wallet/wallet.c:801
+#: wallet/wallet.c:793
 msgid "INSERT INTO shachain_known (shachain_id, pos, idx, hash) VALUES (?, ?, ?, ?);"
 msgstr ""
 
-#: wallet/wallet.c:823
+#: wallet/wallet.c:815
 msgid "SELECT min_index, num_valid FROM shachains WHERE id=?"
 msgstr ""
 
-#: wallet/wallet.c:838
+#: wallet/wallet.c:830
 msgid "SELECT idx, hash, pos FROM shachain_known WHERE shachain_id=?"
 msgstr ""
 
-#: wallet/wallet.c:861
+#: wallet/wallet.c:853
 msgid "SELECT id, node_id, address FROM peers WHERE id=?;"
 msgstr ""
 
-#: wallet/wallet.c:894
+#: wallet/wallet.c:886
 msgid "SELECT signature FROM htlc_sigs WHERE channelid = ?"
 msgstr ""
 
-#: wallet/wallet.c:928
+#: wallet/wallet.c:920
 msgid "SELECT remote_ann_node_sig, remote_ann_bitcoin_sig FROM channels WHERE id = ?"
 msgstr ""
 
-#: wallet/wallet.c:972
+#: wallet/wallet.c:964
 msgid "SELECT hstate, feerate_per_kw FROM channel_feerates WHERE channel_id = ?"
 msgstr ""
 
-#: wallet/wallet.c:1008
+#: wallet/wallet.c:1000
 msgid "SELECT hstate, blockheight FROM channel_blockheights WHERE channel_id = ?"
 msgstr ""
 
-#: wallet/wallet.c:1041
+#: wallet/wallet.c:1033
 msgid "INSERT INTO channel_funding_inflights (  channel_id, funding_tx_id, funding_tx_outnum, funding_feerate, funding_satoshi, our_funding_satoshi, funding_psbt, last_tx, last_sig, lease_commit_sig, lease_chan_max_msat, lease_chan_max_ppt, lease_expiry, lease_blockheight_start) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?);"
 msgstr ""
 
-#: wallet/wallet.c:1097
+#: wallet/wallet.c:1089
 msgid "UPDATE channel_funding_inflights SET  funding_psbt=?, funding_tx_remote_sigs_received=? WHERE  channel_id=? AND funding_tx_id=? AND funding_tx_outnum=?"
 msgstr ""
 
-#: wallet/wallet.c:1120
+#: wallet/wallet.c:1112
 msgid "DELETE FROM channel_funding_inflights WHERE channel_id = ?"
 msgstr ""
 
-#: wallet/wallet.c:1190
+#: wallet/wallet.c:1182
 msgid "SELECT  funding_tx_id, funding_tx_outnum, funding_feerate, funding_satoshi, our_funding_satoshi, funding_psbt, last_tx, last_sig, funding_tx_remote_sigs_received, lease_expiry, lease_commit_sig, lease_chan_max_msat, lease_chan_max_ppt, lease_blockheight_start FROM channel_funding_inflights WHERE channel_id = ? ORDER BY funding_feerate"
 msgstr ""
 
-#: wallet/wallet.c:1466
+#: wallet/wallet.c:1458
 msgid "SELECT id FROM channels ORDER BY id DESC LIMIT 1;"
 msgstr ""
 
-#: wallet/wallet.c:1483
+#: wallet/wallet.c:1475
 msgid "SELECT  id, peer_id, short_channel_id, full_channel_id, channel_config_local, channel_config_remote, state, funder, channel_flags, minimum_depth, next_index_local, next_index_remote, next_htlc_id, funding_tx_id, funding_tx_outnum, funding_satoshi, our_funding_satoshi, funding_locked_remote, push_msatoshi, msatoshi_local, fundingkey_remote, revocation_basepoint_remote, payment_basepoint_remote, htlc_basepoint_remote, delayed_payment_basepoint_remote, per_commit_remote, old_per_commit_remote, local_feerate_per_kw, remote_feerate_per_kw, shachain_remote_id, shutdown_scriptpubkey_remote, shutdown_keyidx_local, last_sent_commit_state, last_sent_commit_id, last_tx, last_sig, last_was_revoke, first_blocknum, min_possible_feerate, max_possible_feerate, msatoshi_to_us_min, msatoshi_to_us_max, future_per_commitment_point, last_sent_commit, feerate_base, feerate_ppm, remote_upfront_shutdown_script, local_static_remotekey_start, remote_static_remotekey_start, option_anchor_outputs, shutdown_scriptpubkey_local, closer, state_change_reason, revocation_basepoint_local, payment_basepoint_local, htlc_basepoint_local, delayed_payment_basepoint_local, funding_pubkey_local, shutdown_wrong_txid, shutdown_wrong_outnum, lease_expiry, lease_commit_sig, lease_chan_max_msat, lease_chan_max_ppt FROM channels WHERE state != ?;"
 msgstr ""
 
-#: wallet/wallet.c:1595
+#: wallet/wallet.c:1587
 msgid "UPDATE channels   SET in_payments_offered = COALESCE(in_payments_offered, 0) + 1     , in_msatoshi_offered = COALESCE(in_msatoshi_offered, 0) + ? WHERE id = ?;"
 msgstr ""
 
-#: wallet/wallet.c:1601
+#: wallet/wallet.c:1593
 msgid "UPDATE channels   SET in_payments_fulfilled = COALESCE(in_payments_fulfilled, 0) + 1     , in_msatoshi_fulfilled = COALESCE(in_msatoshi_fulfilled, 0) + ? WHERE id = ?;"
 msgstr ""
 
-#: wallet/wallet.c:1607
+#: wallet/wallet.c:1599
 msgid "UPDATE channels   SET out_payments_offered = COALESCE(out_payments_offered, 0) + 1     , out_msatoshi_offered = COALESCE(out_msatoshi_offered, 0) + ? WHERE id = ?;"
 msgstr ""
 
-#: wallet/wallet.c:1613
+#: wallet/wallet.c:1605
 msgid "UPDATE channels   SET out_payments_fulfilled = COALESCE(out_payments_fulfilled, 0) + 1     , out_msatoshi_fulfilled = COALESCE(out_msatoshi_fulfilled, 0) + ? WHERE id = ?;"
 msgstr ""
 
-#: wallet/wallet.c:1658
+#: wallet/wallet.c:1650
 msgid "SELECT   in_payments_offered,  in_payments_fulfilled,  in_msatoshi_offered,  in_msatoshi_fulfilled, out_payments_offered, out_payments_fulfilled, out_msatoshi_offered, out_msatoshi_fulfilled  FROM channels WHERE id = ?"
 msgstr ""
 
-#: wallet/wallet.c:1687
+#: wallet/wallet.c:1679
 msgid "SELECT MIN(height), MAX(height) FROM blocks;"
 msgstr ""
 
-#: wallet/wallet.c:1709
+#: wallet/wallet.c:1701
 msgid "INSERT INTO channel_configs DEFAULT VALUES;"
 msgstr ""
 
-#: wallet/wallet.c:1721
+#: wallet/wallet.c:1713
 msgid "UPDATE channel_configs SET  dust_limit_satoshis=?,  max_htlc_value_in_flight_msat=?,  channel_reserve_satoshis=?,  htlc_minimum_msat=?,  to_self_delay=?,  max_accepted_htlcs=? WHERE id=?;"
 msgstr ""
 
-#: wallet/wallet.c:1745
+#: wallet/wallet.c:1737
 msgid "SELECT id, dust_limit_satoshis, max_htlc_value_in_flight_msat, channel_reserve_satoshis, htlc_minimum_msat, to_self_delay, max_accepted_htlcs FROM channel_configs WHERE id= ? ;"
 msgstr ""
 
-#: wallet/wallet.c:1779
+#: wallet/wallet.c:1771
 msgid "UPDATE channels SET  remote_ann_node_sig=?,  remote_ann_bitcoin_sig=? WHERE id=?"
 msgstr ""
 
-#: wallet/wallet.c:1798
+#: wallet/wallet.c:1790
 msgid "UPDATE channels SET  shachain_remote_id=?,  short_channel_id=?,  full_channel_id=?,  state=?,  funder=?,  channel_flags=?,  minimum_depth=?,  next_index_local=?,  next_index_remote=?,  next_htlc_id=?,  funding_tx_id=?,  funding_tx_outnum=?,  funding_satoshi=?,  our_funding_satoshi=?,  funding_locked_remote=?,  push_msatoshi=?,  msatoshi_local=?,  shutdown_scriptpubkey_remote=?,  shutdown_keyidx_local=?,  channel_config_local=?,  last_tx=?, last_sig=?,  last_was_revoke=?,  min_possible_feerate=?,  max_possible_feerate=?,  msatoshi_to_us_min=?,  msatoshi_to_us_max=?,  feerate_base=?,  feerate_ppm=?,  remote_upfront_shutdown_script=?,  local_static_remotekey_start=?,  remote_static_remotekey_start=?,  option_anchor_outputs=?,  shutdown_scriptpubkey_local=?,  closer=?,  state_change_reason=?,  shutdown_wrong_txid=?,  shutdown_wrong_outnum=?,  lease_expiry=?,  lease_commit_sig=?,  lease_chan_max_msat=?,  lease_chan_max_ppt=? WHERE id=?"
 msgstr ""
 
-#: wallet/wallet.c:1907
+#: wallet/wallet.c:1899
 msgid "UPDATE channels SET  fundingkey_remote=?,  revocation_basepoint_remote=?,  payment_basepoint_remote=?,  htlc_basepoint_remote=?,  delayed_payment_basepoint_remote=?,  per_commit_remote=?,  old_per_commit_remote=?,  channel_config_remote=?,  future_per_commitment_point=? WHERE id=?"
 msgstr ""
 
-#: wallet/wallet.c:1934
+#: wallet/wallet.c:1926
 msgid "DELETE FROM channel_feerates WHERE channel_id=?"
 msgstr ""
 
-#: wallet/wallet.c:1944
+#: wallet/wallet.c:1936
 msgid "INSERT INTO channel_feerates  VALUES(?, ?, ?)"
 msgstr ""
 
-#: wallet/wallet.c:1953
+#: wallet/wallet.c:1945
 msgid "DELETE FROM channel_blockheights WHERE channel_id=?"
 msgstr ""
 
-#: wallet/wallet.c:1963
+#: wallet/wallet.c:1955
 msgid "INSERT INTO channel_blockheights  VALUES(?, ?, ?)"
 msgstr ""
 
-#: wallet/wallet.c:1980
+#: wallet/wallet.c:1972
 msgid "UPDATE channels SET  last_sent_commit=? WHERE id=?"
 msgstr ""
 
-#: wallet/wallet.c:2003
+#: wallet/wallet.c:1995
 msgid "INSERT INTO channel_state_changes (  channel_id, timestamp, old_state, new_state, cause, message) VALUES (?, ?, ?, ?, ?, ?);"
 msgstr ""
 
-#: wallet/wallet.c:2031
+#: wallet/wallet.c:2023
 msgid "SELECT timestamp, old_state, new_state, cause, message FROM channel_state_changes WHERE channel_id = ? ORDER BY timestamp ASC;"
 msgstr ""
 
-#: wallet/wallet.c:2060
+#: wallet/wallet.c:2052
 msgid "SELECT id FROM peers WHERE node_id = ?"
 msgstr ""
 
-#: wallet/wallet.c:2072
+#: wallet/wallet.c:2064
 msgid "UPDATE peers SET address = ? WHERE id = ?"
 msgstr ""
 
-#: wallet/wallet.c:2081
+#: wallet/wallet.c:2073
 msgid "INSERT INTO peers (node_id, address) VALUES (?, ?);"
 msgstr ""
 
-#: wallet/wallet.c:2102
+#: wallet/wallet.c:2094
 msgid "INSERT INTO channels (  peer_id, first_blocknum, id, revocation_basepoint_local, payment_basepoint_local, htlc_basepoint_local, delayed_payment_basepoint_local, funding_pubkey_local) VALUES (?, ?, ?, ?, ?, ?, ?, ?);"
 msgstr ""
 
-#: wallet/wallet.c:2143
+#: wallet/wallet.c:2135
 msgid "DELETE FROM channel_htlcs WHERE channel_id=?"
 msgstr ""
 
-#: wallet/wallet.c:2149
+#: wallet/wallet.c:2141
 msgid "DELETE FROM htlc_sigs WHERE channelid=?"
 msgstr ""
 
-#: wallet/wallet.c:2155
+#: wallet/wallet.c:2147
 msgid "DELETE FROM channeltxs WHERE channel_id=?"
 msgstr ""
 
-#: wallet/wallet.c:2162
+#: wallet/wallet.c:2154
 msgid "DELETE FROM channel_funding_inflights  WHERE channel_id=?"
 msgstr ""
 
-#: wallet/wallet.c:2168
+#: wallet/wallet.c:2160
 msgid "DELETE FROM shachains WHERE id IN (  SELECT shachain_remote_id   FROM channels   WHERE channels.id=?)"
 msgstr ""
 
-#: wallet/wallet.c:2178
+#: wallet/wallet.c:2170
 msgid "UPDATE channels SET state=?, peer_id=? WHERE channels.id=?"
 msgstr ""
 
-#: wallet/wallet.c:2192
+#: wallet/wallet.c:2184
 msgid "SELECT * FROM channels WHERE peer_id = ?;"
 msgstr ""
 
-#: wallet/wallet.c:2200
+#: wallet/wallet.c:2192
 msgid "DELETE FROM peers WHERE id=?"
 msgstr ""
 
-#: wallet/wallet.c:2211
+#: wallet/wallet.c:2203
 msgid "UPDATE outputs SET confirmation_height = ? WHERE prev_out_tx = ?"
 msgstr ""
 
-#: wallet/wallet.c:2314
+#: wallet/wallet.c:2306
 msgid "INSERT INTO channel_htlcs ( channel_id, channel_htlc_id,  direction, msatoshi, cltv_expiry, payment_hash,  payment_key, hstate, shared_secret, routing_onion, received_time) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?);"
 msgstr ""
 
-#: wallet/wallet.c:2367
+#: wallet/wallet.c:2359
 msgid "INSERT INTO channel_htlcs ( channel_id, channel_htlc_id, direction, origin_htlc, msatoshi, cltv_expiry, payment_hash, payment_key, hstate, routing_onion, malformed_onion, partid) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, 0, ?);"
 msgstr ""
 
-#: wallet/wallet.c:2428
+#: wallet/wallet.c:2420
 msgid "UPDATE channel_htlcs SET hstate=?, payment_key=?, malformed_onion=?, failuremsg=?, localfailmsg=?, we_filled=? WHERE id=?"
 msgstr ""
 
-#: wallet/wallet.c:2645
+#: wallet/wallet.c:2637
 msgid "SELECT  id, channel_htlc_id, msatoshi, cltv_expiry, hstate, payment_hash, payment_key, routing_onion, failuremsg, malformed_onion, origin_htlc, shared_secret, received_time, we_filled FROM channel_htlcs WHERE direction= ? AND channel_id= ? AND hstate != ?"
 msgstr ""
 
-#: wallet/wallet.c:2692
+#: wallet/wallet.c:2684
 msgid "SELECT  id, channel_htlc_id, msatoshi, cltv_expiry, hstate, payment_hash, payment_key, routing_onion, failuremsg, malformed_onion, origin_htlc, shared_secret, received_time, partid, localfailmsg FROM channel_htlcs WHERE direction = ? AND channel_id = ? AND hstate != ?"
 msgstr ""
 
-#: wallet/wallet.c:2823
+#: wallet/wallet.c:2815
 msgid "SELECT channel_id, direction, cltv_expiry, channel_htlc_id, payment_hash FROM channel_htlcs WHERE channel_id = ?;"
 msgstr ""
 
-#: wallet/wallet.c:2857
+#: wallet/wallet.c:2849
 msgid "DELETE FROM channel_htlcs WHERE direction = ? AND origin_htlc = ? AND payment_hash = ? AND partid = ?;"
 msgstr ""
 
-#: wallet/wallet.c:2910
+#: wallet/wallet.c:2902
 msgid "SELECT status FROM payments WHERE payment_hash=? AND partid = ?;"
 msgstr ""
 
-#: wallet/wallet.c:2928
+#: wallet/wallet.c:2920
 msgid "INSERT INTO payments (  status,  payment_hash,  destination,  msatoshi,  timestamp,  path_secrets,  route_nodes,  route_channels,  msatoshi_sent,  description,  bolt11,  total_msat,  partid,  local_offer_id) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?);"
 msgstr ""
 
-#: wallet/wallet.c:3017
+#: wallet/wallet.c:3009
 msgid "DELETE FROM payments WHERE payment_hash = ? AND partid = ?"
 msgstr ""
 
-#: wallet/wallet.c:3031
+#: wallet/wallet.c:3023
 msgid "DELETE FROM payments WHERE payment_hash = ?"
 msgstr ""
 
-#: wallet/wallet.c:3132
+#: wallet/wallet.c:3124
 msgid "SELECT  id, status, destination, msatoshi, payment_hash, timestamp, payment_preimage, path_secrets, route_nodes, route_channels, msatoshi_sent, description, bolt11, failonionreply, total_msat, partid, local_offer_id FROM payments WHERE payment_hash = ? AND partid = ?"
 msgstr ""
 
-#: wallet/wallet.c:3182
+#: wallet/wallet.c:3174
 msgid "UPDATE payments SET status=? WHERE payment_hash=? AND partid=?"
 msgstr ""
 
-#: wallet/wallet.c:3192
+#: wallet/wallet.c:3184
 msgid "UPDATE payments SET payment_preimage=? WHERE payment_hash=? AND partid=?"
 msgstr ""
 
-#: wallet/wallet.c:3202
+#: wallet/wallet.c:3194
 msgid "UPDATE payments   SET path_secrets = NULL     , route_nodes = NULL     , route_channels = NULL WHERE payment_hash = ? AND partid = ?;"
 msgstr ""
 
-#: wallet/wallet.c:3234
+#: wallet/wallet.c:3226
 msgid "SELECT failonionreply, faildestperm, failindex, failcode, failnode, failchannel, failupdate, faildetail, faildirection  FROM payments WHERE payment_hash=? AND partid=?;"
 msgstr ""
 
-#: wallet/wallet.c:3301
+#: wallet/wallet.c:3293
 msgid "UPDATE payments   SET failonionreply=?     , faildestperm=?     , failindex=?     , failcode=?     , failnode=?     , failchannel=?     , failupdate=?     , faildetail=?     , faildirection=? WHERE payment_hash=? AND partid=?;"
 msgstr ""
 
-#: wallet/wallet.c:3360
+#: wallet/wallet.c:3352
 msgid "SELECT  id, status, destination, msatoshi, payment_hash, timestamp, payment_preimage, path_secrets, route_nodes, route_channels, msatoshi_sent, description, bolt11, failonionreply, total_msat, partid, local_offer_id FROM payments WHERE payment_hash = ? ORDER BY id;"
 msgstr ""
 
-#: wallet/wallet.c:3383
+#: wallet/wallet.c:3375
 msgid "SELECT  id, status, destination, msatoshi, payment_hash, timestamp, payment_preimage, path_secrets, route_nodes, route_channels, msatoshi_sent, description, bolt11, failonionreply, total_msat, partid, local_offer_id FROM payments ORDER BY id;"
 msgstr ""
 
-#: wallet/wallet.c:3434
+#: wallet/wallet.c:3426
 msgid "SELECT  id, status, destination, msatoshi, payment_hash, timestamp, payment_preimage, path_secrets, route_nodes, route_channels, msatoshi_sent, description, bolt11, failonionreply, total_msat, partid, local_offer_id FROM payments WHERE local_offer_id = ?;"
 msgstr ""
 
-#: wallet/wallet.c:3479
+#: wallet/wallet.c:3471
 msgid "DELETE FROM htlc_sigs WHERE channelid = ?"
 msgstr ""
 
-#: wallet/wallet.c:3486
+#: wallet/wallet.c:3478
 msgid "INSERT INTO htlc_sigs (channelid, signature) VALUES (?, ?)"
 msgstr ""
 
-#: wallet/wallet.c:3498
+#: wallet/wallet.c:3490
 msgid "SELECT blobval FROM vars WHERE name='genesis_hash'"
 msgstr ""
 
-#: wallet/wallet.c:3522
+#: wallet/wallet.c:3514
 msgid "INSERT INTO vars (name, blobval) VALUES ('genesis_hash', ?);"
 msgstr ""
 
-#: wallet/wallet.c:3540
+#: wallet/wallet.c:3532
 msgid "SELECT txid, outnum FROM utxoset WHERE spendheight < ?"
 msgstr ""
 
-#: wallet/wallet.c:3552
+#: wallet/wallet.c:3544
 msgid "DELETE FROM utxoset WHERE spendheight < ?"
 msgstr ""
 
-#: wallet/wallet.c:3560 wallet/wallet.c:3674
+#: wallet/wallet.c:3552 wallet/wallet.c:3666
 msgid "INSERT INTO blocks (height, hash, prev_hash) VALUES (?, ?, ?);"
 msgstr ""
 
-#: wallet/wallet.c:3579
+#: wallet/wallet.c:3571
 msgid "DELETE FROM blocks WHERE hash = ?"
 msgstr ""
 
-#: wallet/wallet.c:3585
+#: wallet/wallet.c:3577
 msgid "SELECT * FROM blocks WHERE height >= ?;"
 msgstr ""
 
-#: wallet/wallet.c:3594
+#: wallet/wallet.c:3586
 msgid "DELETE FROM blocks WHERE height > ?"
 msgstr ""
 
-#: wallet/wallet.c:3606
+#: wallet/wallet.c:3598
 msgid "UPDATE outputs SET spend_height = ?,  status = ? WHERE prev_out_tx = ? AND prev_out_index = ?"
 msgstr ""
 
-#: wallet/wallet.c:3624
+#: wallet/wallet.c:3616
 msgid "UPDATE utxoset SET spendheight = ? WHERE txid = ? AND outnum = ?"
 msgstr ""
 
-#: wallet/wallet.c:3647 wallet/wallet.c:3685
+#: wallet/wallet.c:3639 wallet/wallet.c:3677
 msgid "INSERT INTO utxoset ( txid, outnum, blockheight, spendheight, txindex, scriptpubkey, satoshis) VALUES(?, ?, ?, ?, ?, ?, ?);"
 msgstr ""
 
-#: wallet/wallet.c:3711
+#: wallet/wallet.c:3703
 msgid "SELECT height FROM blocks WHERE height = ?"
 msgstr ""
 
-#: wallet/wallet.c:3724
+#: wallet/wallet.c:3716
 msgid "SELECT txid, spendheight, scriptpubkey, satoshis FROM utxoset WHERE blockheight = ? AND txindex = ? AND outnum = ? AND spendheight IS NULL"
 msgstr ""
 
-#: wallet/wallet.c:3788
+#: wallet/wallet.c:3780
 msgid "SELECT blockheight, txindex, outnum FROM utxoset WHERE spendheight = ?"
 msgstr ""
 
-#: wallet/wallet.c:3805
+#: wallet/wallet.c:3797
 msgid "SELECT blockheight, txindex, outnum FROM utxoset WHERE blockheight = ?"
 msgstr ""
 
-#: wallet/wallet.c:3822 wallet/wallet.c:3982
+#: wallet/wallet.c:3814 wallet/wallet.c:3974
 msgid "SELECT blockheight FROM transactions WHERE id=?"
 msgstr ""
 
-#: wallet/wallet.c:3832
+#: wallet/wallet.c:3824
 msgid "INSERT INTO transactions (  id, blockheight, txindex, rawtx) VALUES (?, ?, ?, ?);"
 msgstr ""
 
-#: wallet/wallet.c:3853
+#: wallet/wallet.c:3845
 msgid "UPDATE transactions SET blockheight = ?, txindex = ? WHERE id = ?"
 msgstr ""
 
-#: wallet/wallet.c:3870
+#: wallet/wallet.c:3862
 msgid "INSERT INTO transaction_annotations (txid, idx, location, type, channel) VALUES (?, ?, ?, ?, ?) ON CONFLICT(txid,idx) DO NOTHING;"
 msgstr ""
 
-#: wallet/wallet.c:3902
+#: wallet/wallet.c:3894
 msgid "SELECT type, channel_id FROM transactions WHERE id=?"
 msgstr ""
 
-#: wallet/wallet.c:3918
+#: wallet/wallet.c:3910
 msgid "UPDATE transactions SET type = ?, channel_id = ? WHERE id = ?"
 msgstr ""
 
-#: wallet/wallet.c:3937
+#: wallet/wallet.c:3929
 msgid "SELECT type FROM transactions WHERE id=?"
 msgstr ""
 
-#: wallet/wallet.c:3960
+#: wallet/wallet.c:3952
 msgid "SELECT rawtx FROM transactions WHERE id=?"
 msgstr ""
 
-#: wallet/wallet.c:4006
+#: wallet/wallet.c:3998
 msgid "SELECT blockheight, txindex FROM transactions WHERE id=?"
 msgstr ""
 
-#: wallet/wallet.c:4034
+#: wallet/wallet.c:4026
 msgid "SELECT id FROM transactions WHERE blockheight=?"
 msgstr ""
 
-#: wallet/wallet.c:4053
+#: wallet/wallet.c:4045
 msgid "INSERT INTO channeltxs (  channel_id, type, transaction_id, input_num, blockheight) VALUES (?, ?, ?, ?, ?);"
 msgstr ""
 
-#: wallet/wallet.c:4077
+#: wallet/wallet.c:4069
 msgid "SELECT DISTINCT(channel_id) FROM channeltxs WHERE type = ?;"
 msgstr ""
 
-#: wallet/wallet.c:4098
+#: wallet/wallet.c:4090
 msgid "SELECT  c.type, c.blockheight, t.rawtx, c.input_num, c.blockheight - t.blockheight + 1 AS depth, t.id as txid FROM channeltxs c JOIN transactions t ON t.id = c.transaction_id WHERE c.channel_id = ? ORDER BY c.id ASC;"
 msgstr ""
 
-#: wallet/wallet.c:4143
+#: wallet/wallet.c:4135
 msgid "UPDATE forwarded_payments SET  in_msatoshi=?, out_msatoshi=?, state=?, resolved_time=?, failcode=? WHERE in_htlc_id=?"
 msgstr ""
 
-#: wallet/wallet.c:4201
+#: wallet/wallet.c:4193
 msgid "INSERT INTO forwarded_payments (  in_htlc_id, out_htlc_id, in_channel_scid, out_channel_scid, in_msatoshi, out_msatoshi, state, received_time, resolved_time, failcode) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?);"
 msgstr ""
 
-#: wallet/wallet.c:4260
+#: wallet/wallet.c:4252
 msgid "SELECT CAST(COALESCE(SUM(in_msatoshi - out_msatoshi), 0) AS BIGINT)FROM forwarded_payments WHERE state = ?;"
 msgstr ""
 
-#: wallet/wallet.c:4309
+#: wallet/wallet.c:4301
 msgid "SELECT  f.state, in_msatoshi, out_msatoshi, hin.payment_hash as payment_hash, in_channel_scid, out_channel_scid, f.received_time, f.resolved_time, f.failcode FROM forwarded_payments f LEFT JOIN channel_htlcs hin ON (f.in_htlc_id = hin.id) WHERE (1 = ? OR f.state = ?) AND (1 = ? OR f.in_channel_scid = ?) AND (1 = ? OR f.out_channel_scid = ?)"
 msgstr ""
 
-#: wallet/wallet.c:4431
+#: wallet/wallet.c:4423
 msgid "SELECT  t.id, t.rawtx, t.blockheight, t.txindex, t.type as txtype, c2.short_channel_id as txchan, a.location, a.idx as ann_idx, a.type as annotation_type, c.short_channel_id FROM  transactions t LEFT JOIN  transaction_annotations a ON (a.txid = t.id) LEFT JOIN  channels c ON (a.channel = c.id) LEFT JOIN  channels c2 ON (t.channel_id = c2.id) ORDER BY t.blockheight, t.txindex ASC"
 msgstr ""
 
-#: wallet/wallet.c:4525
+#: wallet/wallet.c:4517
 msgid "INSERT INTO penalty_bases (  channel_id, commitnum, txid, outnum, amount) VALUES (?, ?, ?, ?, ?);"
 msgstr ""
 
-#: wallet/wallet.c:4550
+#: wallet/wallet.c:4542
 msgid "SELECT commitnum, txid, outnum, amount FROM penalty_bases WHERE channel_id = ?"
 msgstr ""
 
-#: wallet/wallet.c:4574
+#: wallet/wallet.c:4566
 msgid "DELETE FROM penalty_bases WHERE channel_id = ? AND commitnum = ?"
 msgstr ""
 
-#: wallet/wallet.c:4592
+#: wallet/wallet.c:4584
 msgid "SELECT 1  FROM offers WHERE offer_id = ?;"
 msgstr ""
 
-#: wallet/wallet.c:4605
+#: wallet/wallet.c:4597
 msgid "INSERT INTO offers (  offer_id, bolt12, label, status) VALUES (?, ?, ?, ?);"
 msgstr ""
 
-#: wallet/wallet.c:4632
+#: wallet/wallet.c:4624
 msgid "SELECT bolt12, label, status  FROM offers WHERE offer_id = ?;"
 msgstr ""
 
-#: wallet/wallet.c:4660
+#: wallet/wallet.c:4652
 msgid "SELECT offer_id FROM offers;"
 msgstr ""
 
-#: wallet/wallet.c:4686
+#: wallet/wallet.c:4678
 msgid "UPDATE offers SET status=? WHERE offer_id = ?;"
 msgstr ""
 
-#: wallet/wallet.c:4697
+#: wallet/wallet.c:4689
 msgid "UPDATE invoices SET state=? WHERE state=? AND local_offer_id = ?;"
 msgstr ""
 
-#: wallet/wallet.c:4725
+#: wallet/wallet.c:4717
 msgid "SELECT status  FROM offers WHERE offer_id = ?;"
 msgstr ""
 
-#: wallet/wallet.c:4810
+#: wallet/wallet.c:4802
 msgid "UPDATE datastore SET data=?, generation=generation+1 WHERE key=?;"
 msgstr ""
 
-#: wallet/wallet.c:4821
+#: wallet/wallet.c:4813
 msgid "INSERT INTO datastore VALUES (?, ?, 0);"
 msgstr ""
 
-#: wallet/wallet.c:4832
+#: wallet/wallet.c:4824
 msgid "DELETE FROM datastore WHERE key = ?"
 msgstr ""
 
-#: wallet/wallet.c:4849
+#: wallet/wallet.c:4841
 msgid "SELECT key, data, generation FROM datastore WHERE key >= ? ORDER BY key;"
 msgstr ""
 
-#: wallet/wallet.c:4856
+#: wallet/wallet.c:4848
 msgid "SELECT key, data, generation FROM datastore ORDER BY key;"
 msgstr ""
 
-#: wallet/test/run-db.c:126
+#: wallet/test/run-db.c:124
 msgid "SELECT name FROM sqlite_master WHERE type='table';"
 msgstr ""
 
-#: wallet/test/run-db.c:131
+#: wallet/test/run-db.c:129
 msgid "not a valid SQL statement"
 msgstr ""
 
-#: wallet/test/run-wallet.c:1508
+#: wallet/test/run-wallet.c:1499
 msgid "SELECT COUNT(1) FROM channel_funding_inflights WHERE channel_id = ?;"
 msgstr ""
 
-#: wallet/test/run-wallet.c:1721
+#: wallet/test/run-wallet.c:1712
 msgid "INSERT INTO channels (id) VALUES (1);"
 msgstr ""
-#  SHA256STAMP:85132b49c0d7238708371adbf692cc53395edb7f2db7a585c9317e6ee5212733
+#  SHA256STAMP:826f40774d133dbfa18209685ab964d2915e303346b964107ac4974275910111
diff --git a/wallet/test/run-db.c b/wallet/test/run-db.c
index 574987f5b..9bd50c395 100644
--- a/wallet/test/run-db.c
+++ b/wallet/test/run-db.c
@@ -12,8 +12,6 @@ static void db_log_(struct log *log UNUSED, enum log_level level UNUSED, const s
 
 #include "test_utils.h"
 
-#include <common/amount.h>
-#include <common/memleak.h>
 #include <common/setup.h>
 #include <stdio.h>
 #include <unistd.h>
diff --git a/wallet/test/run-wallet.c b/wallet/test/run-wallet.c
index ae0069431..2dd00b48d 100644
--- a/wallet/test/run-wallet.c
+++ b/wallet/test/run-wallet.c
@@ -17,17 +17,8 @@ static void db_log_(struct log *log UNUSED, enum log_level level UNUSED, const s
 
 #include "wallet/db.c"
 
-#include <ccan/mem/mem.h>
-#include <ccan/tal/str/str.h>
-#include <common/amount.h>
-#include <common/errcode.h>
-#include <common/memleak.h>
 #include <common/setup.h>
-#include <stdarg.h>
-#include <stddef.h>
 #include <stdio.h>
-#include <unistd.h>
-#include <wally_core.h>
 
 bool deprecated_apis = true;
 
diff --git a/wallet/txfilter.c b/wallet/txfilter.c
index 41f014981..2682ebba4 100644
--- a/wallet/txfilter.c
+++ b/wallet/txfilter.c
@@ -1,13 +1,10 @@
 #include "txfilter.h"
 
 #include <bitcoin/script.h>
-#include <ccan/build_assert/build_assert.h>
-#include <ccan/crypto/ripemd160/ripemd160.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/wallet.h>
 
 static size_t scriptpubkey_hash(const u8 *out)
diff --git a/wallet/wallet.c b/wallet/wallet.c
index 82511e2a8..b4e351a9c 100644
--- a/wallet/wallet.c
+++ b/wallet/wallet.c
@@ -1,7 +1,6 @@
 #include "invoices.h"
 #include "wallet.h"
 
-#include <bitcoin/psbt.h>
 #include <bitcoin/script.h>
 #include <ccan/array_size/array_size.h>
 #include <ccan/cast/cast.h>
@@ -9,21 +8,14 @@
 #include <ccan/tal/str/str.h>
 #include <common/blockheight_states.h>
 #include <common/fee_states.h>
-#include <common/key_derive.h>
-#include <common/memleak.h>
 #include <common/onionreply.h>
-#include <common/status.h>
 #include <common/type_to_string.h>
-#include <common/wireaddr.h>
-#include <inttypes.h>
 #include <lightningd/chaintopology.h>
 #include <lightningd/channel.h>
 #include <lightningd/coin_mvts.h>
-#include <lightningd/lightningd.h>
 #include <lightningd/notification.h>
 #include <lightningd/peer_control.h>
 #include <onchaind/onchaind_wiregen.h>
-#include <string.h>
 #include <wallet/db_common.h>
 #include <wallet/txfilter.h>
 #include <wally_bip32.h>
diff --git a/wallet/walletrpc.c b/wallet/walletrpc.c
index 2db67e8f5..33b60fbd9 100644
--- a/wallet/walletrpc.c
+++ b/wallet/walletrpc.c
@@ -1,41 +1,24 @@
-#include <bitcoin/address.h>
 #include <bitcoin/base58.h>
 #include <bitcoin/script.h>
-#include <bitcoin/tx.h>
 #include <ccan/cast/cast.h>
-#include <ccan/tal/str/str.h>
 #include <common/addr.h>
 #include <common/bech32.h>
 #include <common/configdir.h>
 #include <common/json_command.h>
 #include <common/json_helpers.h>
 #include <common/json_tok.h>
-#include <common/jsonrpc_errors.h>
 #include <common/key_derive.h>
 #include <common/param.h>
-#include <common/pseudorand.h>
-#include <common/status.h>
 #include <common/type_to_string.h>
-#include <common/utils.h>
-#include <common/utxo.h>
 #include <errno.h>
 #include <hsmd/hsmd_wiregen.h>
-#include <inttypes.h>
-#include <lightningd/bitcoind.h>
 #include <lightningd/chaintopology.h>
 #include <lightningd/channel.h>
-#include <lightningd/hsm_control.h>
-#include <lightningd/json.h>
 #include <lightningd/jsonrpc.h>
 #include <lightningd/lightningd.h>
-#include <lightningd/log.h>
-#include <lightningd/options.h>
 #include <lightningd/peer_control.h>
-#include <lightningd/subd.h>
 #include <wallet/txfilter.h>
-#include <wallet/wallet.h>
 #include <wallet/walletrpc.h>
-#include <wally_bip32.h>
 #include <wally_psbt.h>
 #include <wire/wire_sync.h>
 
diff --git a/wire/fromwire.c b/wire/fromwire.c
index 186573134..4121180b9 100644
--- a/wire/fromwire.c
+++ b/wire/fromwire.c
@@ -1,12 +1,8 @@
 #include "wire.h"
 #include <assert.h>
-#include <ccan/build_assert/build_assert.h>
 #include <ccan/crypto/siphash24/siphash24.h>
 #include <ccan/endian/endian.h>
 #include <ccan/mem/mem.h>
-#include <ccan/short_types/short_types.h>
-#include <ccan/tal/str/str.h>
-#include <common/type_to_string.h>
 #include <common/utils.h>
 
 #ifndef SUPERVERBOSE
diff --git a/wire/peer_wire.c b/wire/peer_wire.c
index 72db6395d..3042535d3 100644
--- a/wire/peer_wire.c
+++ b/wire/peer_wire.c
@@ -1,5 +1,3 @@
-#include <bitcoin/block.h>
-#include <common/utils.h>
 #include <wire/peer_wire.h>
 
 static bool unknown_type(enum peer_wire t)
diff --git a/wire/test/run-peer-wire.c b/wire/test/run-peer-wire.c
index b624df161..327a0c59c 100644
--- a/wire/test/run-peer-wire.c
+++ b/wire/test/run-peer-wire.c
@@ -6,17 +6,11 @@
 #include "common/channel_id.c"
 #include "common/node_id.c"
 
-#include <assert.h>
 #include <stdio.h>
 
-#include <ccan/str/hex/hex.h>
-#include <common/amount.h>
-#include <common/bigsize.h>
 #include <common/channel_type.h>
-#include <bitcoin/chainparams.h>
 #include <common/setup.h>
 #include <common/sphinx.h>
-#include <wire/peer_wire.h>
 #include <wire/tlvstream.c>
 
 extern secp256k1_context *secp256k1_ctx;
diff --git a/wire/test/run-tlvstream.c b/wire/test/run-tlvstream.c
index 2cf00405b..c0e280ab0 100644
--- a/wire/test/run-tlvstream.c
+++ b/wire/test/run-tlvstream.c
@@ -1,9 +1,4 @@
-#include <ccan/array_size/array_size.h>
-#include <ccan/str/hex/hex.h>
-#include <common/channel_type.h>
 #include <common/utils.h>
-#include <stdio.h>
-#include <wally_core.h>
 
 static const char *reason;
 #undef SUPERVERBOSE
@@ -12,6 +7,7 @@ static const char *reason;
 #include <bitcoin/pubkey.c>
 #include <common/amount.c>
 #include <common/bigsize.c>
+#include <common/channel_type.h>
 #include <common/node_id.c>
 #include <common/setup.h>
 
diff --git a/wire/tlvstream.c b/wire/tlvstream.c
index 1f0b79bfd..7b529b202 100644
--- a/wire/tlvstream.c
+++ b/wire/tlvstream.c
@@ -1,8 +1,6 @@
 #include "config.h"
-#include <assert.h>
 #include <ccan/asort/asort.h>
 #include <common/bigsize.h>
-#include <common/utils.h>
 #include <wire/tlvstream.h>
 #include <wire/wire.h>
 
diff --git a/wire/towire.c b/wire/towire.c
index 0fbdff6aa..d4697997e 100644
--- a/wire/towire.c
+++ b/wire/towire.c
@@ -1,13 +1,8 @@
 #include "wire.h"
 #include <assert.h>
-#include <ccan/crypto/ripemd160/ripemd160.h>
 #include <ccan/crypto/siphash24/siphash24.h>
 #include <ccan/endian/endian.h>
 #include <ccan/mem/mem.h>
-#include <ccan/tal/tal.h>
-#include <common/amount.h>
-#include <common/errcode.h>
-#include <common/node_id.h>
 #include <common/utils.h>
 
 void towire(u8 **pptr, const void *data, size_t len)
diff --git a/wire/wire_io.c b/wire/wire_io.c
index 03fe82494..39af137e4 100644
--- a/wire/wire_io.c
+++ b/wire/wire_io.c
@@ -2,8 +2,6 @@
  #include <unistd.h>
 #include <ccan/io/io_plan.h>
 #include <ccan/mem/mem.h>
-#include <ccan/take/take.h>
-#include <ccan/tal/tal.h>
 #include <common/utils.h>
 #include <errno.h>
 #include <wire/wire_io.h>
diff --git a/wire/wire_sync.c b/wire/wire_sync.c
index bdb3e4ef5..ce2107b93 100644
--- a/wire/wire_sync.c
+++ b/wire/wire_sync.c
@@ -1,6 +1,5 @@
 #include "config.h"
 #include <assert.h>
-#include <ccan/endian/endian.h>
 #include <ccan/read_write_all/read_write_all.h>
 #include <errno.h>
 #include <wire/wire_io.h>