diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 73d386b2503..36588ee8431 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2005-07-23  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* Makefile.in (C_TREE_H): Update dependencies.
+	* c-tree.h: Include toplev.h.
+	* diagnostic.h (diagnostic_set_info): Add format attribute.
+	* rtl-error.c (diagnostic_for_asm): Likewise.
+
 2005-07-23  Chao-ying Fu  <fu@mips.com>
 
 	* config/mips/mips-dsp.md: New file.
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 1cbdf68722f..703c1855234 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -741,7 +741,7 @@ TIMEVAR_H = timevar.h timevar.def
 INSN_ATTR_H = insn-attr.h $(srcdir)/insn-addr.h $(srcdir)/varray.h
 C_COMMON_H = c-common.h $(SPLAY_TREE_H) $(CPPLIB_H) $(GGC_H)
 C_PRAGMA_H = c-pragma.h $(CPPLIB_H)
-C_TREE_H = c-tree.h $(C_COMMON_H)
+C_TREE_H = c-tree.h $(C_COMMON_H) toplev.h $(DIAGNOSTIC_H)
 SYSTEM_H = system.h hwint.h $(srcdir)/../include/libiberty.h
 PREDICT_H = predict.h predict.def
 CPPLIB_H = $(srcdir)/../libcpp/include/line-map.h \
diff --git a/gcc/c-tree.h b/gcc/c-tree.h
index 3266ceccbdf..0894317e574 100644
--- a/gcc/c-tree.h
+++ b/gcc/c-tree.h
@@ -23,6 +23,7 @@ Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
 #define GCC_C_TREE_H
 
 #include "c-common.h"
+#include "toplev.h"
 #include "diagnostic.h"
 
 /* struct lang_identifier is private to c-decl.c, but langhooks.c needs to
diff --git a/gcc/diagnostic.h b/gcc/diagnostic.h
index ec2df1251fc..e44d68028eb 100644
--- a/gcc/diagnostic.h
+++ b/gcc/diagnostic.h
@@ -181,8 +181,10 @@ extern void diagnostic_report_current_module (diagnostic_context *);
 extern void diagnostic_report_current_function (diagnostic_context *);
 extern void diagnostic_report_diagnostic (diagnostic_context *,
 					  diagnostic_info *);
+#ifdef ATTRIBUTE_GCC_DIAG
 extern void diagnostic_set_info (diagnostic_info *, const char *, va_list *,
-				 location_t, diagnostic_t);
+				 location_t, diagnostic_t) ATTRIBUTE_GCC_DIAG(2,0);
+#endif
 extern char *diagnostic_build_prefix (diagnostic_info *);
 
 /* Pure text formatting support functions.  */
diff --git a/gcc/rtl-error.c b/gcc/rtl-error.c
index 3a950b2ffc4..4f5a096feba 100644
--- a/gcc/rtl-error.c
+++ b/gcc/rtl-error.c
@@ -34,7 +34,7 @@ Boston, MA 02110-1301, USA.  */
 #include "diagnostic.h"
 
 static location_t location_for_asm (rtx);
-static void diagnostic_for_asm (rtx, const char *, va_list *, diagnostic_t);
+static void diagnostic_for_asm (rtx, const char *, va_list *, diagnostic_t) ATTRIBUTE_GCC_DIAG(2,0);
 
 /* Figure the location of the given INSN.  */
 static location_t