add #ifdefs that Melvin forgot in his previous commit