Use #ifdef instead of just #if to fix some -Wundef warnings.
In most cases, this just makes things more consistent with
existing code.

Change-Id: I7aec13b54793de4e85eedcfe94cde83a147b217b