Revert the last commit & add KERNEL_INCLUDES support