added missing ifdefs