cleanup: remove unneeded includes in header files.

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

wallet/db.c

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

wallet/db.h

@@ -6,14 +6,8 @@
 #include <bitcoin/pubkey.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/short_types/short_types.h>
-#include <ccan/tal/tal.h>
 #include <ccan/time/time.h>
-#include <common/amount.h>
-#include <secp256k1_ecdh.h>
-#include <stdbool.h>
 
 struct channel_id;
 struct ext_key;

wallet/db_common.h

@@ -4,7 +4,6 @@
 #include <ccan/autodata/autodata.h>
 #include <ccan/list/list.h>
 #include <ccan/short_types/short_types.h>
-#include <stdbool.h>
 
 /* For testing, we want to catch fatal messages. */
 #ifndef db_fatal

wallet/db_postgres_sqlgen.c

@@ -2074,4 +2074,4 @@ struct db_query db_postgres_queries[] = {
 
 #endif /* LIGHTNINGD_WALLET_GEN_DB_POSTGRES */
 
-// SHA256STAMP:e356b7327b760559f9a7c31a7ea4a09d50194c7aacc6daef6ba9fb5caf43ae83
+// SHA256STAMP:998001f2c1b3d3d1c6e4324a4a808cc2ed915b918bfdef88e259901b7fa2a735

wallet/db_sqlite3_sqlgen.c

@@ -2074,4 +2074,4 @@ struct db_query db_sqlite3_queries[] = {
 
 #endif /* LIGHTNINGD_WALLET_GEN_DB_SQLITE3 */
 
-// SHA256STAMP:e356b7327b760559f9a7c31a7ea4a09d50194c7aacc6daef6ba9fb5caf43ae83
+// SHA256STAMP:998001f2c1b3d3d1c6e4324a4a808cc2ed915b918bfdef88e259901b7fa2a735

wallet/invoices.h

@@ -2,8 +2,6 @@
 #define LIGHTNING_WALLET_INVOICES_H
 #include "config.h"
 #include <bitcoin/preimage.h>
-#include <ccan/short_types/short_types.h>
-#include <ccan/take/take.h>
 #include <ccan/tal/tal.h>
 
 struct amount_msat;

wallet/reservation.c

@@ -2,15 +2,23 @@
 #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>
+#include <lightningd/chaintopology.h>
+#include <lightningd/json.h>
 #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 */
 #define RESERVATION_DEFAULT (6 * 12)

wallet/txfilter.c

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

wallet/txfilter.h

@@ -3,8 +3,6 @@
 #include "config.h"
 #include <bitcoin/pubkey.h>
 #include <bitcoin/tx.h>
-#include <ccan/short_types/short_types.h>
-#include <ccan/tal/tal.h>
 
 struct txfilter;
 

wallet/wallet.c

@@ -13,8 +13,11 @@
 #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>
@@ -22,6 +25,8 @@
 #include <onchaind/onchaind_wiregen.h>
 #include <string.h>
 #include <wallet/db_common.h>
+#include <wallet/txfilter.h>
+#include <wally_bip32.h>
 
 #define SQLITE_MAX_UINT 0x7FFFFFFFFFFFFFFF
 #define DIRECTION_INCOMING 0

wallet/wallet.h

@@ -3,25 +3,12 @@
 
 #include "config.h"
 #include "db.h"
-#include <bitcoin/chainparams.h>
-#include <bitcoin/tx.h>
-#include <ccan/build_assert/build_assert.h>
-#include <ccan/crypto/shachain/shachain.h>
-#include <ccan/list/list.h>
-#include <ccan/tal/tal.h>
-#include <common/channel_config.h>
 #include <common/penalty_base.h>
 #include <common/utxo.h>
 #include <common/wallet.h>
 #include <lightningd/bitcoind.h>
-#include <lightningd/chaintopology.h>
-#include <lightningd/htlc_end.h>
-#include <lightningd/invoice.h>
 #include <lightningd/log.h>
 #include <lightningd/peer_htlcs.h>
-#include <onchaind/onchaind_wire.h>
-#include <wally_bip32.h>
-#include <wire/onion_wire.h>
 
 struct amount_msat;
 struct invoices;

wallet/walletrpc.c

@@ -6,13 +6,16 @@
 #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>
@@ -20,6 +23,7 @@
 #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>
@@ -28,9 +32,11 @@
 #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>
 
 /* May return NULL if encoding error occurs. */