Fixes to ifndef -> if !defined