Revert "cleanup headers after kernel include changes"

This reverts commit 7e31f686a83275d8321af09001f492f421f4c30c.