Index: Makefile.in
--- Makefile.in.orig	2024-04-26 11:23:18.000000000 +0200
+++ Makefile.in	2024-05-05 08:24:46.612362000 +0200
@@ -2714,7 +2714,7 @@
 lib_LTLIBRARIES = libarchive.la
 noinst_LTLIBRARIES = libarchive_fe.la
 man_MANS = $(libarchive_man_MANS) $(bsdtar_man_MANS) $(bsdcpio_man_MANS) $(bsdcat_man_MANS) $(bsdunzip_man_MANS)
-BUILT_SOURCES = libarchive/test/list.h tar/test/list.h cpio/test/list.h cat/test/list.h unzip/test/list.h
+BUILT_SOURCES =
 TESTS_ENVIRONMENT = $(libarchive_TESTS_ENVIRONMENT) $(bsdtar_TESTS_ENVIRONMENT) $(bsdcpio_TESTS_ENVIRONMENT) $(bsdcat_TESTS_ENVIRONMENT) $(bsdunzip_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	2024-04-26 11:22:58.000000000 +0200
+++ cpio/cmdline.c	2024-05-05 08:28:47.669181000 +0200
@@ -55,7 +55,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. */
@@ -114,7 +114,7 @@
 	static int state = state_start;
 	static char *opt_word;
 
-	const struct option *popt, *match, *match2;
+	const struct libarchive_option *popt, *match, *match2;
 	const char *p, *long_prefix;
 	size_t optlength;
 	int opt;
