--- Makefile.inc	Mon Oct  6 17:15:26 2014
+++ Makefile.inc	Mon Oct  6 17:16:54 2014
@@ -2,6 +2,8 @@
 
 .include <bsd.own.mk>
 
+CFLAGS+=	-Dexplicit_bzero=bzero
+
 CFLAGS+=	-I${.CURDIR}/..
 CFLAGS+=	-fstack-protector-all
 
--- umac.c	Mon Oct  6 17:15:27 2014
+++ umac.c	Mon Oct  6 17:16:38 2014
@@ -64,7 +64,7 @@
 /* ---------------------------------------------------------------------- */
 
 #include <sys/types.h>
-#include <endian.h>
+#include <sys/endian.h>
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>