diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 5521803d6d..063ae52eea 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -25,6 +25,12 @@ start-sanitize-gdbtk
 	Remove unused static variable "Gdbtk_Library".
 end-sanitize-gdbtk
 
+	* sh-tdep.c (symfile.h): Include.
+	(gdb_string.h): Include.
+	(sh_fix_call_dummy): Ifdef away, currently unused.
+	* config/sh/tm-sh.h (pop_frame): Add prototype.
+	* config/sh/tm-sh.h (sh_set_processor_type): Add prototype.
+
 Sat Jun  7 02:34:19 1997  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
 
 start-sanitize-gdbtk
diff --git a/gdb/config/sh/tm-sh.h b/gdb/config/sh/tm-sh.h
index 0a3c0836dc..5a7b09a0a2 100644
--- a/gdb/config/sh/tm-sh.h
+++ b/gdb/config/sh/tm-sh.h
@@ -204,6 +204,7 @@ extern void sh_extract_return_value PARAMS ((struct type *, void *, void *));
 
 #define INIT_EXTRA_FRAME_INFO(fromleaf, fi) \
     sh_init_extra_frame_info(fromleaf, fi) 
+extern void sh_init_extra_frame_info PARAMS ((int, struct frame_info *));
 
 /* A macro that tells us whether the function invocation represented
    by FI does not have a frame on the stack associated with it.  If it
@@ -261,6 +262,7 @@ extern CORE_ADDR sh_push_return_address   PARAMS ((CORE_ADDR, CORE_ADDR));
 #define PUSH_RETURN_ADDRESS(PC, SP)  sh_push_return_address (PC, SP)
 
 
+extern CORE_ADDR sh_frame_chain PARAMS ((struct frame_info *));
 #define FRAME_CHAIN(FRAME)           sh_frame_chain(FRAME)
 #define PUSH_DUMMY_FRAME             generic_push_dummy_frame ()
 #define FRAME_CHAIN_VALID(FP, FRAME) generic_frame_chain_valid (FP, FRAME)
@@ -275,6 +277,7 @@ extern CORE_ADDR sh_push_return_address   PARAMS ((CORE_ADDR, CORE_ADDR));
 /* Discard from the stack the innermost frame, restoring all saved
    registers.  */
 
+extern void sh_pop_frame PARAMS ((void));
 #define POP_FRAME sh_pop_frame();
 
 #define NOP   {0x20, 0x0b}
@@ -285,3 +288,5 @@ extern CORE_ADDR sh_push_return_address   PARAMS ((CORE_ADDR, CORE_ADDR));
 
 /* Need this for WinGDB.  See gdb/mswin/{regdoc.h, gdbwin.c, gui.cpp}.  */
 #define TARGET_SH
+
+extern int sh_set_processor_type PARAMS ((char *));
diff --git a/gdb/sh-tdep.c b/gdb/sh-tdep.c
index 57075d9f3a..7c7002aa79 100644
--- a/gdb/sh-tdep.c
+++ b/gdb/sh-tdep.c
@@ -26,12 +26,14 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #include "frame.h"
 #include "obstack.h"
 #include "symtab.h"
+#include "symfile.h"
 #include "gdbtypes.h"
 #include "gdbcmd.h"
 #include "gdbcore.h"
 #include "value.h"
 #include "dis-asm.h"
 #include "inferior.h"		/* for BEFORE_TEXT_END etc. */
+#include "gdb_string.h"
 
 extern int remote_write_size;	/* in remote.c */
 
@@ -531,7 +533,8 @@ sh_push_return_address (pc, sp)
         <destination>
   */
 
-int
+#if 0
+void
 sh_fix_call_dummy (dummy, pc, fun, nargs, args, type, gcc_p)
      char *dummy;
      CORE_ADDR pc;
@@ -543,6 +546,7 @@ sh_fix_call_dummy (dummy, pc, fun, nargs, args, type, gcc_p)
 {
   *(unsigned long *) (dummy + 8) = fun;
 }
+#endif
 
 /* Function: get_saved_register
    Just call the generic_get_saved_register function.  */