fix some includes