diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 8350f37cf8a..4a21b0a081d 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2003-06-02  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* mips.c: Don't include output.h twice.
+	* stormy16.c: Likewise.
+	* xtensa.c: Likewise.
+	* output.h: Protect against multiple inclusion.
+
 2003-06-02  J"orn Rennecke <joern.rennecke@superh.com>
 
 	* sh.h (OLD_ARG_MODE): New macro.
diff --git a/gcc/config/mips/mips.c b/gcc/config/mips/mips.c
index d77a3ebe688..67c42a08f94 100644
--- a/gcc/config/mips/mips.c
+++ b/gcc/config/mips/mips.c
@@ -47,7 +47,6 @@ Boston, MA 02111-1307, USA.  */
 #include "expr.h"
 #include "flags.h"
 #include "reload.h"
-#include "output.h"
 #include "tm_p.h"
 #include "ggc.h"
 #include "gstab.h"
diff --git a/gcc/config/stormy16/stormy16.c b/gcc/config/stormy16/stormy16.c
index 193be195012..823f193c853 100644
--- a/gcc/config/stormy16/stormy16.c
+++ b/gcc/config/stormy16/stormy16.c
@@ -40,7 +40,6 @@ Boston, MA 02111-1307, USA.  */
 #include "tree.h"
 #include "expr.h"
 #include "optabs.h"
-#include "output.h"
 #include "except.h"
 #include "function.h"
 #include "target.h"
diff --git a/gcc/config/xtensa/xtensa.c b/gcc/config/xtensa/xtensa.c
index d3ec724b165..3c382d96ca5 100644
--- a/gcc/config/xtensa/xtensa.c
+++ b/gcc/config/xtensa/xtensa.c
@@ -43,7 +43,6 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include "function.h"
 #include "toplev.h"
 #include "optabs.h"
-#include "output.h"
 #include "libfuncs.h"
 #include "ggc.h"
 #include "target.h"
diff --git a/gcc/output.h b/gcc/output.h
index dcbcee69139..6f6be6428b0 100644
--- a/gcc/output.h
+++ b/gcc/output.h
@@ -20,6 +20,9 @@ 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_OUTPUT_H
+#define GCC_OUTPUT_H
+
 /* Compute branch alignments based on frequency information in the CFG.  */
 extern void compute_alignments  PARAMS ((void));
 
@@ -536,3 +539,5 @@ extern void assemble_vtable_inherit PARAMS ((struct rtx_def *,
 					     struct rtx_def *));
 
 extern int default_address_cost PARAMS ((rtx));
+
+#endif /* ! GCC_OUTPUT_H */