It would seem that in most cases, we want #if ... instead of #if defined(...), so let's make sure that when we say #if defined(...), we actually mean it.

Inspiration: #16344