header cleanups

This commit fixed several places (but not all) where wrong include
directory is specified and prevent the clean up in the chidren changes.

Signed-off-by: Nan Zhou <nanzhoumails@gmail.com>
Change-Id: Ibbba62e2c0cfe3583a65f1befa1b233bd3eebf19