diff --git a/Makefile b/Makefile
index 9a6f4bdca..59da63d75 100644
--- a/Makefile
+++ b/Makefile
@@ -41,7 +41,6 @@ BITCOIN_OBJS := $(BITCOIN_SRC:.c=.o)
 
 CORE_SRC :=					\
 	close_tx.c				\
-	commit_tx.c				\
 	find_p2sh_out.c				\
 	lightning.pb-c.c			\
 	opt_bits.c				\
@@ -151,7 +150,6 @@ BITCOIN_HEADERS := bitcoin/address.h		\
 	bitcoin/varint.h
 
 CORE_HEADERS := close_tx.h			\
-	commit_tx.h				\
 	find_p2sh_out.h				\
 	names.h					\
 	opt_bits.h				\
diff --git a/daemon/Makefile b/daemon/Makefile
index e1fa70116..0de0a7dac 100644
--- a/daemon/Makefile
+++ b/daemon/Makefile
@@ -17,6 +17,7 @@ DAEMON_SRC :=					\
 	daemon/bitcoind.c			\
 	daemon/chaintopology.c			\
 	daemon/channel.c			\
+	daemon/commit_tx.c			\
 	daemon/controlled_time.c		\
 	daemon/cryptopkt.c			\
 	daemon/dns.c				\
@@ -52,6 +53,7 @@ DAEMON_HEADERS :=				\
 	daemon/bitcoind.h			\
 	daemon/chaintopology.h			\
 	daemon/channel.h			\
+	daemon/commit_tx.h			\
 	daemon/configdir.h			\
 	daemon/controlled_time.h		\
 	daemon/cryptopkt.h			\
diff --git a/commit_tx.c b/daemon/commit_tx.c
similarity index 98%
rename from commit_tx.c
rename to daemon/commit_tx.c
index 7a27a5281..dcc841acf 100644
--- a/commit_tx.c
+++ b/daemon/commit_tx.c
@@ -3,9 +3,9 @@
 #include "bitcoin/script.h"
 #include "bitcoin/shadouble.h"
 #include "bitcoin/tx.h"
+#include "channel.h"
 #include "commit_tx.h"
-#include "daemon/channel.h"
-#include "daemon/htlc.h"
+#include "htlc.h"
 #include "overflows.h"
 #include "permute_tx.h"
 #include "remove_dust.h"
diff --git a/commit_tx.h b/daemon/commit_tx.h
similarity index 100%
rename from commit_tx.h
rename to daemon/commit_tx.h