- Change definitions in link.cpp back to standard types