matcher: fix typedefs and include chain for matcher.