o_str.h isn't a public header file, so make sure it will still be