diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 87b2fbb9c09..5658d0364dd 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2004-11-11  Kazu Hirata  <kazu@cs.umass.edu>
+
+	* alias.c (record_alias_subset, addr_side_effect_eval):
+	Make them static.
+	* alias.h: Remove the prototype for record_alias_subset.
+	* expr.h: Remove the commented-out prototype for
+	record_alias_subset.
+	* rtl.h: Remove the prototype for addr_side_effect_eval.
+
 2004-11-11  Kazu Hirata  <kazu@cs.umass.edu>
 
 	* function.c (expand_function_end): Remove an "if" statement
diff --git a/gcc/alias.c b/gcc/alias.c
index 49f2c6b1147..dd2f35e502c 100644
--- a/gcc/alias.c
+++ b/gcc/alias.c
@@ -122,6 +122,7 @@ static int nonlocal_referenced_p (rtx);
 static int nonlocal_set_p_1 (rtx *, void *);
 static int nonlocal_set_p (rtx);
 static void memory_modified_1 (rtx, rtx, void *);
+static void record_alias_subset (HOST_WIDE_INT, HOST_WIDE_INT);
 
 /* Set up all info needed to perform alias analysis on memory references.  */
 
@@ -595,7 +596,7 @@ new_alias_set (void)
    It is illegal for SUPERSET to be zero; everything is implicitly a
    subset of alias set zero.  */
 
-void
+static void
 record_alias_subset (HOST_WIDE_INT superset, HOST_WIDE_INT subset)
 {
   alias_set_entry superset_entry;
@@ -1562,7 +1563,7 @@ get_addr (rtx x)
     where SIZE is the size in bytes of the memory reference.  If ADDR
     is not modified by the memory reference then ADDR is returned.  */
 
-rtx
+static rtx
 addr_side_effect_eval (rtx addr, int size, int n_refs)
 {
   int offset = 0;
diff --git a/gcc/alias.h b/gcc/alias.h
index 371cdabf947..ea78e808a62 100644
--- a/gcc/alias.h
+++ b/gcc/alias.h
@@ -22,7 +22,6 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #define GCC_ALIAS_H
 
 extern HOST_WIDE_INT new_alias_set (void);
-extern void record_alias_subset (HOST_WIDE_INT, HOST_WIDE_INT);
 extern HOST_WIDE_INT get_varargs_alias_set (void);
 extern HOST_WIDE_INT get_frame_alias_set (void);
 extern void record_base_value (unsigned int, rtx, int);
diff --git a/gcc/expr.h b/gcc/expr.h
index fbb34a6d734..1c90e70243b 100644
--- a/gcc/expr.h
+++ b/gcc/expr.h
@@ -527,7 +527,6 @@ extern unsigned int case_values_threshold (void);
 /* extern HOST_WIDE_INT get_varargs_alias_set (void); */
 /* extern HOST_WIDE_INT get_frame_alias_set (void); */
 /* extern void record_base_value (unsigned int, rtx, int); */
-/* extern void record_alias_subset (HOST_WIDE_INT, HOST_WIDE_INT); */
 /* extern HOST_WIDE_INT new_alias_set (void); */
 /* extern int can_address_p (tree); */
 
diff --git a/gcc/rtl.h b/gcc/rtl.h
index d85c4bd8639..30ea52ee022 100644
--- a/gcc/rtl.h
+++ b/gcc/rtl.h
@@ -2166,7 +2166,6 @@ extern void mark_constant_function (void);
 extern void init_alias_once (void);
 extern void init_alias_analysis (void);
 extern void end_alias_analysis (void);
-extern rtx addr_side_effect_eval (rtx, int, int);
 extern bool memory_modified_in_insn_p (rtx, rtx);
 extern rtx find_base_term (rtx);
 extern rtx gen_hard_reg_clobber (enum machine_mode, unsigned int);