fixing more bad includes