1 files changed, 4 insertions, 4 deletions
diff --git a/mergecap.c b/mergecap.c
index 2f493c895e..bf58298cca 100644
--- a/mergecap.c
+++ b/mergecap.c
@@ -27,8 +27,10 @@
 #include <string.h>
 #include "wtap.h"
 
-#ifdef NEED_GETOPT_H
-#include "getopt.h"
+#ifdef HAVE_GETOPT_H
+#include <getopt.h>
+#else
+#include "wsgetopt.h"
 #endif
 
 #include "svnversion.h"
@@ -140,8 +142,6 @@ static void list_encap_types(void) {
 int
 main(int argc, char *argv[])
 {
-  extern char *optarg;
-  extern int   optind;
   int          opt;
   gboolean     do_append     = FALSE;
   gboolean     verbose       = FALSE;