--- configure.in	2009-02-04 01:44:06.000000000 +0100
+++ configure.in	2009-06-23 20:59:28.000000000 +0200
@@ -1694,7 +1694,6 @@
 	db.h \
 	db_185.h \
 	aio.h \
-	sys/capability.h \
 ,,,[
 #if HAVE_SYS_TYPES_H
 #include <sys/types.h>
@@ -1728,6 +1727,13 @@
 #endif
 ])
 
+dnl Check for libcap header
+AC_ARG_ENABLE(caps,
+[  --disable-caps  disable usage of Linux capabilities library to control privileges])
+if test "x$enable_caps" != xno; then
+	AC_CHECK_HEADERS( sys/capability.h )
+fi
+
 dnl Check for IP-Filter headers. These are a bit nasty..
 AC_CHECK_HEADERS( \
 	ip_compat.h \
--- src/tools.c	2008-10-06 23:27:17.000000000 +0200
+++ src/tools.c	2009-06-23 20:57:42.000000000 +0200
@@ -42,11 +42,6 @@
 
 #ifdef _SQUID_LINUX_
 #if HAVE_SYS_CAPABILITY_H
-#undef _POSIX_SOURCE
-/* Ugly glue to get around linux header madness colliding with glibc */
-#define _LINUX_TYPES_H
-#define _LINUX_FS_H
-typedef uint32_t __u32;
 #include <sys/capability.h>
 #endif
 #endif