Merge "Remove the dead #include's in verifier.cpp."