diff --git a/usr.sbin/kgzip/elfhdr.h b/usr.sbin/kgzip/elfhdr.h
index f6891194bdb4..57333b0ad47c 100644
--- a/usr.sbin/kgzip/elfhdr.h
+++ b/usr.sbin/kgzip/elfhdr.h
@@ -27,7 +27,9 @@
  */
 
 #include <sys/types.h>
-#include <machine/elf.h>
+#define	__ELF_WORD_SIZE	32
+#include <sys/elf32.h>
+#include <sys/elf_generic.h>
 #include "kgz.h"
 
 /* Section header indices */
diff --git a/usr.sbin/kgzip/kgzcmp.c b/usr.sbin/kgzip/kgzcmp.c
index 5def73011ccb..740642350e0d 100644
--- a/usr.sbin/kgzip/kgzcmp.c
+++ b/usr.sbin/kgzip/kgzcmp.c
@@ -29,7 +29,6 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/wait.h>
-#include <machine/elf.h>
 
 #include <err.h>
 #include <fcntl.h>