diff --git a/Makefile b/Makefile
index f2324f8d2..48b900822 100644
--- a/Makefile
+++ b/Makefile
@@ -186,7 +186,6 @@ include external/Makefile
 include bitcoin/Makefile
 include common/Makefile
 include wire/Makefile
-include wallet/Makefile
 include hsmd/Makefile
 include gossipd/Makefile
 include openingd/Makefile
diff --git a/lightningd/Makefile b/lightningd/Makefile
index ce554d776..918b289f3 100644
--- a/lightningd/Makefile
+++ b/lightningd/Makefile
@@ -100,6 +100,8 @@ LIGHTNINGD_HEADERS_GEN =			\
 
 ALL_GEN_HEADERS += $(LIGHTNINGD_HEADERS_GEN)
 
+include wallet/Makefile
+
 # All together in one convenient var
 LIGHTNINGD_HEADERS = $(LIGHTNINGD_HEADERS_NOGEN) $(LIGHTNINGD_HEADERS_GEN) $(EXTERNAL_HEADERS) $(WIRE_HEADERS) $(BITCOIN_HEADERS) $(COMMON_HEADERS) $(WALLET_LIB_HEADERS) $(LIGHTNINGD_HSM_CLIENT_HEADERS)