fix up after platform include cleanup