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

* commit '15991270411435749299487582ffce012156cac2':
  Fix headers to be included alone