am 3c864e04: Merge "Fix headers to be included alone"

* commit '3c864e0473d4e340c0344d7df350bcc95db961c6':
  Fix headers to be included alone