add std:: prefix, fix include filenames