Repair invalid #includes introduced by Eclipse bug