Update headers for new format required by recent libhybris

Signed-off-by: Simon Busch <morphis@gravedo.de>