Made conditional compilation correct for all build targets.