Fix header guards to comply with standards
Fix header guards to comply with standards