fix includes for legacy variants