adjust headers as per fotis@cern.ch

Signed-off-by: Fotis Georgatos <fotis@cern.ch>