Fix bug 2458 “Option to force header type to pre-defined-only”