fix up header protection ifdefs