gcc/cpp conflicts from rawhide