all headers and kernel source now segregated
Merge branch 'code-cleanup'