diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index d96a2314ba..0ca85b78ed 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,12 @@
+Thu Aug  1 10:11:34 1996  Fred Fish  <fnf@cygnus.com>
+
+	* config/mips/tm-mips.h (TM_MIPS_H): Enclose file contents in
+	this, define when contents are included.
+	(mips_read_processor_type): Add prototype.
+	* config/mips/xm-mips.h: Remove strdup decl, now in gdb_string.h
+	* mdebugread.c (ecoff_relocate_efi): Add prototype.
+	(fixup_sigtramp): Only needed when TM_MIPS_H is defined.
+
 start-sanitize-gdbtk 
 Thu Aug  1 16:12:05 1996  Jason Molenda  (crash@godzilla.cygnus.co.jp)
 
diff --git a/gdb/config/mips/tm-mips.h b/gdb/config/mips/tm-mips.h
index 935a277ede..95b9f07736 100644
--- a/gdb/config/mips/tm-mips.h
+++ b/gdb/config/mips/tm-mips.h
@@ -20,6 +20,9 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
+#ifndef TM_MIPS_H
+#define TM_MIPS_H 1
+
 #ifdef __STDC__
 struct frame_info;
 struct symbol;
@@ -537,3 +540,7 @@ extern struct frame_info *setup_arbitrary_frame PARAMS ((int, CORE_ADDR *));
 extern CORE_ADDR sigtramp_address, sigtramp_end;
 extern void fixup_sigtramp PARAMS ((void));
 
+/* Defined in mips-tdep.c and used in remote-mips.c */
+extern char *mips_read_processor_type PARAMS ((void));
+
+#endif	/* TM_MIPS_H */
diff --git a/gdb/config/mips/xm-mips.h b/gdb/config/mips/xm-mips.h
index b90d03e8d7..3bbc72e951 100644
--- a/gdb/config/mips/xm-mips.h
+++ b/gdb/config/mips/xm-mips.h
@@ -29,10 +29,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #define KERNEL_U_ADDR UADDR
 #endif
 
-#ifdef ultrix
-extern char *strdup();
-#endif
-
 #if ! defined (__STDC__) && ! defined (offsetof)
 # define offsetof(TYPE, MEMBER) ((unsigned long) &((TYPE *)0)->MEMBER)
 #endif
diff --git a/gdb/mdebugread.c b/gdb/mdebugread.c
index 67ded75fe5..5c23ddaf9c 100644
--- a/gdb/mdebugread.c
+++ b/gdb/mdebugread.c
@@ -56,6 +56,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #ifndef MIPS_EFI_SYMBOL_NAME
 #define MIPS_EFI_SYMBOL_NAME "__GDB_EFI_INFO__"
+extern void ecoff_relocate_efi PARAMS ((struct symbol *, CORE_ADDR));
 #include "coff/sym.h"
 #include "coff/symconst.h"
 typedef struct mips_extra_func_info {
@@ -4179,7 +4180,10 @@ elfmdebug_build_psymtabs (objfile, swap, sec, section_offsets)
 
 /* FIXME: This function is called only by mips-tdep.c.  It needs to be
    here because it calls functions defined in this file, but perhaps
-   this could be handled in a better way.  */
+   this could be handled in a better way.  Only compile it in when
+   tm-mips.h is included. */
+
+#ifdef TM_MIPS_H
 
 void
 fixup_sigtramp ()
@@ -4281,6 +4285,8 @@ fixup_sigtramp ()
   BLOCK_SYM (b, BLOCK_NSYMS (b)++) = s;
 }
 
+#endif	/* TM_MIPS_H */
+
 void
 _initialize_mdebugread ()
 {