diff --git a/src/Makefile.am b/src/Makefile.am
index 3430531..a06a859 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -13,9 +13,9 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see .
-GETOPT_C = getopt.c getopt1.c
+GETOPT_C =
-noinst_HEADERS = cddb.h getopt.h util.h
+noinst_HEADERS = cddb.h util.h
####################################################
# Things to make the utility/diagnostic programs
diff --git a/src/cd-drive.c b/src/cd-drive.c
index c179da9..744d7ba 100644
--- a/src/cd-drive.c
+++ b/src/cd-drive.c
@@ -24,7 +24,6 @@
#ifdef HAVE_SYS_TYPES_H
#include
#endif
-#include "getopt.h"
#include
#include
diff --git a/src/cd-info.c b/src/cd-info.c
index 525256e..7ba3089 100644
--- a/src/cd-info.c
+++ b/src/cd-info.c
@@ -23,7 +23,6 @@
*/
#include "util.h"
-#include "getopt.h"
#ifdef HAVE_STDARG_H
#include
diff --git a/src/cd-read.c b/src/cd-read.c
index 4e9a6bb..1d4473c 100644
--- a/src/cd-read.c
+++ b/src/cd-read.c
@@ -31,8 +31,6 @@
#include
#endif
-#include "getopt.h"
-
/* Configuration option codes */
enum {
OP_HANDLED = 0,
diff --git a/src/cdda-player.c b/src/cdda-player.c
index c7c1af1..77fab0d 100644
--- a/src/cdda-player.c
+++ b/src/cdda-player.c
@@ -75,7 +75,6 @@
#include
#include "cddb.h"
-#include "getopt.h"
static void action(const char *psz_action);
static void display_cdinfo(CdIo_t *p_cdio, track_t i_tracks,
diff --git a/src/iso-info.c b/src/iso-info.c
index 6449552..a61c17c 100644
--- a/src/iso-info.c
+++ b/src/iso-info.c
@@ -17,7 +17,6 @@
/*
ISO Info - prints various information about a ISO 9660 image.
*/
-#include "getopt.h"
#include "util.h"
#undef err_exit
diff --git a/src/iso-read.c b/src/iso-read.c
index 5290c50..16ed08a 100644
--- a/src/iso-read.c
+++ b/src/iso-read.c
@@ -43,8 +43,6 @@
#include
#endif
-#include "getopt.h"
-
#define CEILING(x, y) ((x+(y-1))/y)
/* Used by `main' to communicate with `parse_opt'. And global options
diff --git a/src/mmc-tool.c b/src/mmc-tool.c
index 77fb67c..e995566 100644
--- a/src/mmc-tool.c
+++ b/src/mmc-tool.c
@@ -35,7 +35,6 @@
#include
#include
#include
-#include "getopt.h"
static void
init(const char *argv0)