Update files to use kernel headers

Change-Id: I080c5abe348bc4620ffe95454ffcdb7bd8388fa9