--- configure.in	2009-04-11 10:35:42.000000000 +0200
+++ configure.in	2009-06-23 21:12:56.000000000 +0200
@@ -1940,10 +1940,16 @@
 	inttypes.h \
 	grp.h \
 	db.h \
-	db_185.h \
-	sys/capability.h
+	db_185.h
 )
 
+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
+
 AC_CHECK_HEADERS(
 	linux/netfilter_ipv4.h \
 	linux/netfilter_ipv4/ip_tproxy.h \
--- src/tools.cc	2009-04-11 10:35:42.000000000 +0200
+++ src/tools.cc	2009-06-23 21:11:11.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