Re-name .hpp header guards to better reflect location in source