added 'x' prefix to several function and type names, to prevent them from being renamed by the preprocessor when Z_PREFIX is defined (fixes #1870)