diff --git a/lightningd/Makefile b/lightningd/Makefile
index 3ebb582d9..4780730c6 100644
--- a/lightningd/Makefile
+++ b/lightningd/Makefile
@@ -73,7 +73,6 @@ LIGHTNINGD_SRC :=				\
 	lightningd/peer_control.c		\
 	lightningd/peer_htlcs.c			\
 	lightningd/subd.c			\
-	lightningd/txfilter.c			\
 	lightningd/watch.c
 
 # Source files without corresponding headers
diff --git a/lightningd/lightningd.h b/lightningd/lightningd.h
index 9b6b6fa52..f738920b0 100644
--- a/lightningd/lightningd.h
+++ b/lightningd/lightningd.h
@@ -7,8 +7,8 @@
 #include <ccan/time/time.h>
 #include <ccan/timer/timer.h>
 #include <lightningd/htlc_end.h>
-#include <lightningd/txfilter.h>
 #include <stdio.h>
+#include <wallet/txfilter.h>
 #include <wallet/wallet.h>
 
 /* BOLT #1:
diff --git a/wallet/Makefile b/wallet/Makefile
index 66468e7e1..a12988e31 100644
--- a/wallet/Makefile
+++ b/wallet/Makefile
@@ -7,6 +7,7 @@ wallet-wrongdir:
 WALLET_LIB_SRC :=		\
 	wallet/db.c		\
 	wallet/invoices.c	\
+	wallet/txfilter.c	\
 	wallet/wallet.c		\
 	wallet/walletrpc.c
 
diff --git a/lightningd/txfilter.c b/wallet/txfilter.c
similarity index 100%
rename from lightningd/txfilter.c
rename to wallet/txfilter.c
diff --git a/lightningd/txfilter.h b/wallet/txfilter.h
similarity index 100%
rename from lightningd/txfilter.h
rename to wallet/txfilter.h