Corrected ifndef and define statements