redo include files for kernel reorg