cleanup: remove unneeded includes in C files.

Before:
 Ten builds, laptop -j5, no ccache:

```
real	0m36.686000-38.956000(38.608+/-0.65)s
user	2m32.864000-42.253000(40.7545+/-2.7)s
sys	0m16.618000-18.316000(17.8531+/-0.48)s
```

 Ten builds, laptop -j5, ccache (warm):

```
real	0m8.212000-8.577000(8.39989+/-0.13)s
user	0m12.731000-13.212000(12.9751+/-0.17)s
sys	0m3.697000-3.902000(3.83722+/-0.064)s
```

After:
 Ten builds, laptop -j5, no ccache: 8% faster

```
real	0m33.802000-35.773000(35.468+/-0.54)s
user	2m19.073000-27.754000(26.2542+/-2.3)s
sys	0m15.784000-17.173000(16.7165+/-0.37)s
```

 Ten builds, laptop -j5, ccache (warm): 1% faster

```
real	0m8.200000-8.485000(8.30138+/-0.097)s
user	0m12.485000-13.100000(12.7344+/-0.19)s
sys	0m3.702000-3.889000(3.78787+/-0.056)s
```

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>

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,

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)

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*/

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)
 {

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>

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>
 
 

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

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>

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:

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

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 */

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 */

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
 

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 */

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(...)

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"
 

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>

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 */

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>

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>

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);

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);

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);

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>
 

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.

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>

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;

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,

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>
 

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(...)

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;
 

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)
 {

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,

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);

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>

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)

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. */

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>
 
 

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>
 

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 {

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>
 

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 {

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>

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>
 

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>
 

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>
 

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)
 {

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>
 

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)

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,

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:
  *

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)
 {

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,

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,

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,

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>

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)
 {

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;
 

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. */

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:
  *

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;

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

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,

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>
 

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

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>

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;

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>
 

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,

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>

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
 

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>
 

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[] = {

common/status_wire.c

@@ -1,4 +1,3 @@
-#include <common/status_levels.h>
 #include <common/status_wire.h>
 #include <wire/wire.h>
 

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, ...)
 {

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 */

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)

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 */

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>

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 */

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>

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>

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 */

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 */

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 */

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 */

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>

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 */

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>
 

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 */

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>

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 */

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"

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 */

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>

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;

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"
 

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>

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 */

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 */