Cleanup header

Change-Id: Ib81683e84192a19ca660a7413ee0fcbd69909768
Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>