bugfix headers, dance around identity fotis@cern.ch

Only header changes here; sry for the noise; 
this change should be stable for another 5 years or such...