Remove more ifdefs from the include files.