Header include guards fixes