Remove redundant socinfo.h, redirect existing references to the new location that CAF uses