Fix #ifdefs that were broken due to commit d178b58.