Regression in generated headers

This commit fix a small regression that caused the
header guards of keys private headers to be wrong.
More documentation effort