Forgot to add kernel.h
Merge