Fixed -Wundef warnings