diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index d0e57eec92b..39713e03a6b 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,21 @@
+2000-06-06  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* m68k.c (legitimize_pic_address): Move prototype ...
+	
+	* m68k-protos.h (legitimize_pic_address): ... here.
+
+	* m68k.md (legitimize_pic_address): Delete prototypes.
+	(untyped_call): Invoke GEN_CALL(), not gen_call().
+
+	* nextstep.c: Include system.h and toplev.h.
+	(get_directive_line): Don't prototype.
+	(handle_pragma): Mark parameters with ATTRIBUTE_UNUSED and constify.
+
+	* nextstep.h (handle_pragma): Prototype.
+	(SECTION_FUNCTION): Prototype FUNCTION().  Move prototype of
+	objc_section_init ...
+	(EXTRA_SECTION_FUNCTIONS): ... here.
+
 Tue Jun  6 08:17:26 2000  Richard Kenner  <kenner@vlsi1.ultra.nyu.edu>
 
 	* sdbout.c (struct sdb_file): NAME now const.
diff --git a/gcc/config/m68k/m68k-protos.h b/gcc/config/m68k/m68k-protos.h
index 4c54fe4e76a..b73c628a9ff 100644
--- a/gcc/config/m68k/m68k-protos.h
+++ b/gcc/config/m68k/m68k-protos.h
@@ -61,6 +61,7 @@ extern int general_src_operand PARAMS ((rtx, enum machine_mode));
 extern int nonimmediate_src_operand PARAMS ((rtx, enum machine_mode));
 extern int memory_src_operand PARAMS ((rtx, enum machine_mode));
 extern int pcrel_address PARAMS ((rtx, enum machine_mode));
+extern rtx legitimize_pic_address PARAMS ((rtx, enum machine_mode, rtx));
 #endif /* RTX_CODE */
 
 extern int flags_in_68881 PARAMS ((void));
diff --git a/gcc/config/m68k/m68k.c b/gcc/config/m68k/m68k.c
index f2a32952050..43d3421db41 100644
--- a/gcc/config/m68k/m68k.c
+++ b/gcc/config/m68k/m68k.c
@@ -54,7 +54,6 @@ enum reg_class regno_reg_class[]
 int switch_table_difference_label_flag;
 
 static rtx find_addr_reg PARAMS ((rtx));
-rtx legitimize_pic_address PARAMS ((rtx, enum machine_mode, rtx));
 static const char *singlemove_string PARAMS ((rtx *));
 
 
diff --git a/gcc/config/m68k/m68k.md b/gcc/config/m68k/m68k.md
index dcfb04f3a91..4be439cf06f 100644
--- a/gcc/config/m68k/m68k.md
+++ b/gcc/config/m68k/m68k.md
@@ -509,7 +509,6 @@
          Call legitimize_pic_address with the source, mode, and a relocation
          register (a new pseudo, or the final destination if reload_in_progress
          is set).   Then fall through normally */
-      extern rtx legitimize_pic_address();
       rtx temp = reload_in_progress ? operands[0] : gen_reg_rtx (Pmode);
       operands[1] = legitimize_pic_address (operands[1], SImode, temp);
     }
@@ -955,7 +954,6 @@
          Call legitimize_pic_address with the source, mode, and a relocation
          register (a new pseudo, or the final destination if reload_in_progress
          is set).   Then fall through normally */
-      extern rtx legitimize_pic_address();
       rtx temp = reload_in_progress ? operands[0] : gen_reg_rtx (Pmode);
       operands[1] = legitimize_pic_address (operands[1], SImode, temp);
     }
@@ -6940,7 +6938,7 @@
 {
   int i;
 
-  emit_call_insn (gen_call (operands[0], const0_rtx, NULL, const0_rtx));
+  emit_call_insn (GEN_CALL (operands[0], const0_rtx, NULL, const0_rtx));
 
   for (i = 0; i < XVECLEN (operands[2], 0); i++)
     {
diff --git a/gcc/config/nextstep.c b/gcc/config/nextstep.c
index da5cb0b9820..f15ae04654f 100644
--- a/gcc/config/nextstep.c
+++ b/gcc/config/nextstep.c
@@ -20,9 +20,10 @@ the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
 #include "config.h"
-#include <stdio.h>
+#include "system.h"
 #include "flags.h"
 #include "tree.h"
+#include "toplev.h"
 
 /* Make everything that used to go in the text section really go there.  */
 
@@ -38,8 +39,6 @@ static int pragma_initialized;
 
 static int initial_optimize_flag;
 
-extern char *get_directive_line ();
-
 /* Called from check_newline via the macro HANDLE_PRAGMA.
    FINPUT is the source file input stream.
    CH is the first character after `#pragma'.
@@ -47,9 +46,9 @@ extern char *get_directive_line ();
 
 int
 handle_pragma (p_getc, p_ungetc, pname)
-     int (*  p_getc) PARAMS ((void));
-     void (* p_ungetc) PARAMS ((int));
-     char * pname;
+     int (*  p_getc) PARAMS ((void)) ATTRIBUTE_UNUSED;
+     void (* p_ungetc) PARAMS ((int)) ATTRIBUTE_UNUSED;
+     const char *pname;
 {
   int retval = 0;
 
diff --git a/gcc/config/nextstep.h b/gcc/config/nextstep.h
index e3ede741f42..5c0e828fa03 100644
--- a/gcc/config/nextstep.h
+++ b/gcc/config/nextstep.h
@@ -259,7 +259,7 @@ Boston, MA 02111-1307, USA.  */
 
 #undef	HANDLE_PRAGMA
 #define HANDLE_PRAGMA(GETC, UNGETC, NAME) handle_pragma (GETC, UNGETC, NAME)
-extern int handle_pragma ();
+extern int handle_pragma PARAMS ((int(*)(void), void (*)(int), const char *));
 
 /* Give methods pretty symbol names on NeXT. */
 
@@ -320,10 +320,10 @@ extern int handle_pragma ();
 
 #undef	SECTION_FUNCTION
 #define SECTION_FUNCTION(FUNCTION, SECTION, DIRECTIVE, WAS_TEXT, OBJC)	\
+extern void FUNCTION PARAMS ((void));					\
 void									\
 FUNCTION ()								\
 {									\
-  extern void objc_section_init ();					\
   extern int flag_no_mach_text_sections;				\
   									\
   if (WAS_TEXT && flag_no_mach_text_sections)       			\
@@ -353,6 +353,7 @@ FUNCTION ()								\
 
 #undef	EXTRA_SECTION_FUNCTIONS
 #define EXTRA_SECTION_FUNCTIONS			\
+extern void objc_section_init PARAMS ((void));	\
 SECTION_FUNCTION (const_section,		\
 		  in_const,			\
 		  ".const", 1, 0)		\