[PATCH v4 0/2] kheaders fixes for -rc