Apply b9b7811 to rule out some include_errors