diff --git a/wallet/Makefile b/wallet/Makefile
index a12988e31..4c82a78db 100644
--- a/wallet/Makefile
+++ b/wallet/Makefile
@@ -14,7 +14,13 @@ WALLET_LIB_SRC :=		\
 WALLET_LIB_OBJS := $(WALLET_LIB_SRC:.c=.o)
 WALLET_LIB_HEADERS := $(WALLET_LIB_SRC:.c=.h)
 
+# Make sure these depend on everything.
+ALL_OBJS += $(LIGHTNINGD_OBJS)
+
 check-whitespace: $(WALLET_LIB_SRC:%=check-whitespace/%) $(WALLET_LIB_HEADERS:%=check-whitespace/%)
+check-source: $(WALLET_LIB_SRC:%=check-src-include-order/%)
+check-source: $(WALLET_LIB_HEADERS:%=check-hdr-include-order/%)
+check-source-bolt: $(WALLET_LIB_SRC:%=bolt-check/%) $(WALLET_LIB_HEADERS:%=bolt-check/%)
 
 clean: wallet-clean
 
diff --git a/wallet/db.h b/wallet/db.h
index 7514cd7b7..62b466a6b 100644
--- a/wallet/db.h
+++ b/wallet/db.h
@@ -1,14 +1,13 @@
 #ifndef WALLET_DB_H
 #define WALLET_DB_H
-
 #include "config.h"
-#include <bitcoin/pubkey.h>
+
 #include <bitcoin/preimage.h>
+#include <bitcoin/pubkey.h>
 #include <bitcoin/short_channel_id.h>
 #include <bitcoin/tx.h>
 #include <ccan/short_types/short_types.h>
 #include <ccan/tal/tal.h>
-
 #include <secp256k1_ecdh.h>
 #include <sqlite3.h>
 #include <stdbool.h>
diff --git a/wallet/invoices.c b/wallet/invoices.c
index 8cc43e477..4d46665ce 100644
--- a/wallet/invoices.c
+++ b/wallet/invoices.c
@@ -7,13 +7,13 @@
 #include <ccan/tal/str/str.h>
 #include <ccan/time/time.h>
 #include <ccan/timer/timer.h>
+#include <common/timeout.h>
+#include <common/utils.h>
 #include <lightningd/invoice.h>
 #include <lightningd/log.h>
 #include <sodium/randombytes.h>
 #include <sqlite3.h>
 #include <string.h>
-#include <common/timeout.h>
-#include <common/utils.h>
 
 struct invoice_waiter {
 	/* Is this waiter already triggered? */
diff --git a/wallet/invoices.h b/wallet/invoices.h
index 05ccba482..8fbf196d8 100644
--- a/wallet/invoices.h
+++ b/wallet/invoices.h
@@ -1,10 +1,10 @@
 #ifndef LIGHTNING_WALLET_INVOICES_H
 #define LIGHTNING_WALLET_INVOICES_H
 #include "config.h"
-#include <ccan/short_types/short_types.h>
-#include <ccan/tal/tal.h>
-#include <ccan/take/take.h>
 #include <bitcoin/preimage.h>
+#include <ccan/short_types/short_types.h>
+#include <ccan/take/take.h>
+#include <ccan/tal/tal.h>
 
 struct db;
 struct invoice;
diff --git a/wallet/wallet.c b/wallet/wallet.c
index b52794ae8..3fe9ccbd5 100644
--- a/wallet/wallet.c
+++ b/wallet/wallet.c
@@ -4,10 +4,10 @@
 #include <bitcoin/script.h>
 #include <ccan/structeq/structeq.h>
 #include <ccan/tal/str/str.h>
+#include <common/wireaddr.h>
 #include <inttypes.h>
 #include <lightningd/invoice.h>
 #include <lightningd/lightningd.h>
-#include <common/wireaddr.h>
 #include <lightningd/log.h>
 #include <lightningd/peer_control.h>
 #include <lightningd/peer_htlcs.h>