Fix duplicate declarations