global: remove unnecessary includes from headers.

Each header should only include the other headers it needs to compile;
`devtools/reduce-includes.sh */*.h` does this.  The C files then need
additional includes if they don't compile.

And remove the entirely useless wire/onion_wire.h, which only serves to include wire/onion_wiregen.h.

Signed-off-by: Rusty Russell <[email protected]>

Author: rustyrussell

bitcoin/block.h

@@ -4,7 +4,6 @@
 #include "bitcoin/shadouble.h"
 #include <ccan/endian/endian.h>
 #include <ccan/structeq/structeq.h>
-#include <ccan/tal/tal.h>
 
 struct chainparams;
 

bitcoin/feerate.h

@@ -2,7 +2,6 @@
 #define LIGHTNING_BITCOIN_FEERATE_H
 #include "config.h"
 #include <ccan/build_assert/build_assert.h>
-#include <ccan/short_types/short_types.h>
 #include <common/amount.h>
 
 /* bitcoind considers 250 satoshi per kw to be the minimum acceptable fee:

bitcoin/privkey.h

@@ -2,7 +2,6 @@
 #define LIGHTNING_BITCOIN_PRIVKEY_H
 #include "config.h"
 #include <ccan/short_types/short_types.h>
-#include <ccan/structeq/structeq.h>
 #include <ccan/tal/tal.h>
 
 #define PRIVKEY_LEN 32

bitcoin/script.c

@@ -9,6 +9,7 @@
 #include <ccan/mem/mem.h>
 #include <common/utils.h>
 #include <sodium/randombytes.h>
+#include <wally_script.h>
 
 /* To push 0-75 bytes onto stack. */
 #define OP_PUSHBYTES(val) (val)

bitcoin/script.h

@@ -3,7 +3,6 @@
 #include "config.h"
 #include "signature.h"
 #include "tx.h"
-#include <wally_script.h>
 
 struct bitcoin_address;
 struct preimage;

bitcoin/short_channel_id.h

@@ -1,7 +1,6 @@
 #ifndef LIGHTNING_BITCOIN_SHORT_CHANNEL_ID_H
 #define LIGHTNING_BITCOIN_SHORT_CHANNEL_ID_H
 #include "config.h"
-#include <ccan/compiler/compiler.h>
 #include <ccan/short_types/short_types.h>
 #include <ccan/tal/tal.h>
 #include <common/gossip_constants.h>

bitcoin/tx.h

@@ -2,11 +2,7 @@
 #define LIGHTNING_BITCOIN_TX_H
 #include "config.h"
 #include <bitcoin/chainparams.h>
-#include <bitcoin/shadouble.h>
-#include <bitcoin/signature.h>
 #include <bitcoin/varint.h>
-#include <ccan/structeq/structeq.h>
-#include <common/amount.h>
 #include <wally_transaction.h>
 
 #define BITCOIN_TX_DEFAULT_SEQUENCE 0xFFFFFFFF

channeld/channeld.c

@@ -42,10 +42,12 @@
 #include <common/status.h>
 #include <common/subdaemon.h>
 #include <common/timeout.h>
+#include <common/utils.h>
 #include <common/wire_error.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <hsmd/hsmd_wiregen.h>
+#include <inttypes.h>
 #include <stdio.h>
 #include <wally_bip32.h>
 #include <wire/peer_wire.h>

channeld/channeld.h

@@ -2,7 +2,6 @@
 #define LIGHTNING_CHANNELD_CHANNELD_H
 #include "config.h"
 #include <ccan/short_types/short_types.h>
-#include <ccan/take/take.h>
 #include <ccan/tal/tal.h>
 
 const u8 *hsm_req(const tal_t *ctx, const u8 *req TAKES);

channeld/channeld_htlc.h

@@ -1,11 +1,8 @@
 #ifndef LIGHTNING_CHANNELD_CHANNELD_HTLC_H
 #define LIGHTNING_CHANNELD_CHANNELD_HTLC_H
 #include "config.h"
-#include <ccan/crypto/siphash24/siphash24.h>
 #include <common/htlc.h>
 #include <common/pseudorand.h>
-#include <wire/onion_wire.h>
-#include <wire/tlvstream.h>
 
 struct htlc {
 	/* What's the status. */