Remove more ifdefs from the headers.