am b68e7344: Cleanup the include paths

* commit 'b68e73448104714e8f12f89a1e00fb10b5fd14c4':
  Cleanup the include paths