Index: configure
--- configure.orig	2019-02-09 17:23:00.000000000 +0100
+++ configure	2019-02-10 09:34:05.084007000 +0100
@@ -22266,6 +22266,7 @@
                                     #if HAVE_UNISTD_H
                                     #include <unistd.h>
                                     #endif
+                                    #include "getopt.h"
                                     }
 int
 main ()
@@ -22298,6 +22299,7 @@
                                     #if HAVE_UNISTD_H
                                     #include <unistd.h>
                                     #endif
+                                    #include "getopt.h"
                                     }
 int
 main ()
@@ -22331,13 +22333,7 @@
                                    #if HAVE_STDIO_H
                                    #include <stdio.h>
                                    #endif
-                                   #if HAVE_GETOPT_H
-                                   #include <getopt.h>
-                                   #else
-                                   #if HAVE_UNISTD_H
-                                   #include <unistd.h>
-                                   #endif
-                                   #endif
+                                   #include "getopt.h"
                                    }
 int
 main ()
@@ -24251,13 +24247,7 @@
                                    #if HAVE_STDIO_H
                                    #include <stdio.h>
                                    #endif
-                                   #if HAVE_GETOPT_H
-                                   #include <getopt.h>
-                                   #else
-                                   #if HAVE_UNISTD_H
-                                   #include <unistd.h>
-                                   #endif
-                                   #endif
+                                   #include "getopt.h"
                                    }
 int
 main ()
@@ -24287,13 +24277,7 @@
                                    #if HAVE_STDIO_H
                                    #include <stdio.h>
                                    #endif
-                                   #if HAVE_GETOPT_H
-                                   #include <getopt.h>
-                                   #else
-                                   #if HAVE_UNISTD_H
-                                   #include <unistd.h>
-                                   #endif
-                                   #endif
+                                   #include "getopt.h"
                                    }
 int
 main ()
Index: src/dar_suite/getopt_decision.h
--- src/dar_suite/getopt_decision.h.orig	2019-02-09 16:13:32.000000000 +0100
+++ src/dar_suite/getopt_decision.h	2019-02-10 09:32:52.580265000 +0100
@@ -29,18 +29,7 @@
 
 #include "../my_config.h"
 
-#if HAVE_GETOPT_LONG
- #if HAVE_GETOPT_IN_UNISTD_H
-  #if HAVE_GETOPT_LONG_IN_UNISTD_H
-    // we do not need to include <getopt.h>
-  #else // we miss getopt_long but have getopt
-    #include "my_getopt_long.h"
-  #endif
- #else // no getopt() in unistd.h
-    // we assume that if unistd.h does not know getopt() it does nor know getopt_long()
-  #include <getopt.h>
- #endif
-#endif
+#include "getopt.h"
 
 #ifndef EOF
 #define EOF -1