Index: sys/cddl/contrib/opensolaris/uts/common/fs/zfs/lua/lbaselib.c
===================================================================
--- sys/cddl/contrib/opensolaris/uts/common/fs/zfs/lua/lbaselib.c
+++ sys/cddl/contrib/opensolaris/uts/common/fs/zfs/lua/lbaselib.c
@@ -17,10 +17,17 @@
 
 #include <sys/zfs_context.h>
 #include <sys/ctype.h>
+
+#if defined(__FreeBSD__)
+#include <ctype.h>
+#endif
+
+#if !defined(__FreeBSD__)
 #ifdef illumos
 #define	toupper(C)	(((C) >= 'a' && (C) <= 'z')? (C) - 'a' + 'A': (C))
 #else
 #define	isalnum(C)	(isalpha(C) || isdigit(C))
+#endif
 #endif
 
 #define lbaselib_c
Index: sys/cddl/contrib/opensolaris/uts/common/fs/zfs/lua/lstrlib.c
===================================================================
--- sys/cddl/contrib/opensolaris/uts/common/fs/zfs/lua/lstrlib.c
+++ sys/cddl/contrib/opensolaris/uts/common/fs/zfs/lua/lstrlib.c
@@ -7,6 +7,9 @@
 
 #include <sys/ctype.h>
 #include <sys/zfs_context.h>
+#if defined(__FreeBSD__)
+#include <ctype.h>
+#endif
 
 #define lstrlib_c
 #define LUA_LIB
@@ -32,6 +35,7 @@
 /*
  * PATCHED: add missing character macros.
  */
+#if !defined(__FreeBSD__)
 #ifdef illumos
 #define tolower(C)	(((C) >= 'A' && (C) <= 'Z') ? (C) - 'A' + 'a' : (C))
 #define toupper(C)      (((C) >= 'a' && (C) <= 'z') ? (C) - 'a' + 'A': (C))
@@ -45,6 +49,7 @@
     ((C) >= 0x3A && (C) <= 0x40) || \
     ((C) >= 0x5B && (C) <= 0x60) || \
     ((C) >= 0x7B && (C) <= 0x7E))
+#endif
 
 /*
  * The provided version of sprintf returns a char *, but str_format expects