Add header guards
Merge branch 'FixHeaderFiles'

Add header guards