Merge "Remove STL references from header files"