cleanup: remove unneeded includes in header files.

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

lightningd/bitcoind.c

@@ -29,6 +29,7 @@
 #include <errno.h>
 #include <inttypes.h>
 #include <lightningd/chaintopology.h>
+#include <lightningd/io_loop_with_timers.h>
 #include <lightningd/plugin.h>
 
 /* The names of the requests we can make to our Bitcoin backend. */

lightningd/bitcoind.h

@@ -4,12 +4,7 @@
 #include <bitcoin/chainparams.h>
 #include <bitcoin/tx.h>
 #include <ccan/list/list.h>
-#include <ccan/short_types/short_types.h>
 #include <ccan/strmap/strmap.h>
-#include <ccan/tal/tal.h>
-#include <ccan/time/time.h>
-#include <ccan/typesafe_cb/typesafe_cb.h>
-#include <stdbool.h>
 
 struct bitcoin_blkid;
 struct bitcoin_tx_output;

lightningd/chaintopology.c

@@ -23,12 +23,16 @@
 #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>
+#include <lightningd/json.h>
+#include <math.h>
+#include <wallet/txfilter.h>
 
 /* Mutual recursion via timer. */
 static void try_extend_tip(struct chain_topology *topo);

lightningd/chaintopology.h

@@ -2,16 +2,8 @@
 #define LIGHTNING_LIGHTNINGD_CHAINTOPOLOGY_H
 #include "config.h"
 #include <bitcoin/block.h>
-#include <bitcoin/tx.h>
 #include <ccan/list/list.h>
-#include <ccan/short_types/short_types.h>
-#include <ccan/structeq/structeq.h>
-#include <ccan/time/time.h>
-#include <jsmn.h>
-#include <lightningd/json.h>
 #include <lightningd/watch.h>
-#include <math.h>
-#include <stddef.h>
 
 struct bitcoin_tx;
 struct bitcoind;

lightningd/channel.c

@@ -26,6 +26,7 @@
 #include <lightningd/opening_control.h>
 #include <lightningd/peer_control.h>
 #include <lightningd/subd.h>
+#include <wallet/txfilter.h>
 #include <wire/wire_sync.h>
 
 static bool connects_to_peer(struct subd *owner)

lightningd/channel.h

@@ -1,13 +1,11 @@
 #ifndef LIGHTNING_LIGHTNINGD_CHANNEL_H
 #define LIGHTNING_LIGHTNINGD_CHANNEL_H
 #include "config.h"
-#include <ccan/list/list.h>
 #include <common/channel_id.h>
 #include <common/channel_type.h>
-#include <common/per_peer_state.h>
 #include <common/tx_roles.h>
+#include <common/utils.h>
 #include <lightningd/channel_state.h>
-#include <lightningd/peer_htlcs.h>
 #include <wallet/wallet.h>
 
 struct channel_id;

lightningd/channel_control.c

@@ -8,18 +8,24 @@
 #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/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>

lightningd/closing_control.c

@@ -1,18 +1,26 @@
 #include <bitcoin/feerate.h>
 #include <bitcoin/script.h>
+#include <ccan/cast/cast.h>
 #include <ccan/mem/mem.h>
+#include <ccan/tal/str/str.h>
 #include <channeld/channeld_wiregen.h>
 #include <closingd/closingd_wiregen.h>
 #include <common/close_tx.h>
 #include <common/closing_fee.h>
 #include <common/fee_states.h>
 #include <common/initial_commit_tx.h>
+#include <common/json_command.h>
 #include <common/json_helpers.h>
+#include <common/json_tok.h>
+#include <common/param.h>
 #include <common/per_peer_state.h>
 #include <common/shutdown_scriptpubkey.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/capabilities.h>
 #include <inttypes.h>
 #include <lightningd/bitcoind.h>
 #include <lightningd/chaintopology.h>
@@ -20,6 +28,8 @@
 #include <lightningd/closing_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>

lightningd/coin_mvts.c

@@ -1,3 +1,4 @@
+#include <lightningd/channel.h>
 #include <lightningd/coin_mvts.h>
 #include <lightningd/notification.h>
 

lightningd/coin_mvts.h

@@ -3,8 +3,6 @@
 #include "config.h"
 
 #include <common/coin_mvt.h>
-#include <lightningd/channel.h>
-#include <lightningd/htlc_end.h>
 #include <lightningd/lightningd.h>
 
 void notify_channel_mvt(struct lightningd *ld, const struct channel_coin_mvt *mvt);

lightningd/connect_control.c

@@ -8,12 +8,14 @@
 #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>

lightningd/datastore.c

@@ -1,3 +1,6 @@
+#include <ccan/tal/str/str.h>
+#include <common/json_command.h>
+#include <common/json_tok.h>
 #include <common/param.h>
 #include <lightningd/json.h>
 #include <lightningd/jsonrpc.h>

lightningd/dual_open_control.c

@@ -5,9 +5,11 @@
 #include <bitcoin/psbt.h>
 #include <bitcoin/script.h>
 #include <ccan/array_size/array_size.h>
-#include <ccan/ccan/mem/mem.h>
-#include <ccan/ccan/take/take.h>
-#include <ccan/ccan/tal/tal.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>
@@ -17,16 +19,20 @@
 #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>
+#include <lightningd/channel.h>
 #include <lightningd/channel_control.h>
 #include <lightningd/closing_control.h>
 #include <lightningd/dual_open_control.h>
@@ -35,6 +41,7 @@
 #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>

lightningd/gossip_control.c

@@ -15,6 +15,7 @@
 #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>

lightningd/hsm_control.c

@@ -12,6 +12,7 @@
 #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>

lightningd/hsm_control.h

@@ -2,9 +2,6 @@
 #define LIGHTNING_LIGHTNINGD_HSM_CONTROL_H
 #include "config.h"
 #include <ccan/short_types/short_types.h>
-#include <ccan/tal/tal.h>
-#include <hsmd/capabilities.h>
-#include <stdbool.h>
 
 struct lightningd;
 struct node_id;

lightningd/htlc_end.c

@@ -5,6 +5,7 @@
 #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>

lightningd/htlc_end.h

@@ -2,12 +2,9 @@
 #define LIGHTNING_LIGHTNINGD_HTLC_END_H
 #include "config.h"
 #include <ccan/htable/htable_type.h>
-#include <ccan/short_types/short_types.h>
 #include <ccan/time/time.h>
-#include <common/amount.h>
 #include <common/htlc_state.h>
 #include <common/sphinx.h>
-#include <wire/onion_wire.h>
 
 /* We look up HTLCs by channel & id */
 struct htlc_key {

lightningd/htlc_set.c

@@ -1,7 +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>
 

lightningd/invoice.c

@@ -1,6 +1,7 @@
 #include "invoice.h"
 #include <ccan/array_size/array_size.h>
 #include <ccan/asort/asort.h>
+#include <ccan/cast/cast.h>
 #include <ccan/json_escape/json_escape.h>
 #include <ccan/str/hex/hex.h>
 #include <ccan/tal/str/str.h>
@@ -14,12 +15,14 @@
 #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>

lightningd/json.c

@@ -11,6 +11,7 @@
 #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>

lightningd/jsonrpc.c

@@ -26,6 +26,7 @@
 #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>

lightningd/jsonrpc.h

@@ -1,14 +1,11 @@
 #ifndef LIGHTNING_LIGHTNINGD_JSONRPC_H
 #define LIGHTNING_LIGHTNINGD_JSONRPC_H
 #include "config.h"
-#include <bitcoin/chainparams.h>
 #include <ccan/autodata/autodata.h>
 #include <ccan/list/list.h>
-#include <common/errcode.h>
 #include <common/json.h>
 #include <common/json_stream.h>
 #include <common/status_levels.h>
-#include <stdarg.h>
 
 struct jsonrpc;
 

lightningd/lightningd.c

@@ -47,6 +47,7 @@
 #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>
@@ -62,6 +63,7 @@
 #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>
 
@@ -70,6 +72,7 @@
 #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>
@@ -80,11 +83,15 @@
 #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>
 
 static void destroy_alt_subdaemons(struct lightningd *ld);
 #if DEVELOPER

lightningd/lightningd.h

@@ -1,18 +1,8 @@
 #ifndef LIGHTNING_LIGHTNINGD_LIGHTNINGD_H
 #define LIGHTNING_LIGHTNINGD_LIGHTNINGD_H
 #include "config.h"
-#include <bitcoin/chainparams.h>
-#include <bitcoin/privkey.h>
-#include <ccan/container_of/container_of.h>
-#include <ccan/strmap/strmap.h>
-#include <ccan/time/time.h>
-#include <ccan/timer/timer.h>
 #include <lightningd/htlc_end.h>
 #include <lightningd/htlc_set.h>
-#include <lightningd/plugin.h>
-#include <stdio.h>
-#include <sys/stat.h>
-#include <wallet/txfilter.h>
 #include <wallet/wallet.h>
 
 /* Various adjustable things. */

lightningd/log.h

@@ -1,14 +1,9 @@
 #ifndef LIGHTNING_LIGHTNINGD_LOG_H
 #define LIGHTNING_LIGHTNINGD_LOG_H
 #include "config.h"
-#include <ccan/list/list.h>
-#include <ccan/tal/tal.h>
 #include <ccan/time/time.h>
-#include <ccan/typesafe_cb/typesafe_cb.h>
 #include <common/status.h>
-#include <common/type_to_string.h>
 #include <jsmn.h>
-#include <stdarg.h>
 
 struct command;
 struct json_stream;

lightningd/log_status.h

@@ -1,7 +1,6 @@
 #ifndef LIGHTNING_LIGHTNINGD_LOG_STATUS_H
 #define LIGHTNING_LIGHTNINGD_LOG_STATUS_H
 #include "config.h"
-#include <common/status_levels.h>
 #include <lightningd/log.h>
 
 /* Returns true (and writes it to log) if it's a status_log message. */

lightningd/memdump.h

@@ -1,8 +1,6 @@
 #ifndef LIGHTNING_LIGHTNINGD_MEMDUMP_H
 #define LIGHTNING_LIGHTNINGD_MEMDUMP_H
 #include "config.h"
-#include <ccan/short_types/short_types.h>
-#include <stdbool.h>
 
 struct command;
 struct htable;

lightningd/notification.c

@@ -1,5 +1,6 @@
 #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>

lightningd/notification.h

@@ -1,26 +1,9 @@
 #ifndef LIGHTNING_LIGHTNINGD_NOTIFICATION_H
 #define LIGHTNING_LIGHTNINGD_NOTIFICATION_H
 #include "config.h"
-#include <bitcoin/short_channel_id.h>
-#include <bitcoin/tx.h>
-#include <ccan/autodata/autodata.h>
-#include <ccan/json_escape/json_escape.h>
-#include <ccan/time/time.h>
-#include <common/amount.h>
-#include <common/channel_id.h>
 #include <common/coin_mvt.h>
-#include <common/errcode.h>
-#include <common/node_id.h>
-#include <lightningd/channel_state.h>
-#include <lightningd/htlc_end.h>
-#include <lightningd/jsonrpc.h>
-#include <lightningd/lightningd.h>
-#include <lightningd/log.h>
 #include <lightningd/pay.h>
 #include <lightningd/plugin.h>
-#include <wallet/wallet.h>
-#include <wally_psbt.h>
-#include <wire/onion_wire.h>
 
 struct onionreply;
 struct wally_psbt;

lightningd/offer.c

@@ -4,12 +4,17 @@
 #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>
 

lightningd/onchain_control.c

@@ -1,10 +1,13 @@
 #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>
 #include <lightningd/chaintopology.h>
+#include <lightningd/channel.h>
 #include <lightningd/coin_mvts.h>
 #include <lightningd/hsm_control.h>
 #include <lightningd/log.h>
@@ -12,6 +15,8 @@
 #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. */

lightningd/onchain_control.h

@@ -1,9 +1,7 @@
 #ifndef LIGHTNING_LIGHTNINGD_ONCHAIN_CONTROL_H
 #define LIGHTNING_LIGHTNINGD_ONCHAIN_CONTROL_H
 #include "config.h"
-#include <ccan/short_types/short_types.h>
 #include <lightningd/lightningd.h>
-#include <onchaind/onchaind_wiregen.h>
 
 struct channel;
 struct bitcoin_tx;

lightningd/onion_message.c

@@ -1,5 +1,9 @@
+#include <common/json_command.h>
 #include <common/json_helpers.h>
+#include <common/param.h>
+#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>

lightningd/opening_common.c

@@ -1,6 +1,7 @@
 #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>

lightningd/opening_control.c

@@ -2,24 +2,31 @@
 #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>
@@ -34,6 +41,7 @@
 #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>

lightningd/options.c

@@ -11,16 +11,20 @@
 #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>

lightningd/options.h

@@ -1,8 +1,6 @@
 #ifndef LIGHTNING_LIGHTNINGD_OPTIONS_H
 #define LIGHTNING_LIGHTNINGD_OPTIONS_H
 #include "config.h"
-#include <ccan/tal/tal.h>
-#include <common/configdir.h>
 
 struct lightningd;
 

lightningd/pay.c

@@ -6,13 +6,16 @@
 #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/json.h>
 #include <lightningd/jsonrpc.h>

lightningd/pay.h

@@ -1,7 +1,6 @@
 #ifndef LIGHTNING_LIGHTNINGD_PAY_H
 #define LIGHTNING_LIGHTNINGD_PAY_H
 #include "config.h"
-#include <ccan/short_types/short_types.h>
 #include <common/errcode.h>
 
 struct htlc_out;

lightningd/peer_control.c

@@ -16,6 +16,7 @@
 #include <channeld/channeld_wiregen.h>
 #include <common/addr.h>
 #include <common/closing_fee.h>
+#include <common/configdir.h>
 #include <common/dev_disconnect.h>
 #include <common/features.h>
 #include <common/htlc_trim.h>
@@ -30,6 +31,7 @@
 #include <common/shutdown_scriptpubkey.h>
 #include <common/status.h>
 #include <common/timeout.h>
+#include <common/type_to_string.h>
 #include <common/utils.h>
 #include <common/version.h>
 #include <common/wire_error.h>
@@ -40,6 +42,7 @@
 #include <inttypes.h>
 #include <lightningd/bitcoind.h>
 #include <lightningd/chaintopology.h>
+#include <lightningd/channel.h>
 #include <lightningd/channel_control.h>
 #include <lightningd/closing_control.h>
 #include <lightningd/connect_control.h>
@@ -57,6 +60,7 @@
 #include <lightningd/peer_htlcs.h>
 #include <lightningd/plugin_hook.h>
 #include <limits.h>
+#include <onchaind/onchaind_wiregen.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <wally_bip32.h>

lightningd/peer_control.h

@@ -9,11 +9,7 @@
 #include <common/json.h>
 #include <common/node_id.h>
 #include <common/wireaddr.h>
-#include <lightningd/channel.h>
-#include <lightningd/channel_state.h>
-#include <stdbool.h>
 #include <wallet/wallet.h>
-#include <wire/peer_wire.h>
 
 struct per_peer_state;
 struct wally_psbt;

lightningd/peer_htlcs.c

@@ -8,9 +8,11 @@
 #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>
@@ -18,8 +20,10 @@
 #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/coin_mvts.h>
 #include <lightningd/htlc_end.h>

lightningd/peer_htlcs.h

@@ -2,7 +2,6 @@
 #ifndef LIGHTNING_LIGHTNINGD_PEER_HTLCS_H
 #define LIGHTNING_LIGHTNINGD_PEER_HTLCS_H
 #include "config.h"
-#include <ccan/short_types/short_types.h>
 #include <common/channel_config.h>
 #include <common/derive_basepoints.h>
 #include <common/htlc_wire.h>

lightningd/ping.c

@@ -1,5 +1,6 @@
 #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>

lightningd/plugin.c

@@ -1,15 +1,25 @@
 #include <ccan/array_size/array_size.h>
 #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>
+#include <ccan/tal/path/path.h>
 #include <ccan/tal/str/str.h>
 #include <ccan/utf8/utf8.h>
+#include <common/configdir.h>
 #include <common/features.h>
+#include <common/json_command.h>
 #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>

lightningd/plugin.h

@@ -2,24 +2,8 @@
 #define LIGHTNING_LIGHTNINGD_PLUGIN_H
 #include "config.h"
 #include <ccan/intmap/intmap.h>
-#include <ccan/io/io.h>
-#include <ccan/pipecmd/pipecmd.h>
-#include <ccan/take/take.h>
-#include <ccan/tal/path/path.h>
-#include <ccan/tal/tal.h>
-#include <common/json_command.h>
-#include <common/jsonrpc_errors.h>
-#include <common/memleak.h>
-#include <common/param.h>
-#include <common/timeout.h>
-#include <dirent.h>
-#include <errno.h>
-#include <lightningd/io_loop_with_timers.h>
 #include <lightningd/jsonrpc.h>
 #include <lightningd/lightningd.h>
-#include <lightningd/log.h>
-#include <stdarg.h>
-#include <unistd.h>
 
 
 enum plugin_state {

lightningd/plugin_control.c

@@ -1,10 +1,18 @@
 #include <ccan/opt/opt.h>
+#include <ccan/tal/str/str.h>
+#include <common/json_command.h>
+#include <common/json_tok.h>
+#include <common/memleak.h>
+#include <common/param.h>
+#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. */
 struct plugin_command {

lightningd/plugin_hook.h

@@ -2,11 +2,6 @@
 #define LIGHTNING_LIGHTNINGD_PLUGIN_HOOK_H
 
 #include "config.h"
-#include <ccan/autodata/autodata.h>
-#include <ccan/tal/tal.h>
-#include <ccan/typesafe_cb/typesafe_cb.h>
-#include <common/json_stream.h>
-#include <lightningd/lightningd.h>
 #include <lightningd/plugin.h>
 
 /**

lightningd/routehint.c

@@ -1,7 +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>

lightningd/signmessage.c

@@ -2,6 +2,7 @@
 #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>
@@ -9,8 +10,10 @@
 #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>

lightningd/watch.c

@@ -31,7 +31,9 @@
 #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/lightningd.h>
 #include <lightningd/log.h>

lightningd/watch.h

@@ -2,11 +2,7 @@
 #define LIGHTNING_LIGHTNINGD_WATCH_H
 #include "config.h"
 #include <bitcoin/tx.h>
-#include <ccan/crypto/ripemd160/ripemd160.h>
 #include <ccan/htable/htable_type.h>
-#include <ccan/list/list.h>
-#include <ccan/short_types/short_types.h>
-#include <ccan/typesafe_cb/typesafe_cb.h>
 
 struct bitcoin_tx;
 struct block;