Fix incorrect inclusions