fixed includes for fvar refactor