diff --git a/commandline.h b/commandline.h
index 72e26cbb..7d81644c 100644
--- a/commandline.h
+++ b/commandline.h
@@ -45,7 +45,6 @@ DECLARE_SECTION(struct cli_schema, commands);
 #define CMD_COUNT (SECTION_START(commands) - SECTION_END(commands))
 
 int commandline_main(struct cli_context *context, const char *argv0, int argc, const char *const *args);
-int commandline_main_stdio(FILE *output, const char *argv0, int argc, const char *const *args);
 
 // Trigger that is called after every command has finished.  Different
 // sub-systems (eg, keyring, Rhizome) use this to reset their global state
diff --git a/servald_features.c b/servald_features.c
index ea943756..3a784ad1 100644
--- a/servald_features.c
+++ b/servald_features.c
@@ -35,6 +35,8 @@ void servald_features()
   USE_FEATURE(cli_msp_proxy);
   USE_FEATURE(cli_rhizome_direct);
 
+  USE_FEATURE(log_output_file);
+
   USE_FEATURE(mdp_binding_MDP_PORT_ECHO);
   USE_FEATURE(mdp_binding_MDP_PORT_TRACE);
   USE_FEATURE(mdp_binding_MDP_PORT_KEYMAPREQUEST);
@@ -52,7 +54,6 @@ void servald_features()
 
   USE_FEATURE(dna_helper);
   USE_FEATURE(directory_client);
-  USE_FEATURE(log_output_file);
 
   USE_FEATURE(http_server);
   USE_FEATURE(http_rhizome);