Revert patch from 2009-09-14: "Fix order of scev include files".