Add more missing includes for std::pair

Although these aren't causing errors, it adds clarity anyways and may reduce
future problems.