Rearrange include files
Merge branch 'master' of github.com:KnightOS/kernel