LGTM ================ Comment at: test/test_demangle.cpp:15 @@ -14,3 +14,3 @@ #include <cassert> -#include <chrono> +#include "support/timer.hpp" ---------------- I think this include should go at the top. http://reviews.llvm.org/D6391