Is L4Ka::Pistachio really GPL-free?

Hello,

while verifying that l4ka-pistachio code is indeed
free of GPL, I've stumbled across the files:
  l4ka-pistachio/user/contrib/elf-loader/include/elf.h
  l4ka-pistachio/user/contrib/elf-loader/include/multiboot.h
which are GPLv2 (doh!).

Wouldn't it make sense to replace elf.h with, say,
  (FreeBSD)/usr/include/sys/elf_common.h
  (FreeBSD)/usr/include/sys/elf32.h
  (FreeBSD)/usr/include/sys/elf64.h
from the FreeBSD source tree, which *are* BSD-licensed?

  http://www.freebsd.org/cgi/cvsweb.cgi/src/sys/sys/elf_common.h
  http://www.freebsd.org/cgi/cvsweb.cgi/src/sys/sys/elf32.h
  http://www.freebsd.org/cgi/cvsweb.cgi/src/sys/sys/elf64.h

Same for multiboot.h with NetBSD's version:
  (NetBSD)/usr/src/sys/arch/i386/include/multiboot.h

  http://cvsweb.netbsd.org/bsdweb.cgi/src/sys/arch/i386/include/multiboot.h

Thanks,
-cpghost.

-- 
Cordula's Web. http://www.cordula.ws/