diff --git a/lightningd/Makefile b/lightningd/Makefile
index 63c9f5ae0..89b87de05 100644
--- a/lightningd/Makefile
+++ b/lightningd/Makefile
@@ -11,6 +11,7 @@ default: lightningd-all
 LIGHTNINGD_OLD_SRC :=				\
 	daemon/configdir.c			\
 	daemon/json.c				\
+	daemon/jsonrpc.c			\
 	daemon/log.c				\
 	daemon/options.c			\
 	daemon/opt_time.c			\
diff --git a/lightningd/lightningd.c b/lightningd/lightningd.c
index a1ab5d3eb..c2a4acf3e 100644
--- a/lightningd/lightningd.c
+++ b/lightningd/lightningd.c
@@ -36,27 +36,24 @@ struct peer *find_peer(struct lightningd_state *dstate, const struct pubkey *id)
 	FIXME_IMPLEMENT();
 }
 
-struct json_result *null_response(const tal_t *ctx)
-{
-	FIXME_IMPLEMENT();
-}
-
-void command_success(struct command *cmd, struct json_result *result)
-{
-	FIXME_IMPLEMENT();
-}
-
-void command_fail(struct command *cmd, const char *fmt, ...)
-{
-	FIXME_IMPLEMENT();
-}
-
 size_t get_tx_depth(struct lightningd_state *dstate,
 		    const struct sha256_double *txid)
 {
 	FIXME_IMPLEMENT();
 }
 
+void debug_dump_peers(struct lightningd_state *dstate);
+void debug_dump_peers(struct lightningd_state *dstate)
+{
+	FIXME_IMPLEMENT();
+}
+
+u32 get_block_height(struct lightningd_state *dstate)
+{
+	/* FIXME_IMPLEMENT(); */
+	return 0;
+}
+
  #include <daemon/packets.h>
 void queue_pkt_nested(struct peer *peer,
 		      int type,
@@ -169,17 +166,16 @@ int main(int argc, char *argv[])
 	/* Set up HSM. */
 	hsm_init(ld, newdir);
 
-#if 0
+	/* Create RPC socket (if any) */
+	setup_jsonrpc(&ld->dstate, ld->dstate.rpc_filename);
 
+#if 0
 	/* Initialize block topology. */
 	setup_topology(dstate);
 
 	/* Load peers from database. */
 	db_load_peers(dstate);
 
-	/* Create RPC socket (if any) */
-	setup_jsonrpc(dstate, dstate->rpc_filename);
-
 	/* Ready for connections from peers. */
 	setup_listeners(dstate);
 #endif