Add missing match.h file from last commit