Fix lib includes for Solr