Remove #undef mp_XXX from the header end