fix some including