diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 8e70f3cf428e01beb8957ad7beefa29c45376a2e..f85952d01f6c6cc7b4d6d752df7a98f04c4f73ae 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -12,6 +12,11 @@
 	* function.h: Remove the prototype for
 	instantiate_virtual_regs.
 
+	* regmove.c (regmove_optimize, combine_stack_adjustments):
+	Make them static.
+	* rtl.h: Remove the prototypes for regmove_optimize and
+	combine_stack_adjustments.
+
 2006-01-17  Roger Sayle  <roger@eyesopen.com>
 
 	* config/i386/i386.c (COSTS_N_BYTES): New macro.
diff --git a/gcc/regmove.c b/gcc/regmove.c
index f74295834df2ce84fe49dff2f07b166b04c804c8..740dee34ad8813e6d2c5a37301085bd36a1fb374 100644
--- a/gcc/regmove.c
+++ b/gcc/regmove.c
@@ -1037,7 +1037,7 @@ fixup_match_2 (rtx insn, rtx dst, rtx src, rtx offset, FILE *regmove_dump_file)
    REGMOVE_DUMP_FILE is a stream for output of a trace of actions taken
    (or 0 if none should be output).  */
 
-void
+static void
 regmove_optimize (rtx f, int nregs, FILE *regmove_dump_file)
 {
   int old_max_uid = get_max_uid ();
@@ -2113,7 +2113,7 @@ static int record_stack_memrefs (rtx *, void *);
 
 /* Main entry point for stack adjustment combination.  */
 
-void
+static void
 combine_stack_adjustments (void)
 {
   basic_block bb;
diff --git a/gcc/rtl.h b/gcc/rtl.h
index 9d8eb36574198872b7f0183018c4f26e75166186..a27304fbb143913f4cad8a7365a6a29ce438f24a 100644
--- a/gcc/rtl.h
+++ b/gcc/rtl.h
@@ -2069,10 +2069,6 @@ extern void cannot_change_mode_set_regs (HARD_REG_SET *,
 extern bool invalid_mode_change_p (unsigned int, enum reg_class,
 				   enum machine_mode);
 
-/* In regmove.c */
-extern void regmove_optimize (rtx, int, FILE *);
-extern void combine_stack_adjustments (void);
-
 /* In reorg.c */
 extern void dbr_schedule (rtx, FILE *);