Simplify ifndef
Fixed conflict with master.