Mark's suggestion, doing it with an else in the ifdef to prevent redeclare issues...