Fix build after removal of an extra safe_string.h