Update headers to allow the use of kernel headers

Change-Id: Ib8304c3b27ea90e45e35edf97cee81e1d1ca52b8