Moved the ubiqx stuff above nameserv.h so that ubiqx typedefs could be