changed #ifndefs in defs header