util/mkerr.h: Restore header file rename