Changed all ifndef/define names for headers