Cleaned-up runner.h to avoid include problems in the standalone tests.