add includes to match kernel

Change-Id: Ifc7cc8aeee4d1add5db3a09ed608936480f15517