Correct the includes so that std::string is found for cases where it is not yet defined in the
including file.