Move definitions from vanquish-common