add some new includes

Change-Id: If8b7c8bafd9350e415f2f6c0db5f8dbc92337fd5