[msandr] Remove one more use of std::string and put all STL headers under ifdef.