removed needlessly added libs and instead fixed few #includes