diff --git a/hawk/Makefile.in b/hawk/Makefile.in
index dee05b45..3fbc1475 100644
--- a/hawk/Makefile.in
+++ b/hawk/Makefile.in
@@ -167,8 +167,8 @@ am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/ac/ar-lib \
 	$(top_srcdir)/ac/compile $(top_srcdir)/ac/config.guess \
 	$(top_srcdir)/ac/config.sub $(top_srcdir)/ac/install-sh \
 	$(top_srcdir)/ac/ltmain.sh $(top_srcdir)/ac/missing ac/ar-lib \
-	ac/compile ac/config.guess ac/config.sub ac/install-sh \
-	ac/ltmain.sh ac/missing
+	ac/compile ac/config.guess ac/config.sub ac/depcomp \
+	ac/install-sh ac/ltmain.sh ac/missing
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
diff --git a/hawk/configure b/hawk/configure
index 06cdd5b7..5c2c4916 100755
--- a/hawk/configure
+++ b/hawk/configure
@@ -18634,7 +18634,23 @@ fi
 
 done
 
-for ac_header in netinet/in.h sys/un.h netpacket/packet.h net/if_dl.h
+for ac_header in netinet/in.h sys/un.h netpacket/packet.h net/if.h net/if_dl.h
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "
+	#include <sys/types.h>
+	#include <sys/socket.h>
+"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+for ac_header in sys/stropts.h sys/macstat.h linux/ethtool.h linux/sockios.h
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
diff --git a/hawk/configure.ac b/hawk/configure.ac
index 6d821107..f90b07ee 100644
--- a/hawk/configure.ac
+++ b/hawk/configure.ac
@@ -185,7 +185,10 @@ AC_CHECK_HEADERS([time.h sys/time.h utime.h spawn.h execinfo.h ucontext.h])
 AC_CHECK_HEADERS([sys/resource.h sys/wait.h sys/syscall.h sys/ioctl.h])
 AC_CHECK_HEADERS([dlfcn.h ltdl.h sys/mman.h])
 AC_CHECK_HEADERS([sys/devpoll.h sys/epoll.h poll.h sys/event.h])
-AC_CHECK_HEADERS([netinet/in.h sys/un.h netpacket/packet.h net/if_dl.h])
+AC_CHECK_HEADERS([netinet/in.h sys/un.h netpacket/packet.h net/if.h net/if_dl.h], [], [], [
+	#include <sys/types.h>
+	#include <sys/socket.h>])
+AC_CHECK_HEADERS([sys/stropts.h sys/macstat.h linux/ethtool.h linux/sockios.h])
 AC_CHECK_HEADERS([ffi.h dyncall.h libunwind.h quadmath.h])
 
 dnl check data types
diff --git a/hawk/lib/gem-skad.c b/hawk/lib/gem-skad.c
index ba611983..e88595af 100644
--- a/hawk/lib/gem-skad.c
+++ b/hawk/lib/gem-skad.c
@@ -340,7 +340,7 @@ TODO
 					const hawk_ooch_t* stmp = p;
 					unsigned int index;
 					do p++; while (p < end);
-					if (hawk_nwifwcsntoindex (stmp, p - stmp, &index) <= -1) return -1;
+					if (hawk_nwifwcsntoindex(stmp, p - stmp, &index) <= -1) return -1;
 					skad->in6.sin6_scope_id = index;
 #endif
 				}
diff --git a/hawk/lib/hawk-cfg.h.in b/hawk/lib/hawk-cfg.h.in
index 71bd5e36..7ddd500a 100644
--- a/hawk/lib/hawk-cfg.h.in
+++ b/hawk/lib/hawk-cfg.h.in
@@ -238,6 +238,12 @@
 /* Define to 1 if you have the <libunwind.h> header file. */
 #undef HAVE_LIBUNWIND_H
 
+/* Define to 1 if you have the <linux/ethtool.h> header file. */
+#undef HAVE_LINUX_ETHTOOL_H
+
+/* Define to 1 if you have the <linux/sockios.h> header file. */
+#undef HAVE_LINUX_SOCKIOS_H
+
 /* Define to 1 if you have the `localtime_r' function. */
 #undef HAVE_LOCALTIME_R
 
@@ -307,6 +313,9 @@
 /* Define to 1 if you have the <net/if_dl.h> header file. */
 #undef HAVE_NET_IF_DL_H
 
+/* Define to 1 if you have the <net/if.h> header file. */
+#undef HAVE_NET_IF_H
+
 /* Define to 1 if you have the `pipe2' function. */
 #undef HAVE_PIPE2
 
@@ -500,6 +509,9 @@
 /* Define to 1 if you have the <sys/ioctl.h> header file. */
 #undef HAVE_SYS_IOCTL_H
 
+/* Define to 1 if you have the <sys/macstat.h> header file. */
+#undef HAVE_SYS_MACSTAT_H
+
 /* Define to 1 if you have the <sys/mman.h> header file. */
 #undef HAVE_SYS_MMAN_H
 
@@ -513,6 +525,9 @@
 /* Define to 1 if you have the <sys/stat.h> header file. */
 #undef HAVE_SYS_STAT_H
 
+/* Define to 1 if you have the <sys/stropts.h> header file. */
+#undef HAVE_SYS_STROPTS_H
+
 /* Define to 1 if you have the <sys/syscall.h> header file. */
 #undef HAVE_SYS_SYSCALL_H
 
diff --git a/hawk/lib/hawk-chr.h b/hawk/lib/hawk-chr.h
index fff225af..a4205788 100644
--- a/hawk/lib/hawk-chr.h
+++ b/hawk/lib/hawk-chr.h
@@ -52,8 +52,8 @@ enum hawk_ooch_prop_t
 #define HAWK_BCH_PROP_XDIGIT HAWK_OOCH_PROP_XDIGIT
 
 	HAWK_OOCH_PROP_ALNUM  = (1 << 5),
-#define HAWK_UCH_PROP_ALNUM HAWK_OOCH_PROP_XDIGIT
-#define HAWK_BCH_PROP_ALNUM HAWK_OOCH_PROP_XDIGIT
+#define HAWK_UCH_PROP_ALNUM HAWK_OOCH_PROP_ALNUM
+#define HAWK_BCH_PROP_ALNUM HAWK_OOCH_PROP_ALNUM
 
 	HAWK_OOCH_PROP_SPACE  = (1 << 6),
 #define HAWK_UCH_PROP_SPACE HAWK_OOCH_PROP_SPACE
diff --git a/hawk/lib/parse.c b/hawk/lib/parse.c
index 1e312e9b..0683c1d5 100644
--- a/hawk/lib/parse.c
+++ b/hawk/lib/parse.c
@@ -28,13 +28,13 @@
 
 #if !defined(HAWK_DEFAULT_MODPREFIX)
 #	if defined(_WIN32)
-#		define HAWK_DEFAULT_MODPREFIX "hawkawk-"
+#		define HAWK_DEFAULT_MODPREFIX "hawk-"
 #	elif defined(__OS2__)
-#		define HAWK_DEFAULT_MODPREFIX "awk-"
+#		define HAWK_DEFAULT_MODPREFIX "hawk"
 #	elif defined(__DOS__)
-#		define HAWK_DEFAULT_MODPREFIX "awk-"
+#		define HAWK_DEFAULT_MODPREFIX "hawk"
 #	else
-#		define HAWK_DEFAULT_MODPREFIX "libhawkawk-"
+#		define HAWK_DEFAULT_MODPREFIX "libhawk-"
 #	endif
 #endif