--- oplock_linux.c.org	2008-04-22 09:30:22.000000000 +0200
+++ oplock_linux.c	2008-04-22 09:29:07.000000000 +0200
@@ -23,21 +23,8 @@
 
 #if HAVE_KERNEL_OPLOCKS_LINUX
 
-/* these can be removed when they are in glibc headers */
-struct  cap_user_header {
-	uint32 version;
-	int pid;
-} header;
-struct cap_user_data {
-	uint32 effective;
-	uint32 permitted;
-	uint32 inheritable;
-} data;
-
-extern int capget(struct cap_user_header * hdrp,
-		  struct cap_user_data * datap);
-extern int capset(struct cap_user_header * hdrp,
-		  const struct cap_user_data * datap);
+static struct __user_cap_header_struct header;
+static struct __user_cap_data_struct data;
 
 static SIG_ATOMIC_T signals_received;
 #define FD_PENDING_SIZE 100