libspl/include: remove unused/empty headers

Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Ahelenia Ziemiańska <[email protected]>
Closes #13447

24 files changed, 6 insertions, 604 deletions

diff --git a/include/libzfs.h b/include/libzfs.h
index 04f464d12..46cb60520 100644
--- a/include/libzfs.h
+++ b/include/libzfs.h
@@ -40,10 +40,8 @@
 #include <sys/mnttab.h>
 #include <sys/param.h>
 #include <sys/types.h>
-#include <sys/varargs.h>
 #include <sys/fs/zfs.h>
 #include <sys/avl.h>
-#include <ucred.h>
 #include <libzfs_core.h>
 
 #ifdef	__cplusplus
diff --git a/include/thread_pool.h b/include/thread_pool.h
index 43090c3c6..19edebd7d 100644
--- a/include/thread_pool.h
+++ b/include/thread_pool.h
@@ -28,7 +28,6 @@
 #define	_THREAD_POOL_H_ extern __attribute__((visibility("default")))
 
 #include <sys/types.h>
-#include <thread.h>
 #include <pthread.h>
 
 #ifdef	__cplusplus
diff --git a/lib/libspl/include/Makefile.am b/lib/libspl/include/Makefile.am
index 2c0284310..6f0e1818d 100644
--- a/lib/libspl/include/Makefile.am
+++ b/lib/libspl/include/Makefile.am
@@ -2,18 +2,11 @@ libspldir = $(includedir)/libspl
 libspl_HEADERS = \
 	%D%/assert.h \
 	%D%/atomic.h \
-	%D%/libdevinfo.h \
 	%D%/libgen.h \
 	%D%/libshare.h \
-	%D%/limits.h \
-	%D%/locale.h \
 	%D%/statcommon.h \
 	%D%/stdlib.h \
 	%D%/string.h \
-	%D%/stropts.h \
-	%D%/thread.h \
-	%D%/tzfile.h \
-	%D%/ucred.h \
 	%D%/umem.h \
 	%D%/unistd.h \
 	%D%/zone.h
@@ -40,8 +33,6 @@ libspl_sys_HEADERS = \
 	%D%/sys/dkio.h \
 	%D%/sys/dklabel.h \
 	%D%/sys/feature_tests.h \
-	%D%/sys/int_limits.h \
-	%D%/sys/int_types.h \
 	%D%/sys/inttypes.h \
 	%D%/sys/isa_defs.h \
 	%D%/sys/kmem.h \
@@ -59,7 +50,6 @@ libspl_sys_HEADERS = \
 	%D%/sys/stack.h \
 	%D%/sys/stdtypes.h \
 	%D%/sys/string.h \
-	%D%/sys/stropts.h \
 	%D%/sys/sunddi.h \
 	%D%/sys/systeminfo.h \
 	%D%/sys/time.h \
@@ -67,10 +57,7 @@ libspl_sys_HEADERS = \
 	%D%/sys/trace_zfs.h \
 	%D%/sys/types.h \
 	%D%/sys/types32.h \
-	%D%/sys/tzfile.h \
 	%D%/sys/uio.h \
-	%D%/sys/va_list.h \
-	%D%/sys/varargs.h \
 	%D%/sys/vnode.h \
 	%D%/sys/wmsum.h \
 	%D%/sys/zone.h
diff --git a/lib/libspl/include/libdevinfo.h b/lib/libspl/include/libdevinfo.h
deleted file mode 100644
index be1d291f4..000000000
--- a/lib/libspl/include/libdevinfo.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
- * or http://www.opensolaris.org/os/licensing.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information: Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- */
-/*
- * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
- */
-
-#ifndef _LIBSPL_LIBDEVINFO_H
-#define	_LIBSPL_LIBDEVINFO_H
-
-#endif /* _LIBSPL_LIBDEVINFO_H */
diff --git a/lib/libspl/include/limits.h b/lib/libspl/include/limits.h
deleted file mode 100644
index 5d996eb84..000000000
--- a/lib/libspl/include/limits.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
- * or http://www.opensolaris.org/os/licensing.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information: Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- */
-/*
- * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
- */
-
-#include_next <limits.h>
-#include <float.h>
-
-#ifndef _LIBSPL_LIMITS_H
-#define	_LIBSPL_LIMITS_H
-
-#ifndef DBL_DIG
-#define	DBL_DIG		15
-#define	DBL_MAX		1.7976931348623157081452E+308
-#define	DBL_MIN		2.2250738585072013830903E-308
-#endif
-
-#ifndef FLT_DIG
-#define	FLT_DIG		6
-#define	FLT_MAX		3.4028234663852885981170E+38F
-#define	FLT_MIN		1.1754943508222875079688E-38F
-#endif
-
-#endif /* _LIBSPL_LIMITS_H */
diff --git a/lib/libspl/include/locale.h b/lib/libspl/include/locale.h
deleted file mode 100644
index 6c74df720..000000000
--- a/lib/libspl/include/locale.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
- * or http://www.opensolaris.org/os/licensing.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information: Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- */
-/*
- * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
- */
-
-#include_next <locale.h>
-
-#ifndef _LIBSPL_LOCALE_H
-#define	_LIBSPL_LOCALE_H
-
-#include <time.h>
-#include <sys/time.h>
-
-#endif
diff --git a/lib/libspl/include/os/freebsd/sys/byteorder.h b/lib/libspl/include/os/freebsd/sys/byteorder.h
index cd692d361..d4227ddc5 100644
--- a/lib/libspl/include/os/freebsd/sys/byteorder.h
+++ b/lib/libspl/include/os/freebsd/sys/byteorder.h
@@ -43,7 +43,7 @@
 #include <sys/endian.h>
 #include <netinet/in.h>
 #include <sys/isa_defs.h>
-#include <sys/int_types.h>
+#include <inttypes.h>
 
 #if defined(__GNUC__) && defined(_ASM_INLINES) && \
 	(defined(__i386) || defined(__amd64))
diff --git a/lib/libspl/include/os/freebsd/sys/mnttab.h b/lib/libspl/include/os/freebsd/sys/mnttab.h
index c08349bdf..54c1bc59a 100644
--- a/lib/libspl/include/os/freebsd/sys/mnttab.h
+++ b/lib/libspl/include/os/freebsd/sys/mnttab.h
@@ -79,7 +79,7 @@ extern int _sol_getmntent(FILE *fp, struct mnttab *mp);
 extern int getextmntent(const char *path, struct extmnttab *entry,
     struct stat64 *statbuf);
 extern void statfs2mnttab(struct statfs *sfs, struct mnttab *mp);
-char *hasmntopt(struct mnttab *mnt, char *opt);
-int getmntent(FILE *fp, struct mnttab *mp);
+extern char *hasmntopt(struct mnttab *mnt, char *opt);
+extern int getmntent(FILE *fp, struct mnttab *mp);
 
 #endif
diff --git a/lib/libspl/include/os/freebsd/sys/zfs_context_os.h b/lib/libspl/include/os/freebsd/sys/zfs_context_os.h
index b9bf487c2..9b9d69bdd 100644
--- a/lib/libspl/include/os/freebsd/sys/zfs_context_os.h
+++ b/lib/libspl/include/os/freebsd/sys/zfs_context_os.h
@@ -30,6 +30,5 @@
 #define	ZFS_CONTEXT_OS_H_
 
 #define	HAVE_LARGE_STACKS	1
-#define	ZFS_EXPORTS_PATH	"/etc/zfs/exports"
 
 #endif
diff --git a/lib/libspl/include/os/linux/sys/byteorder.h b/lib/libspl/include/os/linux/sys/byteorder.h
index d5ee3e26f..47af7700f 100644
--- a/lib/libspl/include/os/linux/sys/byteorder.h
+++ b/lib/libspl/include/os/linux/sys/byteorder.h
@@ -46,7 +46,7 @@
 #endif
 
 #include <sys/isa_defs.h>
-#include <sys/int_types.h>
+#include <inttypes.h>
 
 #ifdef	__cplusplus
 extern "C" {
diff --git a/lib/libspl/include/stropts.h b/lib/libspl/include/stropts.h
deleted file mode 100644
index 37acd4052..000000000
--- a/lib/libspl/include/stropts.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License (the "License").
- * You may not use this file except in compliance with the License.
- *
- * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
- * or http://www.opensolaris.org/os/licensing.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information: Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- */
-
-#ifndef _LIBSPL_STROPTS_H
-#define	_LIBSPL_STROPTS_H
-
-#endif /* _LIBSPL_STROPTS_H */
diff --git a/lib/libspl/include/sys/int_limits.h b/lib/libspl/include/sys/int_limits.h
deleted file mode 100644
index 7af68cdb2..000000000
--- a/lib/libspl/include/sys/int_limits.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
- * or http://www.opensolaris.org/os/licensing.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information: Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- */
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
- */
-
-#ifndef _LIBSPL_SYS_INT_LIMITS_H
-#define	_LIBSPL_SYS_INT_LIMITS_H
-
-#endif
diff --git a/lib/libspl/include/sys/int_types.h b/lib/libspl/include/sys/int_types.h
deleted file mode 100644
index 51e9e0285..000000000
--- a/lib/libspl/include/sys/int_types.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
- * or http://www.opensolaris.org/os/licensing.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information: Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- */
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
- */
-
-#ifndef _SOL_SYS_INT_TYPES_H
-#define	_SOL_SYS_INT_TYPES_H
-
-#include <inttypes.h>
-
-#endif
diff --git a/lib/libspl/include/sys/kstat.h b/lib/libspl/include/sys/kstat.h
index 7f9aa6d8d..c2de07784 100644
--- a/lib/libspl/include/sys/kstat.h
+++ b/lib/libspl/include/sys/kstat.h
@@ -92,39 +92,6 @@ typedef struct kstat {
 	void		*ks_lock;	/* protects this kstat's data */
 } kstat_t;
 
-#ifdef _SYSCALL32
-
-typedef int32_t kid32_t;
-
-typedef struct kstat32 {
-	/*
-	 * Fields relevant to both kernel and user
-	 */
-	hrtime_t	ks_crtime;
-	caddr32_t	ks_next;		/* struct kstat pointer */
-	kid32_t		ks_kid;
-	char		ks_module[KSTAT_STRLEN];
-	uint8_t		ks_resv;
-	int32_t		ks_instance;
-	char		ks_name[KSTAT_STRLEN];
-	uint8_t		ks_type;
-	char		ks_class[KSTAT_STRLEN];
-	uint8_t		ks_flags;
-	caddr32_t	ks_data;		/* type-specific data */
-	uint32_t	ks_ndata;
-	size32_t	ks_data_size;
-	hrtime_t	ks_snaptime;
-	/*
-	 * Fields relevant to kernel only (only needed here for padding)
-	 */
-	int32_t		_ks_update;
-	caddr32_t	_ks_private;
-	int32_t		_ks_snapshot;
-	caddr32_t	_ks_lock;
-} kstat32_t;
-
-#endif	/* _SYSCALL32 */
-
 /*
  * kstat structure and locking strategy
  *
@@ -467,7 +434,7 @@ typedef struct kstat_named {
  * 64-bit compilation environments or 32-bit non-maximally conformant
  * C89 or C90 ANSI C compilation environments (cc -Xt and cc -Xa). In the
  * C99 ANSI C compilation environment, the long long type is supported.
- * The _INT64_TYPE is defined by the implementation (see sys/int_types.h).
+ * The _INT64_TYPE is defined by the implementation (see sys/inttypes.h).
  */
 #if defined(_INT64_TYPE)
 		int64_t		i64;
diff --git a/lib/libspl/include/sys/stropts.h b/lib/libspl/include/sys/stropts.h
deleted file mode 100644
index 08c2e79bc..000000000
--- a/lib/libspl/include/sys/stropts.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License (the "License").
- * You may not use this file except in compliance with the License.
- *
- * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
- * or http://www.opensolaris.org/os/licensing.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information: Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- */
-/*
- * Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
- */
-
-#ifndef _LIBSPL_SYS_STROPTS_H
-#define	_LIBSPL_SYS_STROPTS_H
-
-#endif /* _LIBSPL_SYS_STROPTS_H */
diff --git a/lib/libspl/include/sys/types.h b/lib/libspl/include/sys/types.h
index ea02ffac9..f32c2188a 100644
--- a/lib/libspl/include/sys/types.h
+++ b/lib/libspl/include/sys/types.h
@@ -37,7 +37,7 @@
 #include <sys/feature_tests.h>
 #include_next <sys/types.h>
 #include <sys/types32.h>
-#include <sys/va_list.h>
+#include <stdarg.h>
 #include <sys/stdtypes.h>
 
 #ifndef HAVE_INTTYPES
diff --git a/lib/libspl/include/sys/tzfile.h b/lib/libspl/include/sys/tzfile.h
deleted file mode 100644
index e30e75663..000000000
--- a/lib/libspl/include/sys/tzfile.h
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License (the "License").
- * You may not use this file except in compliance with the License.
- *
- * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
- * or http://www.opensolaris.org/os/licensing.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information: Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- */
-/*
- * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
- */
-
-/*
- *	from Arthur Olson's 6.1
- */
-
-#ifndef _LIBSPL_SYS_TZFILE_H
-#define	_LIBSPL_SYS_TZFILE_H
-
-#ifdef	__cplusplus
-extern "C" {
-#endif
-
-/*
- * Information about time zone files.
- */
-
-#define	TZDIR	"/usr/share/lib/zoneinfo" /* Time zone object file directory */
-
-#define	TZDEFAULT	(getenv("TZ"))
-
-#define	TZDEFRULES	"posixrules"
-
-/*
- * Each file begins with. . .
- */
-
-struct tzhead {
-	char	tzh_reserved[24];	/* reserved for future use */
-	char	tzh_ttisstdcnt[4];	/* coded number of trans. time flags */
-	char	tzh_leapcnt[4];		/* coded number of leap seconds */
-	char	tzh_timecnt[4];		/* coded number of transition times */
-	char	tzh_typecnt[4];		/* coded number of local time types */
-	char	tzh_charcnt[4];		/* coded number of abbr. chars */
-};
-
-/*
- * . . .followed by. . .
- *
- *	tzh_timecnt (char [4])s		coded transition times a la time(2)
- *	tzh_timecnt (unsigned char)s	types of local time starting at above
- *	tzh_typecnt repetitions of
- *		one (char [4])		coded GMT offset in seconds
- *		one (unsigned char)	used to set tm_isdst
- *		one (unsigned char)	that's an abbreviation list index
- *	tzh_charcnt (char)s		'\0'-terminated zone abbreviations
- *	tzh_leapcnt repetitions of
- *		one (char [4])		coded leap second transition times
- *		one (char [4])		total correction after above
- *	tzh_ttisstdcnt (char)s		indexed by type; if TRUE, transition
- *					time is standard time, if FALSE,
- *					transition time is wall clock time
- *					if absent, transition times are
- *					assumed to be wall clock time
- */
-
-/*
- * In the current implementation, "tzset()" refuses to deal with files that
- * exceed any of the limits below.
- */
-
-/*
- * The TZ_MAX_TIMES value below is enough to handle a bit more than a
- * year's worth of solar time (corrected daily to the nearest second) or
- * 138 years of Pacific Presidential Election time
- * (where there are three time zone transitions every fourth year).
- */
-#define	TZ_MAX_TIMES	370
-
-#define	TZ_MAX_TYPES	256	/* Limited by what (unsigned char)'s can hold */
-
-#define	TZ_MAX_CHARS	50	/* Maximum number of abbreviation characters */
-
-#define	TZ_MAX_LEAPS	50	/* Maximum number of leap second corrections */
-
-#define	SECSPERMIN	60
-#define	MINSPERHOUR	60
-#define	HOURSPERDAY	24
-#define	DAYSPERWEEK	7
-#define	DAYSPERNYEAR	365
-#define	DAYSPERLYEAR	366
-#define	SECSPERHOUR	(SECSPERMIN * MINSPERHOUR)
-#define	SECSPERDAY	((long)SECSPERHOUR * HOURSPERDAY)
-#define	MONSPERYEAR	12
-
-#define	TM_SUNDAY	0
-#define	TM_MONDAY	1
-#define	TM_TUESDAY	2
-#define	TM_WEDNESDAY	3
-#define	TM_THURSDAY	4
-#define	TM_FRIDAY	5
-#define	TM_SATURDAY	6
-
-#define	TM_JANUARY	0
-#define	TM_FEBRUARY	1
-#define	TM_MARCH	2
-#define	TM_APRIL	3
-#define	TM_MAY		4
-#define	TM_JUNE		5
-#define	TM_JULY		6
-#define	TM_AUGUST	7
-#define	TM_SEPTEMBER	8
-#define	TM_OCTOBER	9
-#define	TM_NOVEMBER	10
-#define	TM_DECEMBER	11
-
-#define	TM_YEAR_BASE	1900
-
-#define	EPOCH_YEAR	1970
-#define	EPOCH_WDAY	TM_THURSDAY
-
-/*
- * Accurate only for the past couple of centuries;
- * that will probably do.
- */
-
-#define	isleap(y) (((y) % 4) == 0 && ((y) % 100) != 0 || ((y) % 400) == 0)
-
-/*
- * Use of the underscored variants may cause problems if you move your code to
- * certain System-V-based systems; for maximum portability, use the
- * underscore-free variants.  The underscored variants are provided for
- * backward compatibility only; they may disappear from future versions of
- * this file.
- */
-
-#define	SECS_PER_MIN	SECSPERMIN
-#define	MINS_PER_HOUR	MINSPERHOUR
-#define	HOURS_PER_DAY	HOURSPERDAY
-#define	DAYS_PER_WEEK	DAYSPERWEEK
-#define	DAYS_PER_NYEAR	DAYSPERNYEAR
-#define	DAYS_PER_LYEAR	DAYSPERLYEAR
-#define	SECS_PER_HOUR	SECSPERHOUR
-#define	SECS_PER_DAY	SECSPERDAY
-#define	MONS_PER_YEAR	MONSPERYEAR
-
-#ifdef	__cplusplus
-}
-#endif
-
-#endif /* _LIBSPL_SYS_TZFILE_H */
diff --git a/lib/libspl/include/sys/va_list.h b/lib/libspl/include/sys/va_list.h
deleted file mode 100644
index a36f5c77d..000000000
--- a/lib/libspl/include/sys/va_list.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
- * or http://www.opensolaris.org/os/licensing.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information: Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- */
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
- */
-
-#ifndef _SYS_VA_LIST_H
-#define	_SYS_VA_LIST_H
-
-#include <stdarg.h>
-
-#endif
diff --git a/lib/libspl/include/sys/varargs.h b/lib/libspl/include/sys/varargs.h
deleted file mode 100644
index 3d00a3361..000000000
--- a/lib/libspl/include/sys/varargs.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
- * or http://www.opensolaris.org/os/licensing.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information: Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- */
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
- */
-
-#ifndef _LIBSPL_SYS_VARARGS_H
-#define	_LIBSPL_SYS_VARARGS_H
-
-#endif
diff --git a/lib/libspl/include/thread.h b/lib/libspl/include/thread.h
deleted file mode 100644
index 74694e23e..000000000
--- a/lib/libspl/include/thread.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
- * or http://www.opensolaris.org/os/licensing.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information: Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- */
-/*
- * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
- */
-
-#ifndef _LIBSPL_THREAD_H
-#define	_LIBSPL_THREAD_H
-
-#endif /* _LIBSPL_THREAD_H */
diff --git a/lib/libspl/include/tzfile.h b/lib/libspl/include/tzfile.h
deleted file mode 100644
index 7bd4087cd..000000000
--- a/lib/libspl/include/tzfile.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
- * or http://www.opensolaris.org/os/licensing.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information: Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- */
-/*
- * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
- */
-
-#ifndef _LIBSPL_TZFILE_H
-#define	_LIBSPL_TZFILE_H
-
-#include <sys/tzfile.h>
-
-#endif /* _LIBSPL_TZFILE_H */
diff --git a/lib/libspl/include/ucred.h b/lib/libspl/include/ucred.h
deleted file mode 100644
index 8178fdec4..000000000
--- a/lib/libspl/include/ucred.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
- * or http://www.opensolaris.org/os/licensing.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information: Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- */
-/*
- * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
- */
-
-#ifndef _LIBSPL_UCRED_H
-#define	_LIBSPL_UCRED_H
-
-typedef int ucred_t;
-
-#endif
diff --git a/lib/libzfs/libzfs_dataset.c b/lib/libzfs/libzfs_dataset.c
index 50053e35f..1f6addcae 100644
--- a/lib/libzfs/libzfs_dataset.c
+++ b/lib/libzfs/libzfs_dataset.c
@@ -49,7 +49,6 @@
 #include <sys/mount.h>
 #include <pwd.h>
 #include <grp.h>
-#include <ucred.h>
 #ifdef HAVE_IDMAP
 #include <idmap.h>
 #include <aclutils.h>
diff --git a/lib/libzfs/libzfs_diff.c b/lib/libzfs/libzfs_diff.c
index e8b8a1dfc..a414024bb 100644
--- a/lib/libzfs/libzfs_diff.c
+++ b/lib/libzfs/libzfs_diff.c
@@ -41,7 +41,6 @@
 #include <unistd.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <stropts.h>
 #include <pthread.h>
 #include <sys/zfs_ioctl.h>
 #include <libzfs.h>