--- ./Makefile.in.orig	2021-07-22 04:39:42 +0000
+++ ./Makefile.in	2021-07-22 04:52:11 +0000
@@ -284,6 +284,7 @@
 am__objects_1 =
 am_libp11_common_la_OBJECTS = common/argv.lo common/attrs.lo \
 	common/array.lo common/buffer.lo common/compat.lo \
+	common/getopt_long.lo \
 	common/constants.lo common/debug.lo common/dict.lo \
 	common/hash.lo common/lexer.lo common/message.lo \
 	common/path.lo common/runtime.lo common/url.lo common/vsock.lo \
@@ -1792,6 +1793,7 @@
 	common/array.c common/array.h \
 	common/buffer.c common/buffer.h \
 	common/compat.c common/compat.h \
+	common/getopt_long.c common/getopt_long.h \
 	common/constants.c common/constants.h \
 	common/debug.c common/debug.h \
 	common/dict.c common/dict.h \
@@ -2636,6 +2638,8 @@
 	common/$(DEPDIR)/$(am__dirstamp)
 common/compat.lo: common/$(am__dirstamp) \
 	common/$(DEPDIR)/$(am__dirstamp)
+common/getopt_long.lo: common/$(am__dirstamp) \
+       common/$(DEPDIR)/$(am__dirstamp)
 common/constants.lo: common/$(am__dirstamp) \
 	common/$(DEPDIR)/$(am__dirstamp)
 common/debug.lo: common/$(am__dirstamp) \
@@ -5702,12 +5706,14 @@
 	-rm -f common/$(DEPDIR)/attrs.Plo
 	-rm -f common/$(DEPDIR)/buffer.Plo
 	-rm -f common/$(DEPDIR)/compat.Plo
+	-rm -f common/$(DEPDIR)/getopt_long.Plo
 	-rm -f common/$(DEPDIR)/constants.Plo
 	-rm -f common/$(DEPDIR)/debug.Plo
 	-rm -f common/$(DEPDIR)/dict.Plo
 	-rm -f common/$(DEPDIR)/frob-getauxval.Po
 	-rm -f common/$(DEPDIR)/frob-getenv.Po
 	-rm -f common/$(DEPDIR)/frob-getprogname.Po
+	-rm -f common/$(DEPDIR)/getopt_long.Plo
 	-rm -f common/$(DEPDIR)/hash.Plo
 	-rm -f common/$(DEPDIR)/lexer.Plo
 	-rm -f common/$(DEPDIR)/library.Plo
@@ -5936,6 +5942,7 @@
 	-rm -f common/$(DEPDIR)/frob-getauxval.Po
 	-rm -f common/$(DEPDIR)/frob-getenv.Po
 	-rm -f common/$(DEPDIR)/frob-getprogname.Po
+	-rm -f common/$(DEPDIR)/getopt_long.Plo
 	-rm -f common/$(DEPDIR)/hash.Plo
 	-rm -f common/$(DEPDIR)/lexer.Plo
 	-rm -f common/$(DEPDIR)/library.Plo
--- ./common/tool.c.orig	2021-07-22 05:20:18 +0000
+++ ./common/tool.c	2021-07-22 05:20:42 +0000
@@ -42,7 +42,7 @@
 
 #include <assert.h>
 #include <ctype.h>
-#include <getopt.h>
+#include "getopt_long.h"
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
--- ./common/tool.h.orig	2021-07-22 05:21:18 +0000
+++ ./common/tool.h	2021-07-22 05:21:52 +0000
@@ -35,7 +35,7 @@
 #ifndef P11_TOOL_H_
 #define P11_TOOL_H_
 
-#include <getopt.h>
+#include "getopt_long.h"
 
 #define P11_TOOL_FALLBACK ""
 
--- ./p11-kit/p11-kit.c.orig	2021-07-22 05:24:50 +0000
+++ ./p11-kit/p11-kit.c	2021-07-22 05:25:08 +0000
@@ -43,7 +43,7 @@
 #include <assert.h>
 #include <ctype.h>
 #include <errno.h>
-#include <getopt.h>
+#include "getopt_long.h"
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
--- ./trust/anchor.c.orig	2021-07-22 05:26:14 +0000
+++ ./trust/anchor.c	2021-07-22 05:26:53 +0000
@@ -50,7 +50,7 @@
 #include "p11-kit/p11-kit.h"
 
 #include <assert.h>
-#include <getopt.h>
+#include "getopt_long.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
--- ./trust/extract.c.orig	2021-07-22 05:27:32 +0000
+++ ./trust/extract.c	2021-07-22 05:27:56 +0000
@@ -52,7 +52,7 @@
 #include <assert.h>
 #include <ctype.h>
 #include <errno.h>
-#include <getopt.h>
+#include "getopt_long.h"
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
--- ./trust/trust.c.orig	2021-07-22 05:28:29 +0000
+++ ./trust/trust.c	2021-07-22 05:28:55 +0000
@@ -48,7 +48,7 @@
 
 #include <assert.h>
 #include <ctype.h>
-#include <getopt.h>
+#include "getopt_long.h"
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>