diff --git a/lib/libbe/be.h b/lib/libbe/be.h
--- a/lib/libbe/be.h
+++ b/lib/libbe/be.h
@@ -29,12 +29,11 @@
 #define _LIBBE_H
 
 #include <libnvpair.h>
+#include <libzfs.h>
 #include <stdbool.h>
 
 #define BE_MAXPATHLEN    512
 
-typedef struct libbe_handle libbe_handle_t;
-
 typedef enum be_error {
 	BE_ERR_SUCCESS = 0,     /* No error */
 	BE_ERR_INVALIDNAME,     /* invalid boot env name */
@@ -60,6 +59,17 @@
 	BE_ERR_HASCLONES,	/* snapshot has clones */
 } be_error_t;
 
+typedef struct libbe_handle {
+	char root[BE_MAXPATHLEN];
+	char rootfs[BE_MAXPATHLEN];
+	char bootfs[BE_MAXPATHLEN];
+	char *bootonce;
+	size_t altroot_len;
+	zpool_handle_t *active_phandle;
+	libzfs_handle_t *lzh;
+	be_error_t error;
+	bool print_on_err;
+} libbe_handle_t;
 
 /* Library handling functions: be.c */
 libbe_handle_t *libbe_init(const char *root);
diff --git a/lib/libbe/be_impl.h b/lib/libbe/be_impl.h
--- a/lib/libbe/be_impl.h
+++ b/lib/libbe/be_impl.h
@@ -28,22 +28,8 @@
 #ifndef _LIBBE_IMPL_H
 #define _LIBBE_IMPL_H
 
-#include <libzfs.h>
-
 #include "be.h"
 
-struct libbe_handle {
-	char root[BE_MAXPATHLEN];
-	char rootfs[BE_MAXPATHLEN];
-	char bootfs[BE_MAXPATHLEN];
-	char *bootonce;
-	size_t altroot_len;
-	zpool_handle_t *active_phandle;
-	libzfs_handle_t *lzh;
-	be_error_t error;
-	bool print_on_err;
-};
-
 struct libbe_deep_clone {
 	libbe_handle_t *lbh;
 	const char *bename;