Merge pull request #1673 from antonio-nino-diaz-arm/an/headers

Standardise header guards across codebase