Move includes from vanquish-common

Change-Id: Iea146c63f0fc7d256aa8bb6002a693e0e961d3ec