add missing includes, cleanup

Change-Id: Ifea313cc529a6c21c040b99748b2b5f502d021fe
6 files changed