Move some macros to zkernel.h