solved library issues and reordered includes