diff --git a/src/configure.in b/src/configure.in
index 932797d1879893b6dd9a406c190d19a2854e1563..a8dcfe1da9cab1263f30ffacb6cd4930789d5577 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -582,12 +582,10 @@ AC_CHECK_HEADERS(dld.h)
 AC_CHECK_HEADERS(endian.h)
 AC_CHECK_HEADERS(float.h)
 AC_CHECK_HEADERS(fp_class.h)
-AC_CHECK_HEADERS(getopt.h)
 AC_CHECK_HEADERS(history.h)
 AC_CHECK_HEADERS(ieeefp.h)
 AC_CHECK_HEADERS(limits.h)
 AC_CHECK_HEADERS(netdb.h)
-AC_CHECK_HEADERS(netinet/in.h)
 AC_CHECK_HEADERS(readline.h)
 AC_CHECK_HEADERS(readline/history.h)
 AC_CHECK_HEADERS(readline/readline.h)
diff --git a/src/include/config.h.in b/src/include/config.h.in
index 25e08767c359ba6fbb1a1ea5480455e28ea6e372..8f1489b05ee6bf4ce1fdaf5fabcd39ad79bed19c 100644
--- a/src/include/config.h.in
+++ b/src/include/config.h.in
@@ -77,9 +77,6 @@
 /* Set to 1 if you have <fp_class.h> */
 #undef HAVE_FP_CLASS_H
 
-/* Set to 1 if you have <getopt.h> */
-#undef HAVE_GETOPT_H
-
 /* Set to 1 if you have <history.h> */
 #undef HAVE_HISTORY_H
 
@@ -92,9 +89,6 @@
 /* Set to 1 if you have <netdb.h> */
 #undef HAVE_NETDB_H
 
-/* Set to 1 if you have <netinet/in.h> */
-#undef HAVE_NETINET_IN_H
-
 /* Set to 1 if you have <readline.h> */
 #undef HAVE_READLINE_H
 
diff --git a/src/interfaces/ecpg/preproc/ecpg.c b/src/interfaces/ecpg/preproc/ecpg.c
index 6bfabd338dee22d3ed363c5007f47b3bddf94054..968293aaf654da29b290ecd932cc28549f811f02 100644
--- a/src/interfaces/ecpg/preproc/ecpg.c
+++ b/src/interfaces/ecpg/preproc/ecpg.c
@@ -4,9 +4,7 @@
 
 #include "postgres.h"
 
-#if HAVE_GETOPT_H
 #include <getopt.h>
-#else
 #include <unistd.h>
 extern int	optind;
 extern char *optarg;