Include sys/_lock.h and sys/_mutex.h to reduce namespace pollution.

Requested by: jhb

8 files changed, 24 insertions, 0 deletions

diff --git a/sys/contrib/ipfilter/netinet/fil.c b/sys/contrib/ipfilter/netinet/fil.c
index bd7cd1f..a5abb95 100644
--- a/sys/contrib/ipfilter/netinet/fil.c
+++ b/sys/contrib/ipfilter/netinet/fil.c
@@ -7,6 +7,9 @@
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/time.h>
+#if (__FreeBSD_version >= 500028)
+#include <sys/queue.h>
+#endif
 #include <sys/file.h>
 #if defined(__NetBSD__) && (NetBSD >= 199905) && !defined(IPFILTER_LKM) && \
     defined(_KERNEL)
diff --git a/sys/contrib/ipfilter/netinet/ip_auth.c b/sys/contrib/ipfilter/netinet/ip_auth.c
index 26ed004..0cc29ac 100644
--- a/sys/contrib/ipfilter/netinet/ip_auth.c
+++ b/sys/contrib/ipfilter/netinet/ip_auth.c
@@ -7,6 +7,9 @@
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/time.h>
+#if (__FreeBSD_version >= 500028)
+#include <sys/queue.h>
+#endif
 #include <sys/file.h>
 #if !defined(_KERNEL) && !defined(KERNEL)
 # include <stdio.h>
diff --git a/sys/contrib/ipfilter/netinet/ip_fil.c b/sys/contrib/ipfilter/netinet/ip_fil.c
index 5e5bfce..dbe1834 100644
--- a/sys/contrib/ipfilter/netinet/ip_fil.c
+++ b/sys/contrib/ipfilter/netinet/ip_fil.c
@@ -34,6 +34,9 @@
 #endif
 #include <sys/errno.h>
 #include <sys/types.h>
+#if (__FreeBSD_version >= 500028)
+#include <sys/queue.h>
+#endif
 #include <sys/file.h>
 #if __FreeBSD_version >= 220000 && defined(_KERNEL)
 # include <sys/fcntl.h>
diff --git a/sys/contrib/ipfilter/netinet/ip_frag.c b/sys/contrib/ipfilter/netinet/ip_frag.c
index 622d0cc..d0623c5 100644
--- a/sys/contrib/ipfilter/netinet/ip_frag.c
+++ b/sys/contrib/ipfilter/netinet/ip_frag.c
@@ -11,6 +11,9 @@
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/time.h>
+#if (__FreeBSD_version >= 500028)
+#include <sys/queue.h>
+#endif
 #include <sys/file.h>
 #if !defined(_KERNEL) && !defined(KERNEL)
 # include <stdio.h>
diff --git a/sys/contrib/ipfilter/netinet/ip_log.c b/sys/contrib/ipfilter/netinet/ip_log.c
index b3f1e56..9d2c9a3 100644
--- a/sys/contrib/ipfilter/netinet/ip_log.c
+++ b/sys/contrib/ipfilter/netinet/ip_log.c
@@ -47,6 +47,9 @@
 # endif
 # include <sys/errno.h>
 # include <sys/types.h>
+# if (__FreeBSD_version >= 500028)
+#  include <sys/queue.h>
+# endif
 # include <sys/file.h>
 # if __FreeBSD_version >= 220000 && defined(_KERNEL)
 #  include <sys/fcntl.h>
diff --git a/sys/contrib/ipfilter/netinet/ip_nat.c b/sys/contrib/ipfilter/netinet/ip_nat.c
index 363ab24..1f0c0f3 100644
--- a/sys/contrib/ipfilter/netinet/ip_nat.c
+++ b/sys/contrib/ipfilter/netinet/ip_nat.c
@@ -14,6 +14,9 @@
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/time.h>
+#if (__FreeBSD_version >= 500028)
+#include <sys/queue.h>
+#endif
 #include <sys/file.h>
 #if defined(__NetBSD__) && (NetBSD >= 199905) && !defined(IPFILTER_LKM) && \
     defined(_KERNEL)
diff --git a/sys/contrib/ipfilter/netinet/ip_proxy.c b/sys/contrib/ipfilter/netinet/ip_proxy.c
index 1fee6b7..6428516 100644
--- a/sys/contrib/ipfilter/netinet/ip_proxy.c
+++ b/sys/contrib/ipfilter/netinet/ip_proxy.c
@@ -12,6 +12,9 @@
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/time.h>
+#if (__FreeBSD_version >= 500028)
+#include <sys/queue.h>
+#endif
 #include <sys/file.h>
 #if !defined(__FreeBSD_version)  
 # include <sys/ioctl.h>      
diff --git a/sys/contrib/ipfilter/netinet/ip_state.c b/sys/contrib/ipfilter/netinet/ip_state.c
index 585929f..5584f65 100644
--- a/sys/contrib/ipfilter/netinet/ip_state.c
+++ b/sys/contrib/ipfilter/netinet/ip_state.c
@@ -7,6 +7,9 @@
 #include <sys/errno.h>
 #include <sys/types.h>
 #include <sys/param.h>
+#if (__FreeBSD_version >= 500028)
+#include <sys/queue.h>
+#endif
 #include <sys/file.h>
 #if defined(__NetBSD__) && (NetBSD >= 199905) && !defined(IPFILTER_LKM) && \
     defined(_KERNEL)