Only process headers if there are matches. Cleans up clang errors