Fix some -Wundef warnings
22 files changed