Renamed match-str.h to matchstr.h.