Fix minor include issues in ast