diff --git a/lightningd/lightningd.c b/lightningd/lightningd.c
index f7bd99ab3..f389ad080 100644
--- a/lightningd/lightningd.c
+++ b/lightningd/lightningd.c
@@ -240,15 +240,6 @@ int main(int argc, char *argv[])
 	ld->daemon_dir = find_my_path(ld, argv[0]);
 
 	register_opts(ld);
-	opt_register_arg("--dev-debugger=<subdaemon>", opt_subd_debug, NULL,
-			 ld, "Wait for gdb attach at start of <subdaemon>");
-
-	opt_register_arg("--dev-broadcast-interval=<ms>", opt_set_uintval,
-			 opt_show_uintval, &ld->broadcast_interval,
-			 "Time between gossip broadcasts in milliseconds (default: 30000)");
-
-	opt_register_arg("--dev-disconnect=<filename>", opt_subd_dev_disconnect,
-			 NULL, ld, "File containing disconnection points");
 
 	/* FIXME: move to option initialization once we drop the
 	 * legacy daemon */
diff --git a/lightningd/options.c b/lightningd/options.c
index 1af79417f..a96389e5b 100644
--- a/lightningd/options.c
+++ b/lightningd/options.c
@@ -15,6 +15,7 @@
 #include <lightningd/log.h>
 #include <lightningd/opt_time.h>
 #include <lightningd/options.h>
+#include <lightningd/subd.h>
 #include <stdio.h>
 #include <string.h>
 #include <sys/socket.h>
@@ -243,6 +244,13 @@ static void dev_register_opts(struct lightningd *ld)
 			   &ld->topology->dev_no_broadcast, opt_hidden);
 	opt_register_noarg("--dev-fail-on-subdaemon-fail", opt_set_bool,
 			   &ld->dev_subdaemon_fail, opt_hidden);
+	opt_register_arg("--dev-debugger=<subdaemon>", opt_subd_debug, NULL,
+			 ld, "Wait for gdb attach at start of <subdaemon>");
+	opt_register_arg("--dev-broadcast-interval=<ms>", opt_set_uintval,
+			 opt_show_uintval, &ld->broadcast_interval,
+			 "Time between gossip broadcasts in milliseconds (default: 30000)");
+	opt_register_arg("--dev-disconnect=<filename>", opt_subd_dev_disconnect,
+			 NULL, ld, "File containing disconnection points");
 }
 
 static const struct config testnet_config = {