fix includes bugs