Revert "Revert "cleanup headers after kernel include changes""

This reverts commit 16ddaa2a6bcfaf4b34fe078d8adf6bda26c3b3ae.