6 files changed, 8 insertions, 22 deletions
diff --git a/gdb/gdbserver/low-hppabsd.c b/gdb/gdbserver/low-hppabsd.c
index d031e30..5719915 100644
--- a/gdb/gdbserver/low-hppabsd.c
+++ b/gdb/gdbserver/low-hppabsd.c
@@ -18,7 +18,7 @@
    Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
-#include "defs.h"
+#include "server.h"
 #include <sys/wait.h>
 #include "frame.h"
 #include "inferior.h"
@@ -41,8 +41,6 @@ char *registers = my_registers;
 #include <machine/reg.h>
 
 extern int errno;
-extern int inferior_pid;
-void perror_with_name ();
 
 /* Start an inferior process and returns its pid.
    ALLARGS is a vector of program-name and args. */
diff --git a/gdb/gdbserver/low-linux.c b/gdb/gdbserver/low-linux.c
index c718c4e..ce57d32 100644
--- a/gdb/gdbserver/low-linux.c
+++ b/gdb/gdbserver/low-linux.c
@@ -18,7 +18,7 @@
    Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
-#include "defs.h"
+#include "server.h"
 #include <sys/wait.h>
 #include "frame.h"
 #include "inferior.h"
@@ -47,8 +47,6 @@ char *registers = my_registers;
 #endif
 
 extern int errno;
-extern int inferior_pid;
-void perror_with_name ();
 
 static void initialize_arch (void);
 
diff --git a/gdb/gdbserver/low-nbsd.c b/gdb/gdbserver/low-nbsd.c
index fc54845..0ff8524 100644
--- a/gdb/gdbserver/low-nbsd.c
+++ b/gdb/gdbserver/low-nbsd.c
@@ -17,7 +17,7 @@ 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.  */
 
-#include "defs.h"
+#include "server.h"
 #include <sys/types.h>
 #include <sys/wait.h>
 #include "frame.h"
@@ -34,11 +34,6 @@ char *registers = my_registers;
 #include <sys/ptrace.h>
 #include <machine/reg.h>
 
-// extern int sys_nerr;
-// extern char **sys_errlist;
-extern int inferior_pid;
-void perror_with_name ();
-
 #define RF(dst, src) \
 	memcpy(&registers[REGISTER_BYTE(dst)], &src, sizeof(src))
 
diff --git a/gdb/gdbserver/low-sim.c b/gdb/gdbserver/low-sim.c
index a0a9aa6..d82aad1 100644
--- a/gdb/gdbserver/low-sim.c
+++ b/gdb/gdbserver/low-sim.c
@@ -18,9 +18,8 @@
    Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
-#include "defs.h"
-#include "bfd.h"
 #include "server.h"
+#include "bfd.h"
 #include "callback.h"		/* GDB simulator callback interface */
 #include "remote-sim.h"		/* GDB simulator interface */
 
@@ -41,7 +40,7 @@ static SIM_DESC gdbsim_desc = 0;
    does not support loading itself.  */
 
 static void
-generic_load (bfd *loadfile_bfd)
+mygeneric_load (bfd *loadfile_bfd)
 {
   asection *s;
 
@@ -131,7 +130,7 @@ create_inferior (char *program, char **argv)
   /* Load the program into the simulator.  */
   if (abfd)
     if (sim_load (gdbsim_desc, program, NULL, 0) == SIM_RC_FAIL)
-      generic_load (abfd);
+      mygeneric_load (abfd);
 
   /* Create an inferior process in the simulator.  This initializes SP.  */
   sim_create_inferior (gdbsim_desc, abfd, argv, /* env */ NULL);
diff --git a/gdb/gdbserver/low-sparc.c b/gdb/gdbserver/low-sparc.c
index 34e4192..b7f3486 100644
--- a/gdb/gdbserver/low-sparc.c
+++ b/gdb/gdbserver/low-sparc.c
@@ -18,7 +18,7 @@
    Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
-#include "defs.h"
+#include "server.h"
 #include <sys/wait.h>
 #include "frame.h"
 #include "inferior.h"
@@ -46,8 +46,6 @@ char *registers = my_registers;
 extern int sys_nerr;
 extern char **sys_errlist;
 extern int errno;
-extern int inferior_pid;
-void perror_with_name ();
 
 /* Start an inferior process and returns its pid.
    ALLARGS is a vector of program-name and args. */
diff --git a/gdb/gdbserver/low-sun3.c b/gdb/gdbserver/low-sun3.c
index e1e64b6..17a64b5 100644
--- a/gdb/gdbserver/low-sun3.c
+++ b/gdb/gdbserver/low-sun3.c
@@ -18,7 +18,7 @@
    Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
-#include "defs.h"
+#include "server.h"
 #include "<sys/wait.h>"
 #include "frame.h"
 #include "inferior.h"
@@ -43,8 +43,6 @@ char *registers = my_registers;
 extern int sys_nerr;
 extern char **sys_errlist;
 extern int errno;
-extern int inferior_pid;
-void perror_with_name ();
 
 /* Start an inferior process and returns its pid.
    ALLARGS is a vector of program-name and args. */