Move includes from infra/init

Change-Id: I4cb344f9cb2ebe3e6225dbc87f20d0f4961f794d
4 files changed