Fix code to not include std set directly