diff --git a/include/Makefile.am b/include/Makefile.am index 17286ecbb7..4da43afd85 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -17,7 +17,6 @@ USER_H = \ libzfs.h \ libzfsbootenv.h \ libzfs_core.h \ - libzfs_impl.h \ libzutil.h \ thread_pool.h diff --git a/lib/libshare/libshare.c b/lib/libshare/libshare.c index d32a282a36..a228645fbf 100644 --- a/lib/libshare/libshare.c +++ b/lib/libshare/libshare.c @@ -36,7 +36,6 @@ #include #include #include -#include "libzfs_impl.h" #include "libshare_impl.h" #include "nfs.h" #include "smb.h" diff --git a/lib/libshare/os/freebsd/nfs.c b/lib/libshare/os/freebsd/nfs.c index 323c9269f1..b82491f2eb 100644 --- a/lib/libshare/os/freebsd/nfs.c +++ b/lib/libshare/os/freebsd/nfs.c @@ -42,7 +42,7 @@ __FBSDID("$FreeBSD$"); #include #include -#include "libzfs_impl.h" +#include #include "libshare_impl.h" #include "nfs.h" diff --git a/lib/libzfs/Makefile.am b/lib/libzfs/Makefile.am index 31267fd9a5..9385eb1aad 100644 --- a/lib/libzfs/Makefile.am +++ b/lib/libzfs/Makefile.am @@ -16,6 +16,7 @@ lib_LTLIBRARIES = libzfs.la include $(top_srcdir)/config/Abigail.am USER_C = \ + libzfs_impl.h \ libzfs_changelist.c \ libzfs_config.c \ libzfs_crypto.c \ diff --git a/include/libzfs_impl.h b/lib/libzfs/libzfs_impl.h similarity index 100% rename from include/libzfs_impl.h rename to lib/libzfs/libzfs_impl.h diff --git a/lib/libzfs/libzfs_import.c b/lib/libzfs/libzfs_import.c index 64fa31c67d..0d375b3551 100644 --- a/lib/libzfs/libzfs_import.c +++ b/lib/libzfs/libzfs_import.c @@ -36,7 +36,7 @@ #include #include #include -#include +#include "libzfs_impl.h" #include #include diff --git a/lib/libzfs/os/freebsd/libzfs_compat.c b/lib/libzfs/os/freebsd/libzfs_compat.c index 3c5f684c68..4d7421df8d 100644 --- a/lib/libzfs/os/freebsd/libzfs_compat.c +++ b/lib/libzfs/os/freebsd/libzfs_compat.c @@ -23,7 +23,7 @@ * Copyright (c) 2013 Martin Matuska . All rights reserved. */ #include -#include +#include "../../libzfs_impl.h" #include #include #include diff --git a/lib/libzfs/os/freebsd/libzfs_zmount.c b/lib/libzfs/os/freebsd/libzfs_zmount.c index 699d330ebd..e1febe6a2d 100644 --- a/lib/libzfs/os/freebsd/libzfs_zmount.c +++ b/lib/libzfs/os/freebsd/libzfs_zmount.c @@ -43,7 +43,7 @@ __FBSDID("$FreeBSD$"); #include #include -#include "libzfs_impl.h" +#include "../../libzfs_impl.h" static void build_iovec(struct iovec **iov, int *iovlen, const char *name, void *val, diff --git a/lib/libzfs/os/linux/libzfs_mount_os.c b/lib/libzfs/os/linux/libzfs_mount_os.c index 21d6405386..547895d7e3 100644 --- a/lib/libzfs/os/linux/libzfs_mount_os.c +++ b/lib/libzfs/os/linux/libzfs_mount_os.c @@ -47,7 +47,7 @@ #include #include -#include "libzfs_impl.h" +#include "../../libzfs_impl.h" #include #define ZS_COMMENT 0x00000000 /* comment */ diff --git a/lib/libzfs/os/linux/libzfs_pool_os.c b/lib/libzfs/os/linux/libzfs_pool_os.c index 747b5652f7..90eb8db507 100644 --- a/lib/libzfs/os/linux/libzfs_pool_os.c +++ b/lib/libzfs/os/linux/libzfs_pool_os.c @@ -49,7 +49,7 @@ #include "zfs_namecheck.h" #include "zfs_prop.h" -#include "libzfs_impl.h" +#include "../../libzfs_impl.h" #include "zfs_comutil.h" #include "zfeature_common.h" diff --git a/lib/libzfs/os/linux/libzfs_sendrecv_os.c b/lib/libzfs/os/linux/libzfs_sendrecv_os.c index ac7ab95a39..593c38ec62 100644 --- a/lib/libzfs/os/linux/libzfs_sendrecv_os.c +++ b/lib/libzfs/os/linux/libzfs_sendrecv_os.c @@ -22,7 +22,7 @@ #include -#include "libzfs_impl.h" +#include "../../libzfs_impl.h" #ifndef F_SETPIPE_SZ #define F_SETPIPE_SZ (F_SETLEASE + 7) diff --git a/lib/libzfs/os/linux/libzfs_util_os.c b/lib/libzfs/os/linux/libzfs_util_os.c index e2482c5713..b116f92d97 100644 --- a/lib/libzfs/os/linux/libzfs_util_os.c +++ b/lib/libzfs/os/linux/libzfs_util_os.c @@ -38,7 +38,7 @@ #include #include -#include "libzfs_impl.h" +#include "../../libzfs_impl.h" #include "zfs_prop.h" #include #include