diff --git a/src/backend/port/hpux/port-protos.h b/src/backend/port/hpux/port-protos.h
index 7b4fad99fa70c43273d364ef41ab9d76a59eb896..dbf43ce5f1adba9265ccd43cc027e0e59ded1008 100644
--- a/src/backend/port/hpux/port-protos.h
+++ b/src/backend/port/hpux/port-protos.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: port-protos.h,v 1.4 1997/09/08 02:26:23 momjian Exp $
+ * $Id: port-protos.h,v 1.5 1997/12/19 22:45:57 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -27,8 +27,5 @@
 extern int	init_address_fixup(void);
 extern double rint(double x);
 extern double cbrt(double x);
-extern long random(void);
-extern void srandom(unsigned seed);
-extern int	getrusage(int who, struct rusage * ru);
 
 #endif							/* PORT_PROTOS_H */
diff --git a/src/backend/port/i386_solaris/port-protos.h b/src/backend/port/i386_solaris/port-protos.h
index dd5d73418a22e62453d630c548c49340253855fc..0739e2142813a1a7121df9ba24ffb91913d07a60 100644
--- a/src/backend/port/i386_solaris/port-protos.h
+++ b/src/backend/port/i386_solaris/port-protos.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: port-protos.h,v 1.3 1997/09/08 02:26:27 momjian Exp $
+ * $Id: port-protos.h,v 1.4 1997/12/19 22:45:59 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -31,8 +31,4 @@
 #define pg_dlclose		dlclose
 #define pg_dlerror		dlerror
 
-/* port.c */
-extern long random(void);
-extern void srandom(int seed);
-
 #endif							/* PORT_PROTOS_H */
diff --git a/src/backend/port/irix5/port-protos.h b/src/backend/port/irix5/port-protos.h
index 2babb773e0fdee37814fe444a993044c958887f2..a7fcfa991cc40a275603d69510997dfe9f48740e 100644
--- a/src/backend/port/irix5/port-protos.h
+++ b/src/backend/port/irix5/port-protos.h
@@ -31,7 +31,4 @@
 #define pg_dlclose		dlclose
 #define pg_dlerror		dlerror
 
-/* port.c */
-extern long random(void);
-
 #endif							/* PORT_PROTOS_H */
diff --git a/src/backend/port/sparc_solaris/port-protos.h b/src/backend/port/sparc_solaris/port-protos.h
index 3f15b052c932c3301be1d0e9da6b57d0bab85885..11434e254b5dc6f1831c1da83da826c137b6f29e 100644
--- a/src/backend/port/sparc_solaris/port-protos.h
+++ b/src/backend/port/sparc_solaris/port-protos.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: port-protos.h,v 1.7 1997/09/18 16:09:14 scrappy Exp $
+ * $Id: port-protos.h,v 1.8 1997/12/19 22:46:15 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -35,22 +35,4 @@
 #define pg_dlclose		dlclose
 #define pg_dlerror		dlerror
 
-/* port.c */
-#ifndef HAVE_RANDOM
-extern long random(void);
-#endif
-#ifndef HAVE_SRANDOM
-extern void srandom(int seed);
-#endif
-
-/* inet_aton.c in backend/port directory */
-extern int	inet_aton(const char *cp, struct in_addr * addr);
-
-/* In system library, but can't find prototype in system library .h files */
-extern int	gethostname(char *name, int namelen);
-
-/* In system library, but can't find prototype in system library .h files */
-#include <sys/resource.h>
-extern int	getrusage(int who, struct rusage * rusage);
-
 #endif							/* PORT_PROTOS_H */
diff --git a/src/backend/port/svr4/port-protos.h b/src/backend/port/svr4/port-protos.h
index 3926b253429bfa10ed66eb9335b823c69ba18ab7..97d23fe6ac8397409ba394fbbb9d9d4a12ba13e1 100644
--- a/src/backend/port/svr4/port-protos.h
+++ b/src/backend/port/svr4/port-protos.h
@@ -31,8 +31,4 @@
 #define pg_dlclose		dlclose
 #define pg_dlerror		dlerror
 
-/* port.c */
-extern long random(void);
-extern void srandom(int seed);
-
 #endif							/* PORT_PROTOS_H */
diff --git a/src/backend/port/ultrix4/port-protos.h b/src/backend/port/ultrix4/port-protos.h
index 091e8528418fc3a9a16009deb1002352e9e4f6c7..fc3b40c7629a42168f44c2fa219c0125da6eac15 100644
--- a/src/backend/port/ultrix4/port-protos.h
+++ b/src/backend/port/ultrix4/port-protos.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: port-protos.h,v 1.7 1997/09/08 02:27:36 momjian Exp $
+ * $Id: port-protos.h,v 1.8 1997/12/19 22:46:47 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -40,15 +40,4 @@ extern int	syscall();
 
 extern void init_address_fixup(void);
 
-/* strdup.c: strdup() is not part of libc on Ultrix */
-extern char *strdup(char const *);
-
-/* inet_aton() is not part of libc on Ultrix.  The following is from
-   backend/port/inet_aton.h
-*/
-
-struct in_addr;
-int
-			inet_aton(const char *cp, struct in_addr * addr);
-
 #endif							/* PORT_PORTOS_H */
diff --git a/src/backend/port/univel/frontend-port-protos.h b/src/backend/port/univel/frontend-port-protos.h
deleted file mode 100644
index 215633b6b72959e8a1fe322e74dba04b55975f4d..0000000000000000000000000000000000000000
--- a/src/backend/port/univel/frontend-port-protos.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*-------------------------------------------------------------------------
- *
- * port-protos.h--
- *	  port-specific prototypes for Intel x86/Intel SVR4
- *
- *
- * Copyright (c) 1994, Regents of the University of California
- *
- * port-protos.h,v 1.2 1995/03/17 06:40:18 andrew Exp
- *
- *-------------------------------------------------------------------------
- */
-#ifndef FPORT_PROTOS_H
-#define FPORT_PROTOS_H
-
-/* port.c */
-extern long random(void);
-extern void srandom(int seed);
-extern int	strcasecmp(char *s1, char *s2);
-extern int	gethostname(char *name, int namelen);
-
-#endif							/* FPORT_PROTOS_H */
diff --git a/src/backend/port/univel/port-protos.h b/src/backend/port/univel/port-protos.h
index a4af145110a34434b01f53c8d7ad766d65317644..97d23fe6ac8397409ba394fbbb9d9d4a12ba13e1 100644
--- a/src/backend/port/univel/port-protos.h
+++ b/src/backend/port/univel/port-protos.h
@@ -31,10 +31,4 @@
 #define pg_dlclose		dlclose
 #define pg_dlerror		dlerror
 
-/* port.c */
-extern long random(void);
-extern void srandom(int seed);
-extern int	strcasecmp(char *s1, char *s2);
-extern int	gethostname(char *name, int namelen);
-
 #endif							/* PORT_PROTOS_H */
diff --git a/src/include/config.h.in b/src/include/config.h.in
index a3b4d181d4368492dba6d37f74201477816a45ab..cad0854013bc96b19e390d52c373337f8152f0db 100644
--- a/src/include/config.h.in
+++ b/src/include/config.h.in
@@ -58,6 +58,9 @@
 
 /* Set to 1 if you have gethostname() */
 #undef HAVE_GETHOSTNAME
+#ifndef GETHOSTNAME
+extern int  gethostname(char *name, int namelen);
+#endif
 
 /* Set to 1 if you have int timezone */
 #undef HAVE_INT_TIMEZONE
@@ -67,6 +70,9 @@
 
 /* Set to 1 if you have inet_aton() */
 #undef HAVE_INET_ATON
+#ifndef HAVE_INET_ATON
+extern int  inet_aton(const char *cp, struct in_addr * addr);
+#endif
 
 /* Set to 1 if you have fcvt() */
 #undef HAVE_FCVT
@@ -104,14 +110,29 @@
 /* Set to 1 if you have sigprocmask() */
 #undef HAVE_SIGPROCMASK
 
+/* Set to 1 if you have sigprocmask() */
+#undef HAVE_STRCASECMP
+#ifndef HAVE_STRCASECMP
+extern int  strcasecmp(char *s1, char *s2);
+#endif
+
 /* Set to 1 if you have strdup() */
 #undef HAVE_STRDUP
+#ifndef HAVE_STRDUP
+extern char *strdup(char const *);
+#endif
 
 /* Set to 1 if you have random() */
 #undef HAVE_RANDOM
+#ifndef HAVE_RANDOM
+extern long random(void);
+#endif
 
 /* Set to 1 if you have srandom() */
 #undef HAVE_SRANDOM
+#ifndef HAVE_SRANDOM
+extern void srandom(int seed);
+#endif
 
 /* Set to 1 if you have libreadline.a */
 #undef HAVE_LIBREADLINE