cleanup headers after kernel include changes

Change-Id: Idcc2ff72adb48dcf1acda1803f1c2542eaa2b0b2