fix a number of missing constant includes