diff --git a/src/bin/pg_dump/common.c b/src/bin/pg_dump/common.c
index fc737d59ac2..f4b4a1e5bbb 100644
--- a/src/bin/pg_dump/common.c
+++ b/src/bin/pg_dump/common.c
@@ -11,7 +11,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/bin/pg_dump/common.c,v 1.92 2006/08/01 18:05:04 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/bin/pg_dump/common.c,v 1.93 2006/09/27 15:41:23 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -24,10 +24,6 @@
 
 #include <ctype.h>
 
-#ifndef HAVE_STRDUP
-#include "strdup.h"
-#endif
-
 
 /*
  * Variables for mapping DumpId to DumpableObject
diff --git a/src/bin/pg_dump/pg_backup_db.c b/src/bin/pg_dump/pg_backup_db.c
index a5ca77c545b..362e053165e 100644
--- a/src/bin/pg_dump/pg_backup_db.c
+++ b/src/bin/pg_dump/pg_backup_db.c
@@ -5,7 +5,7 @@
  *	Implements the basic DB functions used by the archiver.
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_db.c,v 1.73 2006/07/18 17:42:00 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_db.c,v 1.74 2006/09/27 15:41:23 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -21,9 +21,6 @@
 #include <termios.h>
 #endif
 
-#ifndef HAVE_STRDUP
-#include "strdup.h"
-#endif
 
 static const char *modulename = gettext_noop("archiver (db)");
 
diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c
index fbf131f5779..8e243d0d417 100644
--- a/src/bin/pg_dump/pg_dump.c
+++ b/src/bin/pg_dump/pg_dump.c
@@ -12,7 +12,7 @@
  *	by PostgreSQL
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/bin/pg_dump/pg_dump.c,v 1.448 2006/09/22 21:39:57 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/bin/pg_dump/pg_dump.c,v 1.449 2006/09/27 15:41:23 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -34,10 +34,6 @@
 #include <termios.h>
 #endif
 
-#ifndef HAVE_STRDUP
-#include "strdup.h"
-#endif
-
 #include "getopt_long.h"
 
 #ifndef HAVE_INT_OPTRESET
diff --git a/src/bin/pg_dump/pg_dumpall.c b/src/bin/pg_dump/pg_dumpall.c
index 190863ae349..2a18d2cfe2a 100644
--- a/src/bin/pg_dump/pg_dumpall.c
+++ b/src/bin/pg_dump/pg_dumpall.c
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
- * $PostgreSQL: pgsql/src/bin/pg_dump/pg_dumpall.c,v 1.81 2006/07/14 14:52:26 momjian Exp $
+ * $PostgreSQL: pgsql/src/bin/pg_dump/pg_dumpall.c,v 1.82 2006/09/27 15:41:23 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -19,9 +19,6 @@
 #ifdef ENABLE_NLS
 #include <locale.h>
 #endif
-#ifndef HAVE_STRDUP
-#include "strdup.h"
-#endif
 
 #include "getopt_long.h"
 
diff --git a/src/bin/pg_dump/pg_restore.c b/src/bin/pg_dump/pg_restore.c
index 474973ffda9..1625dc49d16 100644
--- a/src/bin/pg_dump/pg_restore.c
+++ b/src/bin/pg_dump/pg_restore.c
@@ -34,7 +34,7 @@
  *
  *
  * IDENTIFICATION
- *		$PostgreSQL: pgsql/src/bin/pg_dump/pg_restore.c,v 1.80 2006/08/01 18:21:44 momjian Exp $
+ *		$PostgreSQL: pgsql/src/bin/pg_dump/pg_restore.c,v 1.81 2006/09/27 15:41:23 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -43,10 +43,6 @@
 
 #include <ctype.h>
 
-#ifndef HAVE_STRDUP
-#include "strdup.h"
-#endif
-
 #ifdef HAVE_TERMIOS_H
 #include <termios.h>
 #endif
diff --git a/src/bin/psql/common.c b/src/bin/psql/common.c
index 81323ad0d63..ded8ecf2b1c 100644
--- a/src/bin/psql/common.c
+++ b/src/bin/psql/common.c
@@ -3,15 +3,12 @@
  *
  * Copyright (c) 2000-2006, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/bin/psql/common.c,v 1.128 2006/08/29 22:48:55 tgl Exp $
+ * $PostgreSQL: pgsql/src/bin/psql/common.c,v 1.129 2006/09/27 15:41:23 tgl Exp $
  */
 #include "postgres_fe.h"
 #include "common.h"
 
 #include <ctype.h>
-#ifndef HAVE_STRDUP
-#include <strdup.h>
-#endif
 #include <signal.h>
 #ifndef WIN32
 #include <sys/time.h>
diff --git a/src/include/strdup.h b/src/include/strdup.h
deleted file mode 100644
index 3b379360bac..00000000000
--- a/src/include/strdup.h
+++ /dev/null
@@ -1,8 +0,0 @@
-/* This is the prototype for the strdup() function which is distributed
-   with Postgres.  That strdup() is only needed on those systems that
-   don't already have strdup() in their system libraries.
-
-   The Postgres strdup() is in src/port/strdup.c.
-*/
-
-extern char *strdup(char const *);
diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
index f69539d7478..0dca43803f1 100644
--- a/src/interfaces/libpq/fe-connect.c
+++ b/src/interfaces/libpq/fe-connect.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/interfaces/libpq/fe-connect.c,v 1.335 2006/09/15 21:34:23 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/interfaces/libpq/fe-connect.c,v 1.336 2006/09/27 15:41:24 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -22,10 +22,6 @@
 #include <time.h>
 #include <unistd.h>
 
-#ifndef HAVE_STRDUP
-#include "strdup.h"
-#endif
-
 #include "libpq-fe.h"
 #include "libpq-int.h"
 #include "fe-auth.h"
diff --git a/src/interfaces/libpq/fe-secure.c b/src/interfaces/libpq/fe-secure.c
index 91315e37904..d886179f6d2 100644
--- a/src/interfaces/libpq/fe-secure.c
+++ b/src/interfaces/libpq/fe-secure.c
@@ -11,7 +11,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/interfaces/libpq/fe-secure.c,v 1.86 2006/09/04 14:57:27 petere Exp $
+ *	  $PostgreSQL: pgsql/src/interfaces/libpq/fe-secure.c,v 1.87 2006/09/27 15:41:24 tgl Exp $
  *
  * NOTES
  *	  [ Most of these notes are wrong/obsolete, but perhaps not all ]
@@ -109,10 +109,6 @@
 #endif
 #endif
 
-#ifndef HAVE_STRDUP
-#include "strdup.h"
-#endif
-
 #ifdef USE_SSL
 #include <openssl/ssl.h>
 #endif   /* USE_SSL */
diff --git a/src/port/strdup.c b/src/port/strdup.c
index 75c6321709c..b7c87a4a35e 100644
--- a/src/port/strdup.c
+++ b/src/port/strdup.c
@@ -8,15 +8,13 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/port/strdup.c,v 1.11 2006/07/14 04:59:30 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/port/strdup.c,v 1.12 2006/09/27 15:41:24 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
 
 #include "c.h"
 
-#include "strdup.h"
-
 
 char *
 strdup(const char *string)