diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a548afb6f30e119219213bb244448108177d9643..671abfe08e9fe114ef7dc4e276a59ae682a238b3 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2004-06-13  Jason Merrill  <jason@redhat.com>
+
+	* tree.h: Move std_gimplify_va_arg_expr protoype here.
+	* tree-gimple.h: From here.
+
 2004-06-13  Daniel Berlin  <dberlin@dberlin.org>
 
 	Fix PR tree-optimization/15979
diff --git a/gcc/tree-gimple.h b/gcc/tree-gimple.h
index c433c1eec5fc485f4dc024b2d43e6057e3f52ea5..238e53785d59f2a17911b05c2c6448bbf2a5422e 100644
--- a/gcc/tree-gimple.h
+++ b/gcc/tree-gimple.h
@@ -123,7 +123,6 @@ tree alloc_stmt_list (void);
 void free_stmt_list (tree);
 tree force_labels_r (tree *, int *, void *);
 enum gimplify_status gimplify_va_arg_expr (tree *, tree *, tree *);
-tree std_gimplify_va_arg_expr (tree, tree, tree *, tree *);
 
 /* In tree-nested.c.  */
 extern void lower_nested_functions (tree);
diff --git a/gcc/tree.h b/gcc/tree.h
index e0ba912becda878dd4dcc01d4d0783a488b693b9..de012fb6434c7b195aa33ec163797dc72d908b09 100644
--- a/gcc/tree.h
+++ b/gcc/tree.h
@@ -3526,6 +3526,7 @@ extern tree mathfn_built_in (tree, enum built_in_function fn);
 extern tree strip_float_extensions (tree);
 extern tree simplify_builtin (tree, int);
 extern tree c_strlen (tree, int);
+extern tree std_gimplify_va_arg_expr (tree, tree, tree *, tree *);
 
 /* In convert.c */
 extern tree strip_float_extensions (tree);