Split wait.h into wait.h and wait_match.h