Rearrange conflicting tincd globals