very small header cleaning
include what you use for headers
remove MatcherOld