Header guards fixed