Use Kernel headers - With build barrier

Change-Id: I997dc3ebd8fe0a0b67d90e7b7ec1b2f9f2d737eb
Fix kernel header inclusion

Change-Id: Ibe8771514147cc9292cbc0a005bd210dec8cbd26