diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c413b49a3253af9efa935dbc2307c87fe52a3564..53ad550f375644b41e690061ea79837a1c807347 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2000-07-27  RodneyBrown  <RodneyBrown@pmsc.com>
+
+	* expr.h (get_alias_set, lang_get_alias_set): Delete prototypes.
+	* tree.h (get_alias_set, lang_get_alias_set): Prototype.
+
 2000-07-27  Joseph S. Myers  <jsm28@cam.ac.uk>
 
 	* c-decl.c (store_parm_decls): In C99 mode, pedwarn for function
diff --git a/gcc/expr.h b/gcc/expr.h
index b822ea24815cd37cb60f28448c493798cc34e6ef..9ed572cc1ec7ef9d24584e4f39288d4116e9eac6 100644
--- a/gcc/expr.h
+++ b/gcc/expr.h
@@ -920,10 +920,6 @@ extern HOST_WIDE_INT get_frame_alias_set PARAMS ((void));
 extern void record_base_value		PARAMS ((unsigned int, rtx, int));
 extern void record_alias_subset         PARAMS ((HOST_WIDE_INT,
 						 HOST_WIDE_INT));
-#ifdef TREE_CODE
-extern HOST_WIDE_INT get_alias_set		PARAMS ((tree));
-extern HOST_WIDE_INT lang_get_alias_set		PARAMS ((tree));
-#endif
 extern HOST_WIDE_INT new_alias_set		PARAMS ((void));
 
 /* Functions from expr.c:  */
diff --git a/gcc/tree.h b/gcc/tree.h
index 7a73968fbff80d508ac5d4e898765b5b25145d61..c1251a1bda73b51ab7c724456f9d9a4b60f88ab4 100644
--- a/gcc/tree.h
+++ b/gcc/tree.h
@@ -2616,7 +2616,11 @@ extern void end_temporary_allocation PARAMS ((void));
 extern void pop_obstacks PARAMS ((void));
 
 /* In alias.c */
-void record_component_aliases		PARAMS ((tree));
+extern void record_component_aliases		PARAMS ((tree));
+extern HOST_WIDE_INT get_alias_set		PARAMS ((tree));
+
+/* In c-common.c */
+extern HOST_WIDE_INT lang_get_alias_set		PARAMS ((tree));
 
 /* In tree.c */
 extern int really_constant_p		PARAMS ((tree));