diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 96e10ab6c371..7596fb9d9a7e 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,7 +1,12 @@
+2004-01-07  Zack Weinberg  <zack@codesourcery.com>
+
+	* dwarf2.h, unwind-dw2-fde.h, unwind-pe.h, unwind.h:
+	Add multiple-include guard.
+
 2004-01-08  Hartmut Penner  <hpenner@de.ibm.com>
 
-	* gcc/config/rs6000/rs6000.c (easy_vector_constant): Accept 
-	all vector constant loadable by vsplt*.  
+	* gcc/config/rs6000/rs6000.c (easy_vector_constant): Accept
+	all vector constant loadable by vsplt*.
 	(output_vec_const_move): Likewise.
 
 2004-01-07  Joseph S. Myers  <jsm@polyomino.org.uk>
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 490222416781..147ca7dc07e6 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,9 +1,14 @@
+2004-01-07  Zack Weinberg  <zack@codesourcery.com>
+
+	* parser.c (cp_parser_save_member_function_body): Mark the
+	definition static.
+
 2004-01-05  Mark Mitchell  <mark@codesourcery.com>
 
 	PR c++/13057
 	* class.c (build_clone): Copy type attributes from the original
 	function to the clone.
-	
+
 	PR c++/12815
 	* class.c (build_vtbl_ref_1): Do not unconditionally mark vtable
 	references as constant.
diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index 560ad486d1aa..a9e50ec34bb0 100644
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -14196,7 +14196,7 @@ cp_parser_functional_cast (cp_parser* parser, tree type)
    specifiers applied to the declaration.  Returns the FUNCTION_DECL
    for the member function.  */
 
-tree
+static tree
 cp_parser_save_member_function_body (cp_parser* parser,
 				     tree decl_specifiers,
 				     tree declarator,
diff --git a/gcc/dwarf2.h b/gcc/dwarf2.h
index 2345d3aad140..0e98a455fabb 100644
--- a/gcc/dwarf2.h
+++ b/gcc/dwarf2.h
@@ -38,6 +38,9 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 /* This file is shared between GCC and GDB, and should not contain
    prototypes.  */
 
+#ifndef GCC_DWARF2_H
+#define GCC_DWARF2_H
+
 /* Tag names and codes.  */
 enum dwarf_tag
   {
@@ -628,3 +631,5 @@ enum dwarf_macinfo_record_type
 #define DW_EH_PE_aligned	0x50
 
 #define DW_EH_PE_indirect	0x80
+
+#endif /* dwarf2.h */
diff --git a/gcc/treelang/ChangeLog b/gcc/treelang/ChangeLog
index d017977a38bb..fa087fa7152c 100644
--- a/gcc/treelang/ChangeLog
+++ b/gcc/treelang/ChangeLog
@@ -1,3 +1,7 @@
+2004-01-07  Zack Weinberg  <zack@codesourcery.com>
+
+	* parse.y (yyerror): Mark the definition static.
+
 2003-12-04  James A. Morrison  <ja2morri@uwaterloo.ca>
 
 	* lex.l: Add \t as a whitespace character.
diff --git a/gcc/treelang/parse.y b/gcc/treelang/parse.y
index f0f721d55453..e7c98386aaba 100644
--- a/gcc/treelang/parse.y
+++ b/gcc/treelang/parse.y
@@ -783,7 +783,7 @@ print_token (FILE * file, unsigned int type ATTRIBUTE_UNUSED, YYSTYPE value)
 }
 
 /* Output a message ERROR_MESSAGE from the parser.  */
-void
+static void
 yyerror (const char *error_message)
 {
   struct prod_token_parm_item *tok;
diff --git a/gcc/unwind-dw2-fde.h b/gcc/unwind-dw2-fde.h
index 1eb6172a628c..89e038a05754 100644
--- a/gcc/unwind-dw2-fde.h
+++ b/gcc/unwind-dw2-fde.h
@@ -29,6 +29,8 @@ along with GCC; see the file COPYING.  If not, write to the Free
 Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 02111-1307, USA.  */
 
+#ifndef GCC_UNWIND_DW2_FDE_H
+#define GCC_UNWIND_DW2_FDE_H
 
 struct fde_vector
 {
@@ -174,3 +176,5 @@ last_fde (struct object *obj __attribute__ ((__unused__)), const fde *f)
   return f->length == 0;
 #endif
 }
+
+#endif /* unwind-dw2-fde.h */
diff --git a/gcc/unwind-pe.h b/gcc/unwind-pe.h
index 4bf2cfd3f021..52e618c1aff6 100644
--- a/gcc/unwind-pe.h
+++ b/gcc/unwind-pe.h
@@ -31,6 +31,9 @@
    compatibility problems with the base ABI.  This is slightly better
    than duplicating code, however.  */
 
+#ifndef GCC_UNWIND_PE_H
+#define GCC_UNWIND_PE_H
+
 /* If using C++, references to abort have to be qualified with std::.  */
 #if __cplusplus
 #define __gxx_abort std::abort
@@ -284,3 +287,5 @@ read_encoded_value (struct _Unwind_Context *context, unsigned char encoding,
 }
 
 #endif
+
+#endif /* unwind-pe.h */
diff --git a/gcc/unwind.h b/gcc/unwind.h
index 35c765ef4ac3..64768c0139b9 100644
--- a/gcc/unwind.h
+++ b/gcc/unwind.h
@@ -28,6 +28,9 @@
 /* This is derived from the C++ ABI for IA-64.  Where we diverge
    for cross-architecture compatibility are noted with "@@@".  */
 
+#ifndef _UNWIND_H
+#define _UNWIND_H
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -225,3 +228,5 @@ extern void * _Unwind_FindEnclosingFunction (void *pc);
 #ifdef __cplusplus
 }
 #endif
+
+#endif /* unwind.h */