Added missing ifdefs