Namespace conflict for “s”: cleanup with re-ordered #includes