Cleanup header file

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