fix a number of bad includes