am 1d8a246e: Header cleanup

* commit '1d8a246e392e0ab4b1e7c8a60e67c00fca05c93c':
  Header cleanup