Certain flag macros were tested with #if instead if #ifdef...