Fix dynamic includes

There was a bug in upstream.