Currently, header guards have this form: OLENA_CORE_ABSTRACT_IMAGE_HH // for oln/core/abstract/image.hh in Olena STATIC_VTYPES_HH // for stc/vtypes.hh in Static but they don't really match the file paths. I'd prefer to use the namespace as a prefix rather than the project name. The guards taken as examples above would then read: OLN_CORE_ABSTRACT_IMAGE_HH // for oln/core/abstract/image.hh in Olena STC_VTYPES_HH // for stc/vtypes.hh in Static What do you think?