diff --git a/stand/efi/libefi/Makefile b/stand/efi/libefi/Makefile
--- a/stand/efi/libefi/Makefile
+++ b/stand/efi/libefi/Makefile
@@ -11,6 +11,7 @@
 	efi_console.c \
 	efi_driver_utils.c \
 	efichar.c \
+	eficom.c \
 	efienv.c \
 	efihttp.c \
 	efinet.c \
diff --git a/stand/efi/loader/efiserialio.c b/stand/efi/libefi/eficom.c
rename from stand/efi/loader/efiserialio.c
rename to stand/efi/libefi/eficom.c
--- a/stand/efi/loader/efiserialio.c
+++ b/stand/efi/libefi/eficom.c
@@ -34,8 +34,6 @@
 #include <efi.h>
 #include <efilib.h>
 
-#include "loader_efi.h"
-
 static EFI_GUID serial = SERIAL_IO_PROTOCOL;
 
 #define	COMC_TXWAIT	0x40000		/* transmit timeout */
diff --git a/stand/efi/loader/arch/amd64/Makefile.inc b/stand/efi/loader/arch/amd64/Makefile.inc
--- a/stand/efi/loader/arch/amd64/Makefile.inc
+++ b/stand/efi/loader/arch/amd64/Makefile.inc
@@ -5,7 +5,6 @@
 	elf64_freebsd.c \
 	trap.c \
 	multiboot2.c \
-	efiserialio.c \
 	exc.S
 
 .PATH:	${BOOTSRC}/i386/libi386
diff --git a/stand/efi/loader/arch/arm/Makefile.inc b/stand/efi/loader/arch/arm/Makefile.inc
--- a/stand/efi/loader/arch/arm/Makefile.inc
+++ b/stand/efi/loader/arch/arm/Makefile.inc
@@ -1,7 +1,6 @@
 # $FreeBSD$
 
 SRCS+=	exec.c \
-	efiserialio.c \
 	start.S
 
 HAVE_FDT=yes
diff --git a/stand/efi/loader/arch/arm64/Makefile.inc b/stand/efi/loader/arch/arm64/Makefile.inc
--- a/stand/efi/loader/arch/arm64/Makefile.inc
+++ b/stand/efi/loader/arch/arm64/Makefile.inc
@@ -3,7 +3,6 @@
 HAVE_FDT=yes
 
 SRCS+=	exec.c \
-	efiserialio.c \
 	start.S
 
 .PATH:	${BOOTSRC}/arm64/libarm64
diff --git a/stand/efi/loader/arch/riscv/Makefile.inc b/stand/efi/loader/arch/riscv/Makefile.inc
--- a/stand/efi/loader/arch/riscv/Makefile.inc
+++ b/stand/efi/loader/arch/riscv/Makefile.inc
@@ -3,5 +3,4 @@
 HAVE_FDT=yes
 
 SRCS+=	exec.c \
-	efiserialio.c \
 	start.S