diff --git a/bitcoin/address.c b/bitcoin/address.c
index a5aad53bd..eeb9c7b30 100644
--- a/bitcoin/address.c
+++ b/bitcoin/address.c
@@ -1,6 +1,6 @@
-#include <ccan/crypto/sha256/sha256.h>
 #include "address.h"
 #include "pubkey.h"
+#include <ccan/crypto/sha256/sha256.h>
 
 void bitcoin_address(const struct pubkey *key, struct bitcoin_address *addr)
 {
diff --git a/bitcoin/base58.c b/bitcoin/base58.c
index 6c29a4d03..eee46a491 100644
--- a/bitcoin/base58.c
+++ b/bitcoin/base58.c
@@ -3,17 +3,17 @@
 // 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 <ccan/build_assert/build_assert.h>
-#include <ccan/tal/str/str.h>
-#include <openssl/bn.h>
-#include <assert.h>
-#include <secp256k1.h>
-#include <string.h>
 #include "address.h"
 #include "base58.h"
 #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 <openssl/bn.h>
+#include <secp256k1.h>
+#include <string.h>
 
 static const char enc_16[] = "0123456789abcdef";
 static const char enc_58[] =
diff --git a/bitcoin/pubkey.c b/bitcoin/pubkey.c
index f922b8707..b93a1304a 100644
--- a/bitcoin/pubkey.c
+++ b/bitcoin/pubkey.c
@@ -1,7 +1,7 @@
-#include <ccan/str/hex/hex.h>
-#include <assert.h>
-#include "pubkey.h"
 #include "privkey.h"
+#include "pubkey.h"
+#include <assert.h>
+#include <ccan/str/hex/hex.h>
 
 /* Must agree on key validity with bitcoin!  Stolen from bitcoin/src/pubkey.h's
  * GetLen:
diff --git a/bitcoin/script.c b/bitcoin/script.c
index fd5df82d1..e186a4635 100644
--- a/bitcoin/script.c
+++ b/bitcoin/script.c
@@ -1,12 +1,12 @@
-#include <ccan/crypto/ripemd160/ripemd160.h>
-#include <ccan/crypto/sha256/sha256.h>
-#include <ccan/endian/endian.h>
-#include <assert.h>
 #include "address.h"
 #include "locktime.h"
 #include "pubkey.h"
 #include "script.h"
 #include "signature.h"
+#include <assert.h>
+#include <ccan/crypto/ripemd160/ripemd160.h>
+#include <ccan/crypto/sha256/sha256.h>
+#include <ccan/endian/endian.h>
 
 /* Some standard ops */
 #define OP_PUSHBYTES(val) (val)
diff --git a/bitcoin/signature.c b/bitcoin/signature.c
index abde8369b..28181a639 100644
--- a/bitcoin/signature.c
+++ b/bitcoin/signature.c
@@ -1,20 +1,20 @@
-#include <ccan/cast/cast.h>
 #include "privkey.h"
 #include "pubkey.h"
 #include "script.h"
 #include "secp256k1.h"
+#ifdef USE_SCHNORR
+#include "secp256k1_schnorr.h"
+#endif
 #include "shadouble.h"
 #include "signature.h"
 #include "tx.h"
 #include <assert.h>
-#ifdef USE_SCHNORR
-#include "secp256k1_schnorr.h"
-#endif
+#include <ccan/cast/cast.h>
 
 #undef DEBUG
 #ifdef DEBUG
-#include <ccan/err/err.h>
-#include <stdio.h>
+# include <ccan/err/err.h>
+# include <stdio.h>
 #define SHA_FMT					   \
 	"%02x%02x%02x%02x%02x%02x%02x%02x"	   \
 	"%02x%02x%02x%02x%02x%02x%02x%02x"	   \
diff --git a/bitcoin/tx.c b/bitcoin/tx.c
index d352abcb3..0ef595490 100644
--- a/bitcoin/tx.c
+++ b/bitcoin/tx.c
@@ -1,3 +1,5 @@
+#include "tx.h"
+#include <assert.h>
 #include <ccan/crypto/sha256/sha256.h>
 #include <ccan/endian/endian.h>
 #include <ccan/err/err.h>
@@ -5,8 +7,6 @@
 #include <ccan/read_write_all/read_write_all.h>
 #include <ccan/str/hex/hex.h>
 #include <ccan/tal/grab_file/grab_file.h>
-#include <assert.h>
-#include "tx.h"
 
 enum styles {
 	/* Add the CT padding stuff to amount. */
diff --git a/find_p2sh_out.c b/find_p2sh_out.c
index acc1ad2d5..8fe9db223 100644
--- a/find_p2sh_out.c
+++ b/find_p2sh_out.c
@@ -1,9 +1,9 @@
-#include <ccan/err/err.h>
-#include <ccan/tal/tal.h>
-#include <string.h>
 #include "bitcoin/script.h"
 #include "bitcoin/tx.h"
 #include "find_p2sh_out.h"
+#include <ccan/err/err.h>
+#include <ccan/tal/tal.h>
+#include <string.h>
 
 u32 find_p2sh_out(const struct bitcoin_tx *tx, u8 *redeemscript)
 {
diff --git a/permute_tx.c b/permute_tx.c
index 7c521a2c0..85293e959 100644
--- a/permute_tx.c
+++ b/permute_tx.c
@@ -1,6 +1,6 @@
+#include "permute_tx.h"
 #include <stdbool.h>
 #include <string.h>
-#include "permute_tx.h"
 
 static void init_map(size_t *map, size_t len)
 {
diff --git a/pkt.c b/pkt.c
index 234687bf8..0814baa66 100644
--- a/pkt.c
+++ b/pkt.c
@@ -1,12 +1,12 @@
-#include <ccan/crypto/sha256/sha256.h>
-#include <ccan/err/err.h>
-#include <ccan/tal/grab_file/grab_file.h>
 #include "bitcoin/address.h"
 #include "bitcoin/pubkey.h"
 #include "bitcoin/signature.h"
 #include "bitcoin/tx.h"
 #include "pkt.h"
 #include "protobuf_convert.h"
+#include <ccan/crypto/sha256/sha256.h>
+#include <ccan/err/err.h>
+#include <ccan/tal/grab_file/grab_file.h>
 
 size_t pkt_totlen(const struct pkt *pkt)
 {
diff --git a/protobuf_convert.c b/protobuf_convert.c
index 55850b974..53aaa48c7 100644
--- a/protobuf_convert.c
+++ b/protobuf_convert.c
@@ -1,8 +1,8 @@
-#include <ccan/crypto/sha256/sha256.h>
 #include "bitcoin/locktime.h"
 #include "bitcoin/pubkey.h"
 #include "bitcoin/signature.h"
 #include "protobuf_convert.h"
+#include <ccan/crypto/sha256/sha256.h>
 
 Signature *signature_to_proto(const tal_t *ctx, const struct signature *sig)
 {
diff --git a/version.c b/version.c
index 1cf14090c..848f04a66 100644
--- a/version.c
+++ b/version.c
@@ -1,5 +1,5 @@
-#include "version.h"
 #include "gen_version.h"
+#include "version.h"
 #include <stdio.h>
 
 char *version_and_exit(const void *unused)