Xorg: some define changes, remove dups