diff --git a/commands/terminal.c b/commands/terminal.c
index 5befecd31..0fff70a69 100644
--- a/commands/terminal.c
+++ b/commands/terminal.c
@@ -26,7 +26,7 @@
 struct grub_term_autoload *grub_term_input_autoload = NULL;
 struct grub_term_autoload *grub_term_output_autoload = NULL;
 
-grub_err_t
+static grub_err_t
 grub_cmd_terminal_input (grub_command_t cmd __attribute__ ((unused)),
 			 int argc, char **args)
 {
@@ -183,7 +183,7 @@ grub_cmd_terminal_input (grub_command_t cmd __attribute__ ((unused)),
   return GRUB_ERR_NONE;
 }
 
-grub_err_t
+static grub_err_t
 grub_cmd_terminal_output (grub_command_t cmd __attribute__ ((unused)),
 			 int argc, char **args)
 {
diff --git a/normal/cmdline.c b/normal/cmdline.c
index bc34f9e4e..de0463662 100644
--- a/normal/cmdline.c
+++ b/normal/cmdline.c
@@ -227,6 +227,8 @@ grub_cmdline_get (const char *prompt)
   auto void cl_set_pos (struct cmdline_term *cl_term);
   auto void cl_print_all (int pos, grub_uint32_t c);
   auto void cl_set_pos_all (void);
+  auto void init_clterm (struct cmdline_term *cl_term_cur);
+  auto void init_clterm_all (void);
   const char *prompt_translated = _(prompt);
   struct cmdline_term *cl_terms;
   char *ret;