Revert "Fix macros in kernel.inc"

This reverts commit 0fcb327bd2835015579d580e412a08acd2963f13.