Fix include moving out of kernel tree and removed some stuff