added missing #ifdefs