diff --git a/qse/configure b/qse/configure
index f52fa4bf..f4e8e009 100755
--- a/qse/configure
+++ b/qse/configure
@@ -17400,7 +17400,7 @@ fi
 
 done
 
-for ac_header in sys/sysctl.h sys/socket.h sys/sockio.h ifaddrs.h
+for ac_header in sys/sysctl.h sys/socket.h sys/sockio.h ifaddrs.h linux/netfilter_ipv4.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/qse/configure.ac b/qse/configure.ac
index aa8ed696..cdf76196 100644
--- a/qse/configure.ac
+++ b/qse/configure.ac
@@ -116,7 +116,7 @@ AC_CHECK_HEADERS([stddef.h wchar.h wctype.h errno.h signal.h fcntl.h dirent.h])
 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([sys/sendfile.h sys/epoll.h sys/event.h])
-AC_CHECK_HEADERS([sys/sysctl.h sys/socket.h sys/sockio.h ifaddrs.h])
+AC_CHECK_HEADERS([sys/sysctl.h sys/socket.h sys/sockio.h ifaddrs.h linux/netfilter_ipv4.h])
 AC_CHECK_HEADERS([net/if.h net/if_dl.h], [], [], [
 	#include <sys/types.h>
 	#include <sys/socket.h>])
diff --git a/qse/include/qse/config.h.in b/qse/include/qse/config.h.in
index ece6d26e..ca3109b0 100644
--- a/qse/include/qse/config.h.in
+++ b/qse/include/qse/config.h.in
@@ -221,6 +221,9 @@
 /* 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/netfilter_ipv4.h> header file. */
+#undef HAVE_LINUX_NETFILTER_IPV4_H
+
 /* Define to 1 if you have the <linux/sockios.h> header file. */
 #undef HAVE_LINUX_SOCKIOS_H
 
diff --git a/qse/lib/http/httpd-cgi.c b/qse/lib/http/httpd-cgi.c
index 063ee86d..0fe640d6 100644
--- a/qse/lib/http/httpd-cgi.c
+++ b/qse/lib/http/httpd-cgi.c
@@ -228,7 +228,7 @@ static int cgi_htrd_peek_script_output (qse_htrd_t* htrd, qse_htre_t* req)
 		qse_mchar_t* endptr;
 
 /* TODO: check the syntax of status value??? if not numeric??? */
-		QSE_MSTRTONUM (nstatus, req->attr.status, &endptr, 10);
+		QSE_MBSTONUM (nstatus, req->attr.status, &endptr, 10);
 
 		snprintf (buf, QSE_COUNTOF(buf), 	
 			QSE_MT("HTTP/%d.%d %d "),
diff --git a/qse/lib/http/httpd-std.c b/qse/lib/http/httpd-std.c
index 5f4f78e5..59361561 100644
--- a/qse/lib/http/httpd-std.c
+++ b/qse/lib/http/httpd-std.c
@@ -76,7 +76,9 @@
 #	endif
 #	if defined(__linux__)
 #		include <limits.h>
-#		include <linux/netfilter_ipv4.h> /* SO_ORIGINAL_DST */
+#		if defined(HAVE_LINUX_NETFILTER_IPV4_H)
+#			include <linux/netfilter_ipv4.h> /* SO_ORIGINAL_DST */
+#		endif
 #		if !defined(IP_TRANSPARENT)
 #			define IP_TRANSPARENT 19
 #		endif