check: make sure all files outside contrib/ include "config.h" first.

And turn "" includes into full-path (which makes it easier to put
config.h first, and finds some cases check-includes.sh missed
previously).

config.h sets _GNU_SOURCE which really needs to be done before any
'#includes': we mainly got away with it with glibc, but other platforms
like Alpine may have stricter requirements.

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

bitcoin/base58.c

@@ -3,11 +3,12 @@
 // Copyright (c) 2009-2012 The Bitcoin Developers
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
-#include "address.h"
-#include "base58.h"
-#include "privkey.h"
-#include "pubkey.h"
-#include "shadouble.h"
+#include "config.h"
+#include <bitcoin/address.h>
+#include <bitcoin/base58.h>
+#include <bitcoin/privkey.h>
+#include <bitcoin/pubkey.h>
+#include <bitcoin/shadouble.h>
 #include <common/utils.h>
 #include <wally_core.h>
 

bitcoin/chainparams.c

@@ -1,4 +1,5 @@
-#include "chainparams.h"
+#include "config.h"
+#include <bitcoin/chainparams.h>
 #include <ccan/array_size/array_size.h>
 #include <ccan/tal/str/str.h>
 #include <common/utils.h>

bitcoin/feerate.c

@@ -1,3 +1,4 @@
+#include "config.h"
 #include <bitcoin/feerate.h>
 
 u32 feerate_from_style(u32 feerate, enum feerate_style style)

bitcoin/preimage.c

@@ -1,3 +1,4 @@
+#include "config.h"
 #include <bitcoin/preimage.h>
 #include <wire/wire.h>
 

bitcoin/privkey.c

@@ -1,4 +1,5 @@
-#include "privkey.h"
+#include "config.h"
+#include <bitcoin/privkey.h>
 #include <ccan/str/hex/hex.h>
 #include <common/type_to_string.h>
 #include <wire/wire.h>

bitcoin/pubkey.c

@@ -1,6 +1,7 @@
-#include "privkey.h"
-#include "pubkey.h"
+#include "config.h"
 #include <assert.h>
+#include <bitcoin/privkey.h>
+#include <bitcoin/pubkey.h>
 #include <ccan/mem/mem.h>
 #include <ccan/str/hex/hex.h>
 #include <common/type_to_string.h>

bitcoin/script.c

@@ -1,9 +1,10 @@
-#include "address.h"
-#include "locktime.h"
-#include "preimage.h"
-#include "pubkey.h"
-#include "script.h"
+#include "config.h"
 #include <assert.h>
+#include <bitcoin/address.h>
+#include <bitcoin/locktime.h>
+#include <bitcoin/preimage.h>
+#include <bitcoin/pubkey.h>
+#include <bitcoin/script.h>
 #include <ccan/endian/endian.h>
 #include <ccan/mem/mem.h>
 #include <common/utils.h>

bitcoin/shadouble.c

@@ -1,4 +1,5 @@
-#include "shadouble.h"
+#include "config.h"
+#include <bitcoin/shadouble.h>
 #include <ccan/mem/mem.h>
 #include <common/type_to_string.h>
 #include <wire/wire.h>

bitcoin/short_channel_id.c

@@ -1,3 +1,4 @@
+#include "config.h"
 #include <bitcoin/short_channel_id.h>
 #include <ccan/tal/str/str.h>
 #include <common/type_to_string.h>

bitcoin/signature.c

@@ -1,11 +1,12 @@
-#include "privkey.h"
-#include "pubkey.h"
-#include "script.h"
-#include "shadouble.h"
-#include "signature.h"
-#include "tx.h"
+#include "config.h"
 #include <assert.h>
+#include <bitcoin/privkey.h>
 #include <bitcoin/psbt.h>
+#include <bitcoin/pubkey.h>
+#include <bitcoin/script.h>
+#include <bitcoin/shadouble.h>
+#include <bitcoin/signature.h>
+#include <bitcoin/tx.h>
 #include <ccan/mem/mem.h>
 #include <common/type_to_string.h>
 #include <wire/wire.h>

bitcoin/test/run-bitcoin_block_from_hex.c

@@ -1,3 +1,4 @@
+#include "config.h"
 #include "../block.c"
 #include "../psbt.c"
 #include "../shadouble.c"

bitcoin/varint.c

@@ -1,4 +1,5 @@
-#include "varint.h"
+#include "config.h"
+#include <bitcoin/varint.h>
 
 size_t varint_size(varint_t v)
 {

ccan_compat.h

@@ -1,7 +1,12 @@
 #ifndef LIGHTNING_CCAN_COMPAT_H
 #define LIGHTNING_CCAN_COMPAT_H
+
 /* Magical file included from config.h (ie. everywhere) which renames
  * sha256 routines so they don't clash with libwally-core's internal ones */
+
+/* So, for obvious reasons, this is an exception to the usual rule that we
+#include "config.h"
+ * in all files. */
 #define sha256(sha, p, size) ccan_sha256(sha, p, size)
 #define sha256_init(ctx) ccan_sha256_init(ctx)
 #define sha256_update(ctx, p, size) ccan_sha256_update(ctx, p, size)

channeld/channeld.c

@@ -10,6 +10,7 @@
  *    reading and writing synchronously we could deadlock if we hit buffer
  *    limits, unlikely as that is.
  */
+#include "config.h"
 #include <ccan/asort/asort.h>
 #include <ccan/cast/cast.h>
 #include <ccan/mem/mem.h>

channeld/commit_tx.c

@@ -1,3 +1,4 @@
+#include "config.h"
 #include <bitcoin/script.h>
 #include <channeld/commit_tx.h>
 #include <common/htlc_trim.h>

channeld/test/run-commit_tx.c

@@ -1,3 +1,4 @@
+#include "config.h"
 #include <inttypes.h>
 #include <stdio.h>
 #include <common/type_to_string.h>

channeld/test/run-full_channel.c

@@ -1,3 +1,4 @@
+#include "config.h"
 #include "../../common/blockheight_states.c"
 #include "../../common/channel_id.c"
 #include "../../common/fee_states.c"

channeld/watchtower.c

@@ -1,7 +1,7 @@
-#include "watchtower.h"
-
+#include "config.h"
 #include <bitcoin/feerate.h>
 #include <bitcoin/script.h>
+#include <channeld/watchtower.h>
 #include <common/features.h>
 #include <common/htlc_tx.h>
 #include <common/keyset.h>

closingd/closingd.c

@@ -1,3 +1,4 @@
+#include "config.h"
 #include <bitcoin/script.h>
 #include <ccan/cast/cast.h>
 #include <ccan/fdpass/fdpass.h>

common/addr.c

@@ -1,7 +1,8 @@
-#include "addr.h"
+#include "config.h"
 #include <bitcoin/address.h>
 #include <bitcoin/base58.h>
 #include <bitcoin/script.h>
+#include <common/addr.h>
 #include <common/bech32.h>
 
 char *encode_scriptpubkey_to_addr(const tal_t *ctx,

common/base32.c

@@ -1,3 +1,4 @@
+#include "config.h"
 #include <ccan/str/base32/base32.h>
 #include <common/base32.h>
 

common/bech32.c

@@ -21,9 +21,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#include "bech32.h"
-
+#include "config.h"
 #include <assert.h>
+#include <common/bech32.h>
 #include <string.h>
 
 static uint32_t bech32_polymod_step(uint32_t pre) {

common/bech32_util.c

@@ -1,6 +1,7 @@
-#include "bech32_util.h"
+#include "config.h"
 #include <ccan/tal/str/str.h>
 #include <common/bech32.h>
+#include <common/bech32_util.h>
 
 static u8 get_bit(const u8 *src, size_t bitoff)
 {

common/billboard.c

@@ -1,5 +1,6 @@
-#include "billboard.h"
+#include "config.h"
 #include <ccan/ccan/tal/str/str.h>
+#include <common/billboard.h>
 #include <common/utils.h>
 
 char *billboard_message(const tal_t *ctx,

common/bip32.c

@@ -1,3 +1,4 @@
+#include "config.h"
 #include <common/bip32.h>
 #include <wally_bip32.h>
 #include <wire/wire.h>

common/blindedpath.c

@@ -1,3 +1,4 @@
+#include "config.h"
 #include <ccan/cast/cast.h>
 #include <common/blindedpath.h>
 #include <common/blinding.h>

common/blinding.c

@@ -1,3 +1,4 @@
+#include "config.h"
 #include <bitcoin/privkey.h>
 #include <bitcoin/pubkey.h>
 #include <common/blinding.h>

common/blockheight_states.c

@@ -1,3 +1,4 @@
+#include "config.h"
 #include <ccan/array_size/array_size.h>
 #include <ccan/cast/cast.h>
 #include <ccan/tal/str/str.h>

common/bolt11.c

@@ -1,3 +1,4 @@
+#include "config.h"
 #include <bitcoin/address.h>
 #include <bitcoin/script.h>
 #include <ccan/array_size/array_size.h>

common/bolt11_json.c

@@ -1,3 +1,4 @@
+#include "config.h"
 #include <bitcoin/address.h>
 #include <bitcoin/base58.h>
 #include <bitcoin/script.h>

common/bolt12.c

@@ -1,3 +1,4 @@
+#include "config.h"
 #include <bitcoin/chainparams.h>
 #include <ccan/tal/str/str.h>
 #include <common/bech32_util.h>

common/bolt12_merkle.c

@@ -1,3 +1,4 @@
+#include "config.h"
 #include <ccan/cast/cast.h>
 #include <ccan/ilog/ilog.h>
 #include <ccan/mem/mem.h>

common/channel_config.c

@@ -1,3 +1,4 @@
+#include "config.h"
 #include <common/channel_config.h>
 #include <wire/wire.h>
 

common/channel_id.c

@@ -1,3 +1,4 @@
+#include "config.h"
 #include <bitcoin/pubkey.h>
 #include <bitcoin/tx.h>
 #include <common/channel_id.h>

common/channel_type.c

@@ -1,3 +1,4 @@
+#include "config.h"
 #include <ccan/array_size/array_size.h>
 #include <common/channel_type.h>
 

common/close_tx.c

@@ -1,8 +1,8 @@
-#include "bitcoin/script.h"
-#include "bitcoin/tx.h"
-#include "close_tx.h"
-#include "permute_tx.h"
+#include "config.h"
 #include <assert.h>
+#include <bitcoin/script.h>
+#include <common/close_tx.h>
+#include <common/permute_tx.h>
 #include <common/utils.h>
 
 struct bitcoin_tx *create_close_tx(const tal_t *ctx,

common/configdir.c

@@ -1,4 +1,4 @@
-#include "configdir.h"
+#include "config.h"
 #include <assert.h>
 #include <bitcoin/chainparams.h>
 #include <ccan/cast/cast.h>
@@ -7,6 +7,7 @@
 #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/utils.h>
 #include <common/version.h>
 

common/crypto_state.c

@@ -1,3 +1,4 @@
+#include "config.h"
 #include <common/crypto_state.h>
 #include <wire/wire.h>
 

common/crypto_sync.c

@@ -1,3 +1,4 @@
+#include "config.h"
 #include <ccan/read_write_all/read_write_all.h>
 #include <common/crypto_sync.h>
 #include <common/cryptomsg.h>

common/daemon_conn.c

@@ -1,3 +1,4 @@
+#include "config.h"
 #include <ccan/fdpass/fdpass.h>
 #include <ccan/io/fdpass/fdpass.h>
 #include <common/daemon_conn.h>

common/decode_array.c

@@ -1,3 +1,4 @@
+#include "config.h"
 #include <ccan/cast/cast.h>
 #include <common/decode_array.h>
 #include <wire/peer_wire.h>

common/derive_basepoints.c

@@ -1,3 +1,4 @@
+#include "config.h"
 #include <ccan/crypto/hkdf_sha256/hkdf_sha256.h>
 #include <common/derive_basepoints.h>
 #include <common/utils.h>

common/descriptor_checksum.c

@@ -1,3 +1,4 @@
+#include "config.h"
 #include <ccan/short_types/short_types.h>
 #include <common/descriptor_checksum.h>
 #include <stdlib.h>

common/dijkstra.c

@@ -1,5 +1,6 @@
 /* Without this, gheap is *really* slow!  Comment out for debugging. */
 #define NDEBUG
+#include "config.h"
 #include <ccan/cast/cast.h>
 #include <common/dijkstra.h>
 #include <common/gossmap.h>

common/ecdh_hsmd.c

@@ -1,3 +1,4 @@
+#include "config.h"
 #include <common/ecdh_hsmd.h>
 #include <hsmd/hsmd_wiregen.h>
 #include <wire/wire_sync.h>

common/features.c

@@ -1,7 +1,8 @@
-#include "features.h"
+#include "config.h"
 #include <assert.h>
 #include <ccan/array_size/array_size.h>
 #include <ccan/tal/str/str.h>
+#include <common/features.h>
 #include <wire/peer_wire.h>
 
 enum feature_copy_style {

common/fee_states.c

@@ -1,3 +1,4 @@
+#include "config.h"
 #include <ccan/array_size/array_size.h>
 #include <ccan/cast/cast.h>
 #include <ccan/tal/str/str.h>

common/gossip_rcvd_filter.c

@@ -1,3 +1,4 @@
+#include "config.h"
 #include <ccan/crypto/siphash24/siphash24.h>
 #include <ccan/htable/htable.h>
 #include <common/gossip_rcvd_filter.h>

common/hash_u5.c

@@ -1,3 +1,4 @@
+#include "config.h"
 #include <ccan/endian/endian.h>
 #include <common/hash_u5.h>
 #include <string.h>

common/hmac.c

@@ -1,3 +1,4 @@
+#include "config.h"
 #include <bitcoin/privkey.h>
 #include <ccan/array_size/array_size.h>
 #include <ccan/mem/mem.h>

common/hsm_encryption.c

@@ -1,3 +1,4 @@
+#include "config.h"
 #include <common/hsm_encryption.h>
 #include <termios.h>
 #include <unistd.h>

common/htlc_state.c

@@ -1,3 +1,4 @@
+#include "config.h"
 #include <ccan/array_size/array_size.h>
 #include <common/htlc.h>
   #include "htlc_state_names_gen.h"

common/htlc_trim.c

@@ -1,3 +1,4 @@
+#include "config.h"
 #include <common/htlc_trim.h>
 #include <common/htlc_tx.h>
 

common/htlc_tx.c

@@ -1,3 +1,4 @@
+#include "config.h"
 #include <bitcoin/preimage.h>
 #include <bitcoin/script.h>
 #include <common/htlc_tx.h>

common/htlc_wire.c

@@ -1,3 +1,4 @@
+#include "config.h"
 #include <ccan/array_size/array_size.h>
 #include <ccan/cast/cast.h>
 #include <ccan/crypto/shachain/shachain.h>

common/initial_commit_tx.c

@@ -1,3 +1,4 @@
+#include "config.h"
 #include <bitcoin/script.h>
 #include <ccan/array_size/array_size.h>
 #include <common/initial_commit_tx.h>

common/io_lock.c

@@ -1,6 +1,7 @@
-#include "io_lock.h"
+#include "config.h"
 #include <assert.h>
 #include <ccan/io/io_plan.h>
+#include <common/io_lock.h>
 
 struct io_lock {
 	bool locked;