[Bug 2868] CVS won't compile on FC4