Do some fairly major include file cleanups to further separate kernelland