diff --git a/bitcoin/base58.c b/bitcoin/base58.c
index cd00fb011..e2e2ab31a 100644
--- a/bitcoin/base58.c
+++ b/bitcoin/base58.c
@@ -13,7 +13,6 @@
 #include <ccan/tal/str/str.h>
 #include <common/utils.h>
 #include <libbase58.h>
-#include <secp256k1.h>
 #include <string.h>
 
 static bool my_sha256(void *digest, const void *data, size_t datasz)
diff --git a/bitcoin/pullpush.c b/bitcoin/pullpush.c
index 23722aa88..7c8629cc6 100644
--- a/bitcoin/pullpush.c
+++ b/bitcoin/pullpush.c
@@ -3,7 +3,6 @@
 #include <assert.h>
 #include <ccan/endian/endian.h>
 #include <ccan/mem/mem.h>
-#include <ccan/tal/tal.h>
 
 void push_varint(varint_t v,
 		 void (*push)(const void *, size_t, void *), void *pushp)
diff --git a/bitcoin/script.c b/bitcoin/script.c
index 8295cfe0c..e1fedfa0d 100644
--- a/bitcoin/script.c
+++ b/bitcoin/script.c
@@ -3,8 +3,6 @@
 #include "preimage.h"
 #include "pubkey.h"
 #include "script.h"
-#include "signature.h"
-#include "tx.h"
 #include <assert.h>
 #include <ccan/crypto/ripemd160/ripemd160.h>
 #include <ccan/crypto/sha256/sha256.h>
diff --git a/cli/test/run-large-input.c b/cli/test/run-large-input.c
index 7e6fd9b20..2c1f06107 100644
--- a/cli/test/run-large-input.c
+++ b/cli/test/run-large-input.c
@@ -3,7 +3,6 @@
 #include <sys/socket.h>
 #include <sys/stat.h>
 #include <sys/types.h>
-#include <sys/types.h>
 #include <unistd.h>
 
 int test_main(int argc, char *argv[]);
diff --git a/common/bech32.c b/common/bech32.c
index 0c4f115bb..d689b1fb9 100644
--- a/common/bech32.c
+++ b/common/bech32.c
@@ -23,8 +23,6 @@
  */
 #include "bech32.h"
 
-#include <stdint.h>
-#include <stdlib.h>
 #include <string.h>
 
 static uint32_t bech32_polymod_step(uint32_t pre) {
diff --git a/common/bolt11.c b/common/bolt11.c
index 845667efe..bd372468c 100644
--- a/common/bolt11.c
+++ b/common/bolt11.c
@@ -17,7 +17,6 @@
 #include <lightningd/jsonrpc.h>
 #include <lightningd/lightningd.h>
 #include <lightningd/log.h>
-#include <secp256k1_recovery.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <wire/wire.h>
diff --git a/common/cryptomsg.c b/common/cryptomsg.c
index 7ab9b58db..cb2669727 100644
--- a/common/cryptomsg.c
+++ b/common/cryptomsg.c
@@ -4,7 +4,6 @@
 #include <ccan/crypto/sha256/sha256.h>
 #include <ccan/endian/endian.h>
 #include <ccan/mem/mem.h>
-#include <ccan/short_types/short_types.h>
 #include <ccan/take/take.h>
 #include <common/cryptomsg.h>
 #include <common/dev_disconnect.h>
diff --git a/common/derive_basepoints.c b/common/derive_basepoints.c
index 0414c2fee..1c4404909 100644
--- a/common/derive_basepoints.c
+++ b/common/derive_basepoints.c
@@ -1,6 +1,5 @@
 #include <ccan/crypto/hkdf_sha256/hkdf_sha256.h>
 #include <ccan/crypto/sha256/sha256.h>
-#include <ccan/crypto/shachain/shachain.h>
 #include <common/derive_basepoints.h>
 #include <common/utils.h>
 
diff --git a/common/json.c b/common/json.c
index 5f36499dd..70120b6e2 100644
--- a/common/json.c
+++ b/common/json.c
@@ -4,7 +4,6 @@
 #include <ccan/build_assert/build_assert.h>
 #include <ccan/str/hex/hex.h>
 #include <ccan/tal/str/str.h>
-#include <ccan/tal/tal.h>
 #include <errno.h>
 #include <inttypes.h>
 #include <stdarg.h>
diff --git a/common/memleak.c b/common/memleak.c
index ac3eec359..b07f38a03 100644
--- a/common/memleak.c
+++ b/common/memleak.c
@@ -2,7 +2,6 @@
 #include <backtrace.h>
 #include <ccan/crypto/siphash24/siphash24.h>
 #include <ccan/htable/htable.h>
-#include <ccan/tal/tal.h>
 #include <common/memleak.h>
 
 #if DEVELOPER
diff --git a/common/sphinx.c b/common/sphinx.c
index 2571b6874..a637f1120 100644
--- a/common/sphinx.c
+++ b/common/sphinx.c
@@ -12,7 +12,6 @@
 
 #include <sodium/crypto_auth_hmacsha256.h>
 #include <sodium/crypto_stream_chacha20.h>
-#include <wire/wire.h>
 
 #define BLINDING_FACTOR_SIZE 32
 #define SHARED_SECRET_SIZE 32
diff --git a/common/status.c b/common/status.c
index 39d2eeca2..e061ea102 100644
--- a/common/status.c
+++ b/common/status.c
@@ -4,7 +4,6 @@
 #include <ccan/err/err.h>
 #include <ccan/fdpass/fdpass.h>
 #include <ccan/read_write_all/read_write_all.h>
-#include <ccan/take/take.h>
 #include <ccan/tal/str/str.h>
 #include <common/daemon_conn.h>
 #include <common/gen_status_wire.h>
@@ -12,7 +11,6 @@
 #include <common/utils.h>
 #include <errno.h>
 #include <signal.h>
-#include <stdarg.h>
 #include <wire/peer_wire.h>
 #include <wire/wire_sync.h>
 
diff --git a/gossipd/routing.c b/gossipd/routing.c
index 1ec980fd1..0d84c3e32 100644
--- a/gossipd/routing.c
+++ b/gossipd/routing.c
@@ -13,7 +13,6 @@
 #include <common/wire_error.h>
 #include <common/wireaddr.h>
 #include <inttypes.h>
-#include <wire/gen_onion_wire.h>
 #include <wire/gen_peer_wire.h>
 
 #ifndef SUPERVERBOSE
diff --git a/lightningd/bitcoind.c b/lightningd/bitcoind.c
index 875b3657f..611c2c212 100644
--- a/lightningd/bitcoind.c
+++ b/lightningd/bitcoind.c
@@ -13,7 +13,6 @@
 #include <ccan/tal/grab_file/grab_file.h>
 #include <ccan/tal/path/path.h>
 #include <ccan/tal/str/str.h>
-#include <ccan/tal/tal.h>
 #include <common/json.h>
 #include <common/memleak.h>
 #include <common/timeout.h>
diff --git a/lightningd/build_utxos.c b/lightningd/build_utxos.c
index 93557dc2a..e52d56943 100644
--- a/lightningd/build_utxos.c
+++ b/lightningd/build_utxos.c
@@ -4,7 +4,6 @@
 #include <common/utils.h>
 #include <lightningd/build_utxos.h>
 #include <lightningd/jsonrpc.h>
-#include <lightningd/lightningd.h>
 #include <wally_bip32.h>
 
 
diff --git a/lightningd/chaintopology.c b/lightningd/chaintopology.c
index 4b8be5b72..114fb2a25 100644
--- a/lightningd/chaintopology.c
+++ b/lightningd/chaintopology.c
@@ -11,7 +11,6 @@
 #include <ccan/asort/asort.h>
 #include <ccan/build_assert/build_assert.h>
 #include <ccan/io/io.h>
-#include <ccan/structeq/structeq.h>
 #include <ccan/tal/str/str.h>
 #include <common/memleak.h>
 #include <common/timeout.h>
diff --git a/lightningd/jsonrpc.c b/lightningd/jsonrpc.c
index d13ab708c..591f0fb1d 100644
--- a/lightningd/jsonrpc.c
+++ b/lightningd/jsonrpc.c
@@ -10,7 +10,6 @@
 #include <ccan/str/hex/hex.h>
 #include <ccan/tal/str/str.h>
 #include <common/bech32.h>
-#include <common/json.h>
 #include <common/memleak.h>
 #include <common/version.h>
 #include <common/wireaddr.h>
diff --git a/lightningd/lightningd.c b/lightningd/lightningd.c
index 26eb97e47..831061d3f 100644
--- a/lightningd/lightningd.c
+++ b/lightningd/lightningd.c
@@ -23,7 +23,6 @@
 #include <common/timeout.h>
 #include <common/utils.h>
 #include <common/version.h>
-#include <common/wireaddr.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <lightningd/bitcoind.h>
diff --git a/lightningd/log.c b/lightningd/log.c
index 75aeb4d1e..a8371651e 100644
--- a/lightningd/log.c
+++ b/lightningd/log.c
@@ -7,7 +7,6 @@
 #include <ccan/str/hex/hex.h>
 #include <ccan/tal/link/link.h>
 #include <ccan/tal/str/str.h>
-#include <ccan/time/time.h>
 #include <common/memleak.h>
 #include <common/pseudorand.h>
 #include <common/utils.h>
diff --git a/lightningd/pay.c b/lightningd/pay.c
index a8680c2ff..fcb92b2c7 100644
--- a/lightningd/pay.c
+++ b/lightningd/pay.c
@@ -1,5 +1,4 @@
 #include "pay.h"
-#include <bitcoin/preimage.h>
 #include <ccan/str/hex/hex.h>
 #include <ccan/structeq/structeq.h>
 #include <ccan/tal/str/str.h>
diff --git a/lightningd/peer_control.c b/lightningd/peer_control.c
index 5826d77d3..41aba8d45 100644
--- a/lightningd/peer_control.c
+++ b/lightningd/peer_control.c
@@ -42,7 +42,6 @@
 #include <unistd.h>
 #include <wally_bip32.h>
 #include <wire/gen_onion_wire.h>
-#include <wire/peer_wire.h>
 
 static void destroy_peer(struct peer *peer)
 {
diff --git a/lightningd/peer_htlcs.c b/lightningd/peer_htlcs.c
index 010ca133b..2cea4f153 100644
--- a/lightningd/peer_htlcs.c
+++ b/lightningd/peer_htlcs.c
@@ -4,8 +4,6 @@
 #include <ccan/mem/mem.h>
 #include <ccan/tal/str/str.h>
 #include <channeld/gen_channel_wire.h>
-#include <common/derive_basepoints.h>
-#include <common/htlc_wire.h>
 #include <common/overflows.h>
 #include <common/sphinx.h>
 #include <gossipd/gen_gossip_wire.h>
diff --git a/lightningd/watch.c b/lightningd/watch.c
index 73a2dc164..1b642c856 100644
--- a/lightningd/watch.c
+++ b/lightningd/watch.c
@@ -27,7 +27,6 @@
  * WE ASSUME NO MALLEABILITY!  This requires segregated witness.
  */
 #include <bitcoin/script.h>
-#include <bitcoin/tx.h>
 #include <ccan/crypto/siphash24/siphash24.h>
 #include <ccan/ptrint/ptrint.h>
 #include <ccan/structeq/structeq.h>
diff --git a/wallet/db.c b/wallet/db.c
index 577076eec..f8879b137 100644
--- a/wallet/db.c
+++ b/wallet/db.c
@@ -1,7 +1,6 @@
 #include "db.h"
 
 #include <ccan/tal/str/str.h>
-#include <ccan/tal/tal.h>
 #include <common/version.h>
 #include <inttypes.h>
 #include <lightningd/lightningd.h>
diff --git a/wallet/wallet.c b/wallet/wallet.c
index d19bc18bc..a2489aab4 100644
--- a/wallet/wallet.c
+++ b/wallet/wallet.c
@@ -7,7 +7,6 @@
 #include <common/key_derive.h>
 #include <common/wireaddr.h>
 #include <inttypes.h>
-#include <lightningd/invoice.h>
 #include <lightningd/lightningd.h>
 #include <lightningd/log.h>
 #include <lightningd/peer_control.h>
diff --git a/wire/wire_io.c b/wire/wire_io.c
index 3c2e1b9ea..ca90547c8 100644
--- a/wire/wire_io.c
+++ b/wire/wire_io.c
@@ -2,7 +2,6 @@
  #include <unistd.h>
 #include <ccan/io/io_plan.h>
 #include <ccan/mem/mem.h>
-#include <ccan/short_types/short_types.h>
 #include <ccan/take/take.h>
 #include <ccan/tal/tal.h>
 #include <errno.h>