Added math util, visionutil clash, include locs changed