added missing ifndef/define headers