diff --git a/lightningd/Makefile b/lightningd/Makefile
index a619a6381..5fbe7c726 100644
--- a/lightningd/Makefile
+++ b/lightningd/Makefile
@@ -24,14 +24,14 @@ LIGHTNINGD_OLD_SRC :=				\
 	daemon/pseudorand.c			\
 	daemon/routing.c			\
 	daemon/sphinx.c				\
-	daemon/timeout.c			\
 	daemon/watch.c
 LIGHTNINGD_OLD_OBJS := $(LIGHTNINGD_OLD_SRC:.c=.o)
 LIGHTNINGD_OLD_HEADERS := $(LIGHTNINGD_OLD_SRC:.c=.h)
 
 LIGHTNINGD_OLD_LIB_SRC :=			\
 	daemon/htlc_state.c			\
-	daemon/pseudorand.c
+	daemon/pseudorand.c			\
+	daemon/timeout.c
 LIGHTNINGD_OLD_LIB_OBJS := $(LIGHTNINGD_OLD_LIB_SRC:.c=.o)
 LIGHTNINGD_OLD_LIB_HEADERS := $(LIGHTNINGD_OLD_LIB_SRC:.c=.h)
 
diff --git a/lightningd/gossip/Makefile b/lightningd/gossip/Makefile
index 47224f3f2..24a57011e 100644
--- a/lightningd/gossip/Makefile
+++ b/lightningd/gossip/Makefile
@@ -14,7 +14,7 @@ LIGHTNINGD_GOSSIP_CONTROL_OBJS := $(LIGHTNINGD_GOSSIP_CONTROL_SRC:.c=.o)
 # These should eventually be migrated to the lightningd directory, after
 # deprecating the legacy daemons
 LIGHTNINGD_GOSSIP_LEGACY_HEADERS := daemon/routing.h daemon/broadcast.h \
-	daemon/log.h daemon/pseudorand.h daemon/timeout.h
+	daemon/log.h
 
 # lightningd/gossip needs these:
 LIGHTNINGD_GOSSIP_HEADERS := lightningd/gossip/gen_gossip_wire.h \