Fix the inclusion processing