CSPACE-6270: Remove additional includes.