Update header code to newer standards

Change-Id: I5f5af314d2a361eb79a52c7201134d865f81a519
Merge "Update header code to newer standards"