Move <string> includes from cpp files to header files when appropriate