Mismatch on flock/flock64 between glibc/linux-headers

When trying to build kdelibs, which uses both the kernel headers for inotify (which pulls in the kernel fnctl.h), and glibc's fnctl.h, it FTBFS from source on amd64 (and I think i386). This test program shows the issue

#include <fcntl.h>
#include <asm/fcntl.h>

int main() {
        return 0;
}

In file included from /usr/include/asm/fcntl.h:1,
                 from test.c:2:
/usr/include/asm-generic/fcntl.h:117: error: redefinition of ‘struct flock’