Use those suggested defines here too.