diff --git a/stand/i386/libi386/Makefile b/stand/i386/libi386/Makefile
--- a/stand/i386/libi386/Makefile
+++ b/stand/i386/libi386/Makefile
@@ -10,9 +10,6 @@
 	elf64_freebsd.c multiboot.c multiboot_tramp.S relocater_tramp.S \
 	i386_copy.c i386_module.c nullconsole.c pxe.c pxetramp.S \
 	time.c vidconsole.c vbe.c amd64_tramp.S spinconsole.c
-.PATH:	${ZFSSRC}
-SRCS+=  devicename_stubs.c
-CFLAGS+= -I${ZFSSRC}
 
 .PATH:	${SYSDIR}/teken
 SRCS+=	teken.c
@@ -44,8 +41,6 @@
 
 CFLAGS+=	-I${BOOTSRC}/ficl -I${BOOTSRC}/ficl/i386 \
 		-I${LDRSRC} -I${BOOTSRC}/i386/common \
-		-I${SYSDIR}/cddl/boot/zfs \
-		-I${SYSDIR}/cddl/contrib/opensolaris/uts/common \
 		-I${SYSDIR}/contrib/dev/acpica/include
 
 # Handle FreeBSD specific %b and %D printf format specifiers
diff --git a/stand/libofw/Makefile b/stand/libofw/Makefile
--- a/stand/libofw/Makefile
+++ b/stand/libofw/Makefile
@@ -7,10 +7,6 @@
 SRCS=	devicename.c ofw_console.c ofw_copy.c ofw_disk.c \
 	ofw_memory.c ofw_module.c ofw_net.c ofw_reboot.c \
 	ofw_time.c openfirm.c
-.PATH:	${ZFSSRC}
-SRCS+=  devicename_stubs.c
-CFLAGS+=	-I${ZFSSRC} -I${SYSDIR}/cddl/boot/zfs
-CFLAGS+=	-I${SYSDIR}/cddl/contrib/opensolaris/uts/common
 
 # Pick up the bootstrap header for some interface items
 CFLAGS+=	-I${LDRSRC}
diff --git a/stand/libsa/zfs/devicename_stubs.c b/stand/libsa/zfs/devicename_stubs.c
deleted file mode 100644
--- a/stand/libsa/zfs/devicename_stubs.c
+++ /dev/null
@@ -1,40 +0,0 @@
-/*-
- * Copyright (c) 2012 Andriy Gapon <avg@FreeBSD.org>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <stand.h>
-#include "libzfs.h"
-
-__attribute__((weak))
-char *
-zfs_fmtdev(struct devdesc *vdev)
-{
-    static char	buf[128];
-
-    return (buf);
-}