diff --git a/Makefile b/Makefile
index 9145f2e53..a8ac43378 100644
--- a/Makefile
+++ b/Makefile
@@ -46,7 +46,6 @@ BITCOIN_OBJS := $(BITCOIN_SRC:.c=.o)
 
 CORE_SRC :=					\
 	opt_bits.c				\
-	status.c				\
 	type_to_string.c			\
 	utils.c					\
 	version.c
@@ -188,7 +187,6 @@ CORE_HEADERS := irc.h				\
 	opt_bits.h				\
 	overflows.h				\
 	protobuf_convert.h			\
-	status.h				\
 	type_to_string.h			\
 	utils.h					\
 	version.h
diff --git a/lightningd/Makefile b/lightningd/Makefile
index 79748dc9b..71414dac8 100644
--- a/lightningd/Makefile
+++ b/lightningd/Makefile
@@ -50,6 +50,7 @@ LIGHTNINGD_LIB_SRC :=				\
 	lightningd/key_derive.c			\
 	lightningd/msg_queue.c			\
 	lightningd/peer_failed.c		\
+	lightningd/status.c			\
 	lightningd/utxo.c
 
 LIGHTNINGD_LIB_OBJS := $(LIGHTNINGD_LIB_SRC:.c=.o)
diff --git a/lightningd/channel.c b/lightningd/channel.c
index 0ed2ab663..15309f4e4 100644
--- a/lightningd/channel.c
+++ b/lightningd/channel.c
@@ -11,7 +11,7 @@
 #include <inttypes.h>
 #include <lightningd/channel_config.h>
 #include <lightningd/key_derive.h>
-#include <status.h>
+#include <lightningd/status.h>
 #include <string.h>
 
 static void htlc_arr_append(const struct htlc ***arr, const struct htlc *htlc)
diff --git a/lightningd/channel/channel.c b/lightningd/channel/channel.c
index 1025547b4..d49acfdd1 100644
--- a/lightningd/channel/channel.c
+++ b/lightningd/channel/channel.c
@@ -21,9 +21,9 @@
 #include <lightningd/key_derive.h>
 #include <lightningd/msg_queue.h>
 #include <lightningd/peer_failed.h>
+#include <lightningd/status.h>
 #include <secp256k1.h>
 #include <signal.h>
-#include <status.h>
 #include <stdio.h>
 #include <type_to_string.h>
 #include <version.h>
diff --git a/lightningd/crypto_sync.c b/lightningd/crypto_sync.c
index 411c5d834..4d706393b 100644
--- a/lightningd/crypto_sync.c
+++ b/lightningd/crypto_sync.c
@@ -3,7 +3,7 @@
 #include <inttypes.h>
 #include <lightningd/crypto_sync.h>
 #include <lightningd/cryptomsg.h>
-#include <status.h>
+#include <lightningd/status.h>
 #include <utils.h>
 #include <wire/wire_sync.h>
 
diff --git a/lightningd/cryptomsg.c b/lightningd/cryptomsg.c
index 1213ed214..59dd9fe71 100644
--- a/lightningd/cryptomsg.c
+++ b/lightningd/cryptomsg.c
@@ -7,8 +7,8 @@
 #include <ccan/short_types/short_types.h>
 #include <ccan/take/take.h>
 #include <lightningd/cryptomsg.h>
+#include <lightningd/status.h>
 #include <sodium/crypto_aead_chacha20poly1305.h>
-#include <status.h>
 #include <utils.h>
 #include <wire/wire.h>
 #include <wire/wire_io.h>
diff --git a/lightningd/gossip/gossip.c b/lightningd/gossip/gossip.c
index fcb3740c9..71912edd2 100644
--- a/lightningd/gossip/gossip.c
+++ b/lightningd/gossip/gossip.c
@@ -21,9 +21,9 @@
 #include <lightningd/debug.h>
 #include <lightningd/gossip/gen_gossip_wire.h>
 #include <lightningd/gossip_msg.h>
+#include <lightningd/status.h>
 #include <secp256k1_ecdh.h>
 #include <sodium/randombytes.h>
-#include <status.h>
 #include <sys/socket.h>
 #include <sys/stat.h>
 #include <sys/types.h>
diff --git a/lightningd/handshake/handshake.c b/lightningd/handshake/handshake.c
index 57817defe..116eba902 100644
--- a/lightningd/handshake/handshake.c
+++ b/lightningd/handshake/handshake.c
@@ -1,4 +1,3 @@
-#include "status.h"
 #include "type_to_string.h"
 #include <assert.h>
 #include <bitcoin/privkey.h>
@@ -13,6 +12,7 @@
 #include <lightningd/debug.h>
 #include <lightningd/handshake/gen_handshake_wire.h>
 #include <lightningd/hsm/client.h>
+#include <lightningd/status.h>
 #include <secp256k1.h>
 #include <secp256k1_ecdh.h>
 #include <sodium/crypto_aead_chacha20poly1305.h>
diff --git a/lightningd/handshake/test/run-handshake.c b/lightningd/handshake/test/run-handshake.c
index 15b4ad553..b43b8d1a0 100644
--- a/lightningd/handshake/test/run-handshake.c
+++ b/lightningd/handshake/test/run-handshake.c
@@ -7,7 +7,7 @@
 #include <ccan/err/err.h>
 #include <ccan/read_write_all/read_write_all.h>
 #include <ccan/structeq/structeq.h>
-#include "status.h"
+#include <lightningd/status.h>
 
 /* Since we use pipes, we need different fds for read and write. */
 static int read_fd, write_fd;
diff --git a/lightningd/hsm/hsm.c b/lightningd/hsm/hsm.c
index fdf88f110..00d8aa739 100644
--- a/lightningd/hsm/hsm.c
+++ b/lightningd/hsm/hsm.c
@@ -19,10 +19,10 @@
 #include <lightningd/hsm/client.h>
 #include <lightningd/hsm/gen_hsm_client_wire.h>
 #include <lightningd/hsm/gen_hsm_wire.h>
+#include <lightningd/status.h>
 #include <permute_tx.h>
 #include <secp256k1_ecdh.h>
 #include <sodium/randombytes.h>
-#include <status.h>
 #include <sys/socket.h>
 #include <sys/stat.h>
 #include <sys/types.h>
diff --git a/lightningd/opening/opening.c b/lightningd/opening/opening.c
index 899452ccd..c399a8f29 100644
--- a/lightningd/opening/opening.c
+++ b/lightningd/opening/opening.c
@@ -15,9 +15,9 @@
 #include <lightningd/key_derive.h>
 #include <lightningd/opening/gen_opening_wire.h>
 #include <lightningd/peer_failed.h>
+#include <lightningd/status.h>
 #include <secp256k1.h>
 #include <signal.h>
-#include <status.h>
 #include <stdio.h>
 #include <type_to_string.h>
 #include <version.h>
diff --git a/lightningd/peer_failed.c b/lightningd/peer_failed.c
index a3a60ce0d..b8e3c1005 100644
--- a/lightningd/peer_failed.c
+++ b/lightningd/peer_failed.c
@@ -2,7 +2,7 @@
 #include <fcntl.h>
 #include <lightningd/crypto_sync.h>
 #include <lightningd/peer_failed.h>
-#include <status.h>
+#include <lightningd/status.h>
 #include <stdarg.h>
 #include <unistd.h>
 #include <wire/gen_peer_wire.h>
diff --git a/status.c b/lightningd/status.c
similarity index 100%
rename from status.c
rename to lightningd/status.c
diff --git a/status.h b/lightningd/status.h
similarity index 87%
rename from status.h
rename to lightningd/status.h
index 0f2d223f7..8256a4b97 100644
--- a/status.h
+++ b/lightningd/status.h
@@ -1,5 +1,5 @@
-#ifndef LIGHTNING_STATUS_H
-#define LIGHTNING_STATUS_H
+#ifndef LIGHTNING_LIGHTNINGD_STATUS_H
+#define LIGHTNING_LIGHTNINGD_STATUS_H
 #include "config.h"
 #include <ccan/compiler/compiler.h>
 #include <ccan/short_types/short_types.h>
@@ -26,4 +26,4 @@ void status_trace(const char *fmt, ...) PRINTF_FMT(1,2);
 /* Send a failure status code with printf-style msg, and exit. */
 void status_failed(u16 code, const char *fmt, ...) PRINTF_FMT(2,3) NORETURN;
 
-#endif /* LIGHTNING_STATUS_H */
+#endif /* LIGHTNING_LIGHTNINGD_STATUS_H */
diff --git a/lightningd/subd.c b/lightningd/subd.c
index f4037d2f4..bbef63cee 100644
--- a/lightningd/subd.c
+++ b/lightningd/subd.c
@@ -7,8 +7,8 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <lightningd/lightningd.h>
+#include <lightningd/status.h>
 #include <lightningd/subd.h>
-#include <status.h>
 #include <stdarg.h>
 #include <sys/socket.h>
 #include <sys/stat.h>
diff --git a/lightningd/test/run-channel.c b/lightningd/test/run-channel.c
index 32dec55d3..e7aeb372e 100644
--- a/lightningd/test/run-channel.c
+++ b/lightningd/test/run-channel.c
@@ -1,4 +1,4 @@
- #include <status.h>
+ #include <lightningd/status.h>
  #include <stdio.h>
 #define status_trace(fmt , ...) \
 	printf(fmt "\n" , ## __VA_ARGS__)
diff --git a/lightningd/test/run-cryptomsg.c b/lightningd/test/run-cryptomsg.c
index afc41295b..1414e4007 100644
--- a/lightningd/test/run-cryptomsg.c
+++ b/lightningd/test/run-cryptomsg.c
@@ -1,7 +1,7 @@
 #include <assert.h>
 #include <ccan/str/hex/hex.h>
 #include <ccan/tal/str/str.h>
-#include <status.h>
+#include <lightningd/status.h>
 #include <stdio.h>
 #include <wire/wire_io.h>