Updated ifdefs.