diff --git a/Makefile b/Makefile
index 229d8ff9f..95400a6bc 100644
--- a/Makefile
+++ b/Makefile
@@ -58,12 +58,11 @@ CORE_SRC :=					\
 	lightning.pb-c.c			\
 	opt_bits.c				\
 	permute_tx.c				\
-	pkt.c					\
 	protobuf_convert.c			\
 	version.c
 CORE_OBJS := $(CORE_SRC:.c=.o)
 
-TEST_CLI_SRC := test-cli/gather_updates.c
+TEST_CLI_SRC := test-cli/gather_updates.c test-cli/pkt.c
 TEST_CLI_OBJS := $(TEST_CLI_SRC:.c=.o)
 
 CCAN_OBJS :=					\
@@ -143,7 +142,8 @@ CCAN_HEADERS :=						\
 	$(CCANDIR)/ccan/time/time.h			\
 	$(CCANDIR)/ccan/typesafe_cb/typesafe_cb.h
 
-TEST_CLI_HEADERS := test-cli/gather_updates.h
+TEST_CLI_HEADERS := test-cli/gather_updates.h \
+	test-cli/pkt.h
 
 BITCOIN_HEADERS := bitcoin/address.h		\
 	bitcoin/base58.h			\
@@ -162,7 +162,6 @@ CORE_HEADERS := close_tx.h			\
 	opt_bits.h				\
 	overflows.h				\
 	permute_tx.h				\
-	pkt.h					\
 	protobuf_convert.h			\
 	state.h					\
 	state_types.h				\
diff --git a/close_tx.c b/close_tx.c
index 67a3d834a..602d1bb4e 100644
--- a/close_tx.c
+++ b/close_tx.c
@@ -4,7 +4,6 @@
 #include "bitcoin/tx.h"
 #include "close_tx.h"
 #include "permute_tx.h"
-#include "pkt.h"
 #include "protobuf_convert.h"
 
 struct bitcoin_tx *create_close_tx(const tal_t *ctx,
diff --git a/commit_tx.c b/commit_tx.c
index 3b1a753dc..229ff93af 100644
--- a/commit_tx.c
+++ b/commit_tx.c
@@ -7,7 +7,6 @@
 #include "funding.h"
 #include "overflows.h"
 #include "permute_tx.h"
-#include "pkt.h"
 #include "protobuf_convert.h"
 
 static bool add_htlc(struct bitcoin_tx *tx, size_t n,
diff --git a/pkt.c b/test-cli/pkt.c
similarity index 100%
rename from pkt.c
rename to test-cli/pkt.c
diff --git a/pkt.h b/test-cli/pkt.h
similarity index 100%
rename from pkt.h
rename to test-cli/pkt.h