Fix inclusions problems