Index: Makefile.in
--- Makefile.in.orig	2017-07-10 04:32:16.000000000 +0200
+++ Makefile.in	2017-09-23 09:39:09.860938000 +0200
@@ -1842,7 +1842,7 @@
 lib_LTLIBRARIES = libarchive.la
 noinst_LTLIBRARIES = libarchive_fe.la
 man_MANS = $(libarchive_man_MANS) $(bsdtar_man_MANS) $(bsdcpio_man_MANS) $(bsdcat_man_MANS)
-BUILT_SOURCES = libarchive/test/list.h tar/test/list.h cpio/test/list.h cat/test/list.h
+BUILT_SOURCES =
 TESTS_ENVIRONMENT = $(libarchive_TESTS_ENVIRONMENT) $(bsdtar_TESTS_ENVIRONMENT) $(bsdcpio_TESTS_ENVIRONMENT) $(bsdcat_TESTS_ENVIRONMENT)
 # Always build and test both bsdtar and bsdcpio as part of 'distcheck'
 DISTCHECK_CONFIGURE_FLAGS = --enable-bsdtar --enable-bsdcpio
Index: cpio/cmdline.c
--- cpio/cmdline.c.orig	2016-12-03 07:52:27.000000000 +0100
+++ cpio/cmdline.c	2017-09-23 09:39:09.861247000 +0200
@@ -56,7 +56,7 @@
 /*
  * Long options for cpio.  Please keep this sorted.
  */
-static const struct option {
+static const struct libarchive_option {
 	const char *name;
 	int required;	/* 1 if this option requires an argument */
 	int equivalent;	/* Equivalent short option. */
@@ -112,7 +112,7 @@
 	static int state = state_start;
 	static char *opt_word;
 
-	const struct option *popt, *match = NULL, *match2 = NULL;
+	const struct libarchive_option *popt, *match = NULL, *match2 = NULL;
 	const char *p, *long_prefix = "--";
 	size_t optlength;
 	int opt = '?';