Fix bugs related to includes files in new export system