Two "matchers" structs removed from wolf.h and declared in separate files. Update includes needing them accordingly.