Changed convention of include protecting defines