diff --git a/HTMLparser.c b/HTMLparser.c
index 1c5a7864..35e162a4 100644
--- a/HTMLparser.c
+++ b/HTMLparser.c
@@ -1259,7 +1259,7 @@ htmlCompareTags(const void *key, const void *member) {
  * @deprecated Only supports HTML 4.
  *
  * @param tag  The tag name in lowercase
- * @returns the related htmlElemDescPtr or NULL if not found.
+ * @returns the related htmlElemDesc or NULL if not found.
  */
 const htmlElemDesc *
 htmlTagLookup(const xmlChar *tag) {
@@ -1888,7 +1888,7 @@ static const htmlEntityDesc  html40EntitiesTable[] = {
  * TODO: the linear scan is really ugly, an hash table is really needed.
  *
  * @param name  the entity name
- * @returns the associated htmlEntityDescPtr if found, NULL otherwise.
+ * @returns the associated htmlEntityDesc if found, NULL otherwise.
  */
 const htmlEntityDesc *
 htmlEntityLookup(const xmlChar *name) {
@@ -1919,7 +1919,7 @@ htmlCompareEntityDesc(const void *vkey, const void *vdesc) {
  * TODO: the linear scan is really ugly, an hash table is really needed.
  *
  * @param value  the entity's unicode value
- * @returns the associated htmlEntityDescPtr if found, NULL otherwise.
+ * @returns the associated htmlEntityDesc if found, NULL otherwise.
  */
 const htmlEntityDesc *
 htmlEntityValueLookup(unsigned int value) {
@@ -4566,7 +4566,7 @@ htmlFreeParserCtxt(htmlParserCtxt *ctxt)
  *
  * See htmlNewSAXParserCtxt() for custom SAX parsers.
  *
- * @returns the htmlParserCtxtPtr or NULL in case of allocation error
+ * @returns the htmlParserCtxt or NULL in case of allocation error
  */
 htmlParserCtxt *
 htmlNewParserCtxt(void)
@@ -4587,7 +4587,7 @@ htmlNewParserCtxt(void)
  *
  * @param sax  SAX handler
  * @param userData  user data
- * @returns the htmlParserCtxtPtr or NULL in case of allocation error
+ * @returns the htmlParserCtxt or NULL in case of allocation error
  */
 htmlParserCtxt *
 htmlNewSAXParserCtxt(const htmlSAXHandler *sax, void *userData)
@@ -5433,7 +5433,7 @@ htmlAttrAllowed(const htmlElemDesc* elt ATTRIBUTE_UNUSED,
 /**
  * @deprecated Don't use.
  *
- * @param node  an htmlNodePtr in a tree
+ * @param node  an xmlNode in a tree
  * @param legacy  whether to allow deprecated elements (YES is faster here
  *	for Element nodes)
  * @returns HTML_VALID
diff --git a/HTMLtree.c b/HTMLtree.c
index 6ceec614..65c5dc64 100644
--- a/HTMLtree.c
+++ b/HTMLtree.c
@@ -459,7 +459,7 @@ htmlFindOutputEncoder(const char *encoding, xmlCharEncodingHandler **out) {
 /**
  * Serialize an HTML document to an xmlBuf.
  *
- * @param buf  the xmlBufPtr output
+ * @param buf  the xmlBuf output
  * @param doc  the document (unused)
  * @param cur  the current node
  * @param format  should formatting newlines been added
diff --git a/SAX2.c b/SAX2.c
index 3f0bf87d..cd7d95c7 100644
--- a/SAX2.c
+++ b/SAX2.c
@@ -427,7 +427,7 @@ xmlSAX2ResolveEntity(void *ctx, const xmlChar *publicId,
  *
  * @param ctx  the user data (XML parser context)
  * @param name  The entity name
- * @returns the xmlEntityPtr if found.
+ * @returns the xmlEntity if found.
  */
 xmlEntity *
 xmlSAX2GetEntity(void *ctx, const xmlChar *name)
@@ -471,7 +471,7 @@ xmlSAX2GetEntity(void *ctx, const xmlChar *name)
  *
  * @param ctx  the user data (XML parser context)
  * @param name  The entity name
- * @returns the xmlEntityPtr if found.
+ * @returns the xmlEntity if found.
  */
 xmlEntity *
 xmlSAX2GetParameterEntity(void *ctx, const xmlChar *name)
diff --git a/buf.c b/buf.c
index 43d8ebfd..8625f6ac 100644
--- a/buf.c
+++ b/buf.c
@@ -4,7 +4,7 @@
  * new buffer structures and entry points to simplify the maintenance
  * of libxml2 and ensure we keep good control over memory allocations
  * and stay 64 bits clean.
- * The new entry point use the xmlBufPtr opaque structure and
+ * The new entry point use the xmlBuf opaque structure and
  * xmlBuf...() counterparts to the old xmlBuf...() functions
  *
  * See Copyright for the status of this software.
@@ -545,12 +545,12 @@ xmlBufCat(xmlBuf *buf, const xmlChar *str) {
 
 /**
  * Helper routine to switch from the old buffer structures in use
- * in various APIs. It creates a wrapper xmlBufPtr which will be
+ * in various APIs. It creates a wrapper xmlBuf which will be
  * used for internal processing until the xmlBufBackToBuffer() is
  * issued.
  *
  * @param buffer  incoming old buffer to convert to a new one
- * @returns  a new xmlBufPtr unless the call failed and NULL is returned
+ * @returns  a new xmlBuf unless the call failed and NULL is returned
  */
 xmlBuf *
 xmlBufFromBuffer(xmlBuffer *buffer) {
@@ -593,7 +593,7 @@ xmlBufFromBuffer(xmlBuffer *buffer) {
  * update back the buffer provided by the user. This can lead to
  * a failure in case the size accumulated in the xmlBuf is larger
  * than what an xmlBuffer can support on 64 bits (INT_MAX)
- * The xmlBufPtr `buf` wrapper is deallocated by this call in any case.
+ * The xmlBuf `buf` wrapper is deallocated by this call in any case.
  *
  * @param buf  new buffer wrapping the old one
  * @param ret  old buffer
diff --git a/c14n.c b/c14n.c
index cf60b59e..24eba9b0 100644
--- a/c14n.c
+++ b/c14n.c
@@ -1754,7 +1754,7 @@ xmlC14NNewCtx(xmlDocPtr doc,
     }
 
     /*
-     * Allocate a new xmlC14NCtxPtr and fill the fields.
+     * Allocate a new xmlC14NCtx and fill the fields.
      */
     ctx = (xmlC14NCtxPtr) xmlMalloc(sizeof(xmlC14NCtx));
     if (ctx == NULL) {
diff --git a/catalog.c b/catalog.c
index eeba614c..ed25ccc6 100644
--- a/catalog.c
+++ b/catalog.c
@@ -245,7 +245,7 @@ xmlCatalogPrintDebug(const char *fmt, ...) {
  * @param URL  URL of the entry
  * @param prefer  the PUBLIC vs. SYSTEM current preference value
  * @param group  for members of a group, the group entry
- * @returns the xmlCatalogEntryPtr or NULL in case of error
+ * @returns the xmlCatalogEntry or NULL in case of error
  */
 static xmlCatalogEntryPtr
 xmlNewCatalogEntry(xmlCatalogEntryType type, const xmlChar *name,
@@ -383,7 +383,7 @@ xmlFreeCatalogHashEntryList(void *payload,
  *
  * @param type  type of catalog
  * @param prefer  the PUBLIC vs. SYSTEM current preference value
- * @returns the xmlCatalogPtr or NULL in case of error
+ * @returns the xmlCatalog or NULL in case of error
  */
 static xmlCatalogPtr
 xmlCreateNewCatalog(xmlCatalogType type, xmlCatalogPrefer prefer) {
@@ -2902,7 +2902,7 @@ xmlACatalogRemove(xmlCatalog *catal, const xmlChar *value) {
  * create a new Catalog.
  *
  * @param sgml  should this create an SGML catalog
- * @returns the xmlCatalogPtr or NULL in case of error
+ * @returns the xmlCatalog or NULL in case of error
  */
 xmlCatalog *
 xmlNewCatalog(int sgml) {
diff --git a/encoding.c b/encoding.c
index a4c7b9f5..659f93a3 100644
--- a/encoding.c
+++ b/encoding.c
@@ -695,7 +695,7 @@ xmlGetCharEncodingName(xmlCharEncoding enc) {
  * @param name  the encoding name, in UTF-8 format (ASCII actually)
  * @param input  the xmlCharEncodingInputFunc to read that encoding
  * @param output  the xmlCharEncodingOutputFunc to write that encoding
- * @returns the xmlCharEncodingHandlerPtr created (or NULL in case of error).
+ * @returns the xmlCharEncodingHandler created (or NULL in case of error).
  */
 xmlCharEncodingHandler *
 xmlNewCharEncodingHandler(const char *name,
@@ -864,7 +864,7 @@ xmlCleanupCharEncodingHandlers(void) {
  * @deprecated This function modifies global state and is not
  * thread-safe. See xmlCtxtSetCharEncConvImpl() for an alternative.
  *
- * @param handler  the xmlCharEncodingHandlerPtr handler block
+ * @param handler  the xmlCharEncodingHandler handler block
  */
 void
 xmlRegisterCharEncodingHandler(xmlCharEncodingHandler *handler) {
diff --git a/entities.c b/entities.c
index cbc8cb30..d603e6f0 100644
--- a/entities.c
+++ b/entities.c
@@ -555,7 +555,7 @@ xmlEncodeSpecialChars(const xmlDoc *doc ATTRIBUTE_UNUSED,
 /**
  * Create and initialize an empty entities hash table.
  *
- * @returns the xmlEntitiesTablePtr just created or NULL in case of error.
+ * @returns the xmlEntitiesTable just created or NULL in case of error.
  */
 xmlEntitiesTable *
 xmlCreateEntitiesTable(void) {
@@ -589,7 +589,7 @@ xmlFreeEntitiesTable(xmlEntitiesTable *table) {
  *
  * @param payload  An entity
  * @param name  unused
- * @returns the new xmlEntitiesPtr or NULL in case of error.
+ * @returns the new xmlEntities or NULL in case of error.
  */
 static void *
 xmlCopyEntity(void *payload, const xmlChar *name ATTRIBUTE_UNUSED) {
@@ -644,7 +644,7 @@ error:
  * Build a copy of an entity table.
  *
  * @param table  An entity table
- * @returns the new xmlEntitiesTablePtr or NULL in case of error.
+ * @returns the new xmlEntitiesTable or NULL in case of error.
  */
 xmlEntitiesTable *
 xmlCopyEntitiesTable(xmlEntitiesTable *table) {
diff --git a/error.c b/error.c
index e6cfa342..4994f9ed 100644
--- a/error.c
+++ b/error.c
@@ -321,7 +321,7 @@ xmlSetStructuredErrorFunc(void *ctx, xmlStructuredErrorFunc handler) {
  *
  * @deprecated Use xmlFormatError().
  *
- * @param input  an xmlParserInputPtr input
+ * @param input  an xmlParserInput input
  */
 
 void
@@ -341,7 +341,7 @@ xmlParserPrintFileInfo(struct _xmlParserInput *input) {
  * Displays current context within the input content for
  * error reporting.
  *
- * @param input  an xmlParserInputPtr input
+ * @param input  an xmlParserInput input
  * @param channel  output callback
  * @param data  user data for output callback
  */
@@ -416,7 +416,7 @@ xmlParserPrintFileContextInternal(xmlParserInputPtr input ,
  *
  * @deprecated Use xmlFormatError().
  *
- * @param input  an xmlParserInputPtr input
+ * @param input  an xmlParserInput input
  */
 void
 xmlParserPrintFileContext(struct _xmlParserInput *input) {
diff --git a/globals.c b/globals.c
index d1ca5eb7..ea682d91 100644
--- a/globals.c
+++ b/globals.c
@@ -464,7 +464,7 @@ xmlRegisterGlobalStateDtor(xmlGlobalState *gs) {
  * hold all data for use by a thread when supporting backwards compatibility
  * of libxml2 to pre-thread-safe behaviour.
  *
- * @returns the newly allocated xmlGlobalStatePtr or NULL in case of error
+ * @returns the newly allocated xmlGlobalState or NULL in case of error
  */
 static xmlGlobalStatePtr
 xmlNewGlobalState(int allowFailure)
diff --git a/parser.c b/parser.c
index a92e4930..7dd30546 100644
--- a/parser.c
+++ b/parser.c
@@ -6237,7 +6237,7 @@ xmlParseAttributeListDecl(xmlParserCtxt *ctxt) {
  *
  * @param ctxt  an XML parser context
  * @param inputchk  the input used for the current entity, needed for boundary checks
- * @returns the list of the xmlElementContentPtr describing the element choices
+ * @returns the list of the xmlElementContent describing the element choices
  */
 xmlElementContent *
 xmlParseElementMixedContentDecl(xmlParserCtxt *ctxt, int inputchk) {
@@ -6358,7 +6358,7 @@ mem_error:
  * @param ctxt  an XML parser context
  * @param inputchk  the input used for the current entity, needed for boundary checks
  * @param depth  the level of recursion
- * @returns the tree of xmlElementContentPtr describing the element
+ * @returns the tree of xmlElementContent describing the element
  *          hierarchy.
  */
 static xmlElementContentPtr
@@ -6663,7 +6663,7 @@ xmlParseElementChildrenContentDeclPriv(xmlParserCtxtPtr ctxt, int inputchk,
  *
  * @param ctxt  an XML parser context
  * @param inputchk  the input used for the current entity, needed for boundary checks
- * @returns the tree of xmlElementContentPtr describing the element
+ * @returns the tree of xmlElementContent describing the element
  *          hierarchy.
  */
 xmlElementContent *
@@ -7562,7 +7562,7 @@ xmlParseEntityRefInternal(xmlParserCtxtPtr ctxt) {
  * @deprecated Internal function, don't use.
  *
  * @param ctxt  an XML parser context
- * @returns the xmlEntityPtr if found, or NULL otherwise.
+ * @returns the xmlEntity if found, or NULL otherwise.
  */
 xmlEntity *
 xmlParseEntityRef(xmlParserCtxt *ctxt) {
@@ -7604,7 +7604,7 @@ xmlParseEntityRef(xmlParserCtxt *ctxt) {
  *
  * @param ctxt  an XML parser context
  * @param str  a pointer to an index in the string
- * @returns the xmlEntityPtr if found, or NULL otherwise. The str pointer
+ * @returns the xmlEntity if found, or NULL otherwise. The str pointer
  * is updated to the current location in the string.
  */
 static xmlChar *
@@ -11494,7 +11494,7 @@ xmlCreateIOParserCtxt(xmlSAXHandler *sax, void *user_data,
  * @param input  a parser input
  * @param publicId  public ID of the DTD (optional)
  * @param systemId  system ID of the DTD (optional)
- * @returns the resulting xmlDtdPtr or NULL in case of error.
+ * @returns the resulting xmlDtd or NULL in case of error.
  * `input` will be freed by the function in any case.
  */
 xmlDtd *
@@ -11567,7 +11567,7 @@ error:
  * @param sax  the SAX handler block or NULL
  * @param input  an Input Buffer
  * @param enc  the charset encoding if known
- * @returns the resulting xmlDtdPtr or NULL in case of error.
+ * @returns the resulting xmlDtd or NULL in case of error.
  * `input` will be freed by the function in any case.
  */
 
@@ -11617,7 +11617,7 @@ xmlIOParseDTD(xmlSAXHandler *sax, xmlParserInputBuffer *input,
  * @param sax  the SAX handler block
  * @param ExternalID  a NAME* containing the External ID of the DTD
  * @param SystemID  a NAME* containing the URL to the DTD
- * @returns the resulting xmlDtdPtr or NULL in case of error.
+ * @returns the resulting xmlDtd or NULL in case of error.
  */
 
 xmlDtd *
@@ -11676,7 +11676,7 @@ xmlSAXParseDTD(xmlSAXHandler *sax, const xmlChar *ExternalID,
  *
  * @param ExternalID  a NAME* containing the External ID of the DTD
  * @param SystemID  a NAME* containing the URL to the DTD
- * @returns the resulting xmlDtdPtr or NULL in case of error.
+ * @returns the resulting xmlDtd or NULL in case of error.
  */
 
 xmlDtd *
diff --git a/parserInternals.c b/parserInternals.c
index 7386915f..3dc097be 100644
--- a/parserInternals.c
+++ b/parserInternals.c
@@ -1697,7 +1697,7 @@ xmlGetActualEncoding(xmlParserCtxt *ctxt) {
 /**
  * Free up an input stream.
  *
- * @param input  an xmlParserInputPtr
+ * @param input  an xmlParserInput
  */
 void
 xmlFreeInputStream(xmlParserInput *input) {
@@ -2147,7 +2147,7 @@ xmlNewIOInputStream(xmlParserCtxt *ctxt, xmlParserInputBuffer *buf,
 }
 
 /**
- * Create a new input stream based on an xmlEntityPtr
+ * Create a new input stream based on an xmlEntity
  *
  * @deprecated Internal function, do not use.
  *
@@ -2405,7 +2405,7 @@ xmlNewInputFromFile(xmlParserCtxt *ctxt, const char *filename) {
  * @param url  the URL for the entity to load
  * @param ID  the System ID for the entity to load
  * @param ctxt  the context in which the entity is called or NULL
- * @returns a new allocated xmlParserInputPtr, or NULL.
+ * @returns a new allocated xmlParserInput, or NULL.
  */
 static xmlParserInputPtr
 xmlDefaultExternalEntityLoader(const char *url, const char *ID,
@@ -2451,7 +2451,7 @@ xmlDefaultExternalEntityLoader(const char *url, const char *ID,
  * @param URL  the URL for the entity to load
  * @param ID  the System ID for the entity to load
  * @param ctxt  the context in which the entity is called or NULL
- * @returns a new allocated xmlParserInputPtr, or NULL.
+ * @returns a new allocated xmlParserInput, or NULL.
  */
 xmlParserInput *
 xmlNoNetExternalEntityLoader(const char *URL, const char *ID,
@@ -2528,7 +2528,7 @@ xmlCtxtSetResourceLoader(xmlParserCtxt *ctxt, xmlResourceLoader loader,
  * @param url  the URL for the entity to load
  * @param publicId  the Public ID for the entity to load
  * @param type  resource type
- * @returns the xmlParserInputPtr or NULL in case of error.
+ * @returns the xmlParserInput or NULL in case of error.
  */
 xmlParserInput *
 xmlLoadResource(xmlParserCtxt *ctxt, const char *url, const char *publicId,
@@ -2605,7 +2605,7 @@ xmlLoadResource(xmlParserCtxt *ctxt, const char *url, const char *publicId,
  * @param URL  the URL for the entity to load
  * @param ID  the Public ID for the entity to load
  * @param ctxt  the context in which the entity is called or NULL
- * @returns the xmlParserInputPtr or NULL
+ * @returns the xmlParserInput or NULL
  */
 xmlParserInput *
 xmlLoadExternalEntity(const char *URL, const char *ID,
@@ -2894,7 +2894,7 @@ xmlFreeParserCtxt(xmlParserCtxt *ctxt)
 /**
  * Allocate and initialize a new parser context.
  *
- * @returns the xmlParserCtxtPtr or NULL
+ * @returns the xmlParserCtxt or NULL
  */
 
 xmlParserCtxt *
@@ -2915,7 +2915,7 @@ xmlNewParserCtxt(void)
  *
  * @param sax  SAX handler
  * @param userData  user data
- * @returns the xmlParserCtxtPtr or NULL if memory allocation failed.
+ * @returns the xmlParserCtxt or NULL if memory allocation failed.
  */
 
 xmlParserCtxt *
diff --git a/pattern.c b/pattern.c
index 6a22bcab..102a6011 100644
--- a/pattern.c
+++ b/pattern.c
@@ -194,7 +194,7 @@ struct _xmlPatParserContext {
 /**
  * Create a new XSLT Pattern
  *
- * @returns the newly allocated xmlPatternPtr or NULL in case of error
+ * @returns the newly allocated xmlPattern or NULL in case of error
  */
 static xmlPatternPtr
 xmlNewPattern(void) {
@@ -276,7 +276,7 @@ xmlFreePatternList(xmlPattern *comp) {
  * @param dict  the inherited dictionary or NULL
  * @param namespaces  the prefix definitions, array of [URI, prefix] terminated
  *              with [NULL, NULL] or NULL if no namespace is used
- * @returns the newly allocated xmlPatParserContextPtr or NULL in case of error
+ * @returns the newly allocated xmlPatParserContext or NULL in case of error
  */
 static xmlPatParserContextPtr
 xmlNewPatParserContext(const xmlChar *pattern, xmlDictPtr dict,
diff --git a/relaxng.c b/relaxng.c
index 4450263e..5eb5ee2d 100644
--- a/relaxng.c
+++ b/relaxng.c
@@ -1522,7 +1522,7 @@ xmlRelaxNGRemoveRedefine(xmlRelaxNGParserCtxtPtr ctxt,
  * @param URL  the normalized URL
  * @param node  the include node.
  * @param ns  the namespace passed from the context.
- * @returns the xmlRelaxNGIncludePtr or NULL in case of error
+ * @returns the xmlRelaxNGInclude or NULL in case of error
  */
 static xmlRelaxNGIncludePtr
 xmlRelaxNGLoadInclude(xmlRelaxNGParserCtxtPtr ctxt, const xmlChar * URL,
@@ -1843,7 +1843,7 @@ xmlRelaxNGDocumentPop(xmlRelaxNGParserCtxtPtr ctxt)
  * @param ctxt  the parser context
  * @param URL  the normalized URL
  * @param ns  the inherited ns if any
- * @returns the xmlRelaxNGDocumentPtr or NULL in case of error
+ * @returns the xmlRelaxNGDocument or NULL in case of error
  */
 static xmlRelaxNGDocumentPtr
 xmlRelaxNGLoadExternalRef(xmlRelaxNGParserCtxtPtr ctxt,
@@ -4507,7 +4507,7 @@ xmlRelaxNGParseImportRefs(xmlRelaxNGParserCtxtPtr ctxt,
  *
  * @param ctxt  the parser context
  * @param node  the externalRef node
- * @returns the xmlRelaxNGDefinePtr or NULL in case of error
+ * @returns the xmlRelaxNGDefine or NULL in case of error
  */
 static xmlRelaxNGDefinePtr
 xmlRelaxNGProcessExternalRef(xmlRelaxNGParserCtxtPtr ctxt, xmlNodePtr node)
@@ -6309,7 +6309,7 @@ xmlRelaxNGCheckRules(xmlRelaxNGParserCtxtPtr ctxt,
  *
  * @param ctxt  a Relax-NG parser context
  * @param nodes  grammar children nodes
- * @returns the internal xmlRelaxNGGrammarPtr built or
+ * @returns the internal xmlRelaxNGGrammar built or
  *         NULL in case of error
  */
 static xmlRelaxNGGrammarPtr
@@ -6719,7 +6719,7 @@ xmlRelaxNGCleanupAttributes(xmlRelaxNGParserCtxtPtr ctxt, xmlNodePtr node)
  * Include and externalRef lookups.
  *
  * @param ctxt  a Relax-NG parser context
- * @param root  an xmlNodePtr subtree
+ * @param root  an xmlNode subtree
  */
 static void
 xmlRelaxNGCleanupTree(xmlRelaxNGParserCtxtPtr ctxt, xmlNodePtr root)
@@ -7159,7 +7159,7 @@ xmlRelaxNGCleanupTree(xmlRelaxNGParserCtxtPtr ctxt, xmlNodePtr root)
  * Include and externalRef lookups.
  *
  * @param ctxt  a Relax-NG parser context
- * @param doc  an xmldocPtr document pointer
+ * @param doc  an xmldoc document pointer
  * @returns the cleaned up document or NULL in case of error
  */
 static xmlDocPtr
diff --git a/runtest.c b/runtest.c
index 85910e86..ea52c018 100644
--- a/runtest.c
+++ b/runtest.c
@@ -712,7 +712,7 @@ externalSubsetDebug(void *ctx ATTRIBUTE_UNUSED, const xmlChar *name,
  * @param ctxt  An XML parser context
  * @param publicId  The public ID of the entity
  * @param systemId  The system ID of the entity
- * @returns the xmlParserInputPtr if inlined or NULL for DOM behaviour.
+ * @returns the xmlParserInput if inlined or NULL for DOM behaviour.
  */
 static xmlParserInputPtr
 resolveEntityDebug(void *ctx ATTRIBUTE_UNUSED, const xmlChar *publicId, const xmlChar *systemId)
@@ -745,7 +745,7 @@ resolveEntityDebug(void *ctx ATTRIBUTE_UNUSED, const xmlChar *publicId, const xm
  *
  * @param ctxt  An XML parser context
  * @param name  The entity name
- * @returns the xmlParserInputPtr if inlined or NULL for DOM behaviour.
+ * @returns the xmlParserInput if inlined or NULL for DOM behaviour.
  */
 static xmlEntityPtr
 getEntityDebug(void *ctx, const xmlChar *name)
@@ -765,7 +765,7 @@ getEntityDebug(void *ctx, const xmlChar *name)
  *
  * @param ctxt  An XML parser context
  * @param name  The entity name
- * @returns the xmlParserInputPtr
+ * @returns the xmlParserInput
  */
 static xmlEntityPtr
 getParameterEntityDebug(void *ctx, const xmlChar *name)
diff --git a/testlimits.c b/testlimits.c
index 0b503285..5caa1dce 100644
--- a/testlimits.c
+++ b/testlimits.c
@@ -465,7 +465,7 @@ externalSubsetCallback(void *ctx ATTRIBUTE_UNUSED,
  * @param ctxt  An XML parser context
  * @param publicId  The public ID of the entity
  * @param systemId  The system ID of the entity
- * @returns the xmlParserInputPtr if inlined or NULL for DOM behaviour.
+ * @returns the xmlParserInput if inlined or NULL for DOM behaviour.
  */
 static xmlParserInputPtr
 resolveEntityCallback(void *ctx ATTRIBUTE_UNUSED,
@@ -481,7 +481,7 @@ resolveEntityCallback(void *ctx ATTRIBUTE_UNUSED,
  *
  * @param ctxt  An XML parser context
  * @param name  The entity name
- * @returns the xmlParserInputPtr if inlined or NULL for DOM behaviour.
+ * @returns the xmlParserInput if inlined or NULL for DOM behaviour.
  */
 static xmlEntityPtr
 getEntityCallback(void *ctx ATTRIBUTE_UNUSED,
@@ -496,7 +496,7 @@ getEntityCallback(void *ctx ATTRIBUTE_UNUSED,
  *
  * @param ctxt  An XML parser context
  * @param name  The entity name
- * @returns the xmlParserInputPtr
+ * @returns the xmlParserInput
  */
 static xmlEntityPtr
 getParameterEntityCallback(void *ctx ATTRIBUTE_UNUSED,
diff --git a/tree.c b/tree.c
index 3404c8e9..3bba5dc4 100644
--- a/tree.c
+++ b/tree.c
@@ -1442,7 +1442,7 @@ xmlStringGetNodeList(const xmlDoc *doc, const xmlChar *value) {
 /**
  * @param node  a node list
  * @param escape  whether to escape characters and keep entity refs
- * @param flags  escape flags 
+ * @param flags  escape flags
  * @returns a pointer to the string.
  */
 xmlChar *
@@ -5370,7 +5370,7 @@ xmlBufGetChildContent(xmlBufPtr buf, const xmlNode *tree) {
  *
  * Entity references are substituted.
  *
- * @param buf  a buffer xmlBufPtr
+ * @param buf  a buffer xmlBuf
  * @param cur  the node being read
  * @returns 0 in case of success and -1 in case of error.
  */
@@ -7087,7 +7087,7 @@ xmlDOMWrapStoreNs(xmlDocPtr doc,
 /**
  * Allocates and initializes a new DOM-wrapper context.
  *
- * @returns the xmlDOMWrapCtxtPtr or NULL in case of an internal error.
+ * @returns the xmlDOMWrapCtxt or NULL in case of an internal error.
  */
 xmlDOMWrapCtxt *
 xmlDOMWrapNewCtxt(void)
diff --git a/uri.c b/uri.c
index 9071d59f..ee7652e0 100644
--- a/uri.c
+++ b/uri.c
@@ -989,7 +989,7 @@ xmlParseURISafe(const char *str, xmlURI **uriOut) {
  * URI-reference = [ absoluteURI | relativeURI ] [ "\#" fragment ]
  *
  * @param str  the URI string to analyze
- * @returns a newly built xmlURIPtr or NULL in case of error
+ * @returns a newly built xmlURI or NULL in case of error
  */
 xmlURI *
 xmlParseURI(const char *str) {
@@ -1020,7 +1020,7 @@ xmlParseURIReference(xmlURI *uri, const char *str) {
  *
  * @param str  the URI string to analyze
  * @param raw  if 1 unescaping of URI pieces are disabled
- * @returns a newly built xmlURIPtr or NULL in case of error
+ * @returns a newly built xmlURI or NULL in case of error
  */
 xmlURI *
 xmlParseURIRaw(const char *str, int raw) {
diff --git a/valid.c b/valid.c
index 98dd5202..7890796c 100644
--- a/valid.c
+++ b/valid.c
@@ -783,7 +783,7 @@ xmlNewElementContent(const xmlChar *name, xmlElementContentType type) {
  *
  * @param doc  the document owning the element declaration
  * @param cur  An element content pointer.
- * @returns the new xmlElementContentPtr or NULL in case of error.
+ * @returns the new xmlElementContent or NULL in case of error.
  */
 xmlElementContent *
 xmlCopyDocElementContent(xmlDoc *doc, xmlElementContent *cur) {
@@ -877,7 +877,7 @@ error:
  * @deprecated Internal function, don't use.
  *
  * @param cur  An element content pointer.
- * @returns the new xmlElementContentPtr or NULL in case of error.
+ * @returns the new xmlElementContent or NULL in case of error.
  */
 xmlElementContent *
 xmlCopyElementContent(xmlElementContent *cur) {
@@ -1342,7 +1342,7 @@ xmlFreeElementTable(xmlElementTable *table) {
  *
  * @param payload  an element
  * @param name  unused
- * @returns the new xmlElementPtr or NULL in case of error.
+ * @returns the new xmlElement or NULL in case of error.
  */
 static void *
 xmlCopyElement(void *payload, const xmlChar *name ATTRIBUTE_UNUSED) {
@@ -1385,7 +1385,7 @@ error:
  * @deprecated Internal function, don't use.
  *
  * @param table  An element table
- * @returns the new xmlElementTablePtr or NULL in case of error.
+ * @returns the new xmlElementTable or NULL in case of error.
  */
 xmlElementTable *
 xmlCopyElementTable(xmlElementTable *table) {
@@ -1458,7 +1458,7 @@ xmlDumpElementTable(xmlBuffer *buf, xmlElementTable *table) {
  * @deprecated Internal function, don't use.
  *
  * @param name  the enumeration name or NULL
- * @returns the xmlEnumerationPtr just created or NULL in case
+ * @returns the xmlEnumeration just created or NULL in case
  * of error.
  */
 xmlEnumeration *
@@ -1504,7 +1504,7 @@ xmlFreeEnumeration(xmlEnumeration *cur) {
  * @deprecated Internal function, don't use.
  *
  * @param cur  the tree to copy.
- * @returns the xmlEnumerationPtr just created or NULL in case
+ * @returns the xmlEnumeration just created or NULL in case
  * of error.
  */
 xmlEnumeration *
@@ -1871,7 +1871,7 @@ xmlFreeAttributeTable(xmlAttributeTable *table) {
  *
  * @param payload  an attribute declaration
  * @param name  unused
- * @returns the new xmlAttributePtr or NULL in case of error.
+ * @returns the new xmlAttribute or NULL in case of error.
  */
 static void *
 xmlCopyAttribute(void *payload, const xmlChar *name ATTRIBUTE_UNUSED) {
@@ -1923,7 +1923,7 @@ error:
  * @deprecated Internal function, don't use.
  *
  * @param table  An attribute table
- * @returns the new xmlAttributeTablePtr or NULL in case of error.
+ * @returns the new xmlAttributeTable or NULL in case of error.
  */
 xmlAttributeTable *
 xmlCopyAttributeTable(xmlAttributeTable *table) {
@@ -2126,7 +2126,7 @@ xmlFreeNotationTable(xmlNotationTable *table) {
  *
  * @param payload  a notation
  * @param name  unused
- * @returns the new xmlNotationPtr or NULL in case of error.
+ * @returns the new xmlNotation or NULL in case of error.
  */
 static void *
 xmlCopyNotation(void *payload, const xmlChar *name ATTRIBUTE_UNUSED) {
@@ -2165,7 +2165,7 @@ error:
  * @deprecated Internal function, don't use.
  *
  * @param table  A notation table
- * @returns the new xmlNotationTablePtr or NULL in case of error.
+ * @returns the new xmlNotationTable or NULL in case of error.
  */
 xmlNotationTable *
 xmlCopyNotationTable(xmlNotationTable *table) {
@@ -2372,7 +2372,7 @@ xmlAddIDSafe(xmlAttr *attr, const xmlChar *value) {
  * @param doc  pointer to the document, must equal `attr->doc`
  * @param value  the attribute (ID) value
  * @param attr  the attribute holding the ID
- * @returns the new xmlIDPtr or NULL on error.
+ * @returns the new xmlID or NULL on error.
  */
 xmlID *
 xmlAddID(xmlValidCtxt *ctxt, xmlDoc *doc, const xmlChar *value,
@@ -2645,7 +2645,7 @@ xmlDummyCompare(const void *data0 ATTRIBUTE_UNUSED,
  * @param doc  pointer to the document
  * @param value  the value name
  * @param attr  the attribute holding the Ref
- * @returns the new xmlRefPtr or NULL o error.
+ * @returns the new xmlRef or NULL o error.
  */
 xmlRef *
 xmlAddRef(xmlValidCtxt *ctxt, xmlDoc *doc, const xmlChar *value,
@@ -2894,7 +2894,7 @@ xmlGetRefs(xmlDoc *doc, const xmlChar *ID) {
  *
  * @param dtd  a pointer to the DtD to search
  * @param name  the element name
- * @returns the xmlElementPtr or NULL if not found.
+ * @returns the xmlElement or NULL if not found.
  */
 
 xmlElement *
@@ -2927,7 +2927,7 @@ xmlGetDtdElementDesc(xmlDtd *dtd, const xmlChar *name) {
  * @param ctxt  a validation context
  * @param dtd  a pointer to the DtD to search
  * @param name  the element name
- * @returns the xmlElementPtr or NULL if not found.
+ * @returns the xmlElement or NULL if not found.
  */
 
 static xmlElementPtr
@@ -2997,7 +2997,7 @@ mem_error:
  * @param dtd  a pointer to the DtD to search
  * @param name  the element name
  * @param prefix  the element namespace prefix
- * @returns the xmlElementPtr or NULL if not found.
+ * @returns the xmlElement or NULL if not found.
  */
 
 xmlElement *
@@ -3019,7 +3019,7 @@ xmlGetDtdQElementDesc(xmlDtd *dtd, const xmlChar *name,
  * @param dtd  a pointer to the DtD to search
  * @param elem  the element name
  * @param name  the attribute name
- * @returns the xmlAttributePtr or NULL if not found.
+ * @returns the xmlAttribute or NULL if not found.
  */
 
 xmlAttribute *
@@ -3054,7 +3054,7 @@ xmlGetDtdAttrDesc(xmlDtd *dtd, const xmlChar *elem, const xmlChar *name) {
  * @param elem  the element name
  * @param name  the attribute name
  * @param prefix  the attribute namespace prefix
- * @returns the xmlAttributePtr or NULL if not found.
+ * @returns the xmlAttribute or NULL if not found.
  */
 
 xmlAttribute *
@@ -3074,7 +3074,7 @@ xmlGetDtdQAttrDesc(xmlDtd *dtd, const xmlChar *elem, const xmlChar *name,
  *
  * @param dtd  a pointer to the DtD to search
  * @param name  the notation name
- * @returns the xmlNotationPtr or NULL if not found.
+ * @returns the xmlNotation or NULL if not found.
  */
 
 xmlNotation *
diff --git a/xinclude.c b/xinclude.c
index d58a1871..8a498947 100644
--- a/xinclude.c
+++ b/xinclude.c
@@ -819,7 +819,7 @@ error:
  * @param ctxt  the XInclude context
  * @param obj  the XPointer result from the evaluation.
  * @param targetBase  the xml:base of the target node
- * @returns an xmlNodePtr list or NULL.
+ * @returns an xmlNode list or NULL.
  *         the caller has to free the node tree.
  */
 static xmlNodePtr
@@ -1566,7 +1566,7 @@ xmlXIncludeLoadFallback(xmlXIncludeCtxtPtr ctxt, xmlNodePtr fallback,
  *
  * @param ctxt  an XInclude context
  * @param node  an XInclude node
- * @returns the new or existing xmlXIncludeRefPtr, or NULL in case of error.
+ * @returns the new or existing xmlXIncludeRef, or NULL in case of error.
  */
 static xmlXIncludeRefPtr
 xmlXIncludeExpandNode(xmlXIncludeCtxtPtr ctxt, xmlNodePtr node) {
@@ -1634,7 +1634,7 @@ xmlXIncludeExpandNode(xmlXIncludeCtxtPtr ctxt, xmlNodePtr node) {
  * Find and load the infoset replacement for the given node.
  *
  * @param ctxt  an XInclude context
- * @param ref  an xmlXIncludeRefPtr
+ * @param ref  an xmlXIncludeRef
  * @returns 0 if substitution succeeded, -1 if some processing failed
  */
 static int
@@ -1687,7 +1687,7 @@ xmlXIncludeLoadNode(xmlXIncludeCtxtPtr ctxt, xmlXIncludeRefPtr ref) {
  * Implement the infoset replacement for the given node
  *
  * @param ctxt  an XInclude context
- * @param ref  an xmlXIncludeRefPtr
+ * @param ref  an xmlXIncludeRef
  * @returns 0 if substitution succeeded, -1 if some processing failed
  */
 static int
diff --git a/xlink.c b/xlink.c
index 78c7d1a7..c6c072d7 100644
--- a/xlink.c
+++ b/xlink.c
@@ -38,7 +38,7 @@ static xlinkNodeDetectFunc	xlinkDefaultDetect = NULL;
  *
  * @deprecated Don't use.
  *
- * @returns the current xlinkHandlerPtr value.
+ * @returns the current xlinkHandler value.
  */
 xlinkHandler *
 xlinkGetDefaultHandler(void) {
diff --git a/xmlIO.c b/xmlIO.c
index e03b8dd6..6c9449b2 100644
--- a/xmlIO.c
+++ b/xmlIO.c
@@ -1941,7 +1941,7 @@ xmlOutputBufferCreateFile(FILE *file, xmlCharEncodingHandler *encoder) {
  *
  * Consumes `encoder` but not in error case.
  *
- * @param buffer  a xmlBufferPtr
+ * @param buffer  a xmlBuffer
  * @param encoder  the encoding converter or NULL
  * @returns the new parser output or NULL
  */
@@ -1963,7 +1963,7 @@ xmlOutputBufferCreateBuffer(xmlBuffer *buffer,
 /**
  * Gives a pointer to the data currently held in the output buffer
  *
- * @param out  an xmlOutputBufferPtr
+ * @param out  an xmlOutputBuffer
  * @returns a pointer to the data or NULL in case of error
  */
 const xmlChar *
@@ -1977,7 +1977,7 @@ xmlOutputBufferGetContent(xmlOutputBuffer *out) {
 /**
  * Gives the length of the data currently held in the output buffer
  *
- * @param out  an xmlOutputBufferPtr
+ * @param out  an xmlOutputBuffer
  * @returns 0 in case or error or no data is held, the size otherwise
  */
 size_t
diff --git a/xmlreader.c b/xmlreader.c
index 9c42134b..7faa68ff 100644
--- a/xmlreader.c
+++ b/xmlreader.c
@@ -271,7 +271,7 @@ constQString(xmlTextReaderPtr reader, const xmlChar *prefix,
 /**
  * Free a node.
  *
- * @param reader  the xmlTextReaderPtr used
+ * @param reader  the xmlTextReader used
  * @param cur  the node
  */
 static void
@@ -316,7 +316,7 @@ xmlTextReaderFreeProp(xmlTextReaderPtr reader, xmlAttrPtr cur) {
 /**
  * Free a property and all its siblings, all the children are freed too.
  *
- * @param reader  the xmlTextReaderPtr used
+ * @param reader  the xmlTextReader used
  * @param cur  the first property in the list
  */
 static void
@@ -334,7 +334,7 @@ xmlTextReaderFreePropList(xmlTextReaderPtr reader, xmlAttrPtr cur) {
  * Free a node and all its siblings, this is a recursive behaviour, all
  * the children are freed too.
  *
- * @param reader  the xmlTextReaderPtr used
+ * @param reader  the xmlTextReader used
  * @param cur  the first node in the list
  */
 static void
@@ -428,7 +428,7 @@ xmlTextReaderFreeNodeList(xmlTextReaderPtr reader, xmlNodePtr cur) {
  * Free a node, this is a recursive behaviour, all the children are freed too.
  * This doesn't unlink the child from the list, use xmlUnlinkNode() first.
  *
- * @param reader  the xmlTextReaderPtr used
+ * @param reader  the xmlTextReader used
  * @param cur  the node
  */
 static void
@@ -502,7 +502,7 @@ xmlTextReaderFreeNode(xmlTextReaderPtr reader, xmlNodePtr cur) {
 /**
  * Free up all the structures used by a document, tree included.
  *
- * @param reader  the xmlTextReaderPtr used
+ * @param reader  the xmlTextReader used
  * @param cur  pointer to the document
  */
 static void
@@ -585,7 +585,7 @@ xmlTextReaderStructuredRelay(void *userData, const xmlError *error)
 /**
  * Pushes a new entity reference node on top of the entities stack
  *
- * @param reader  the xmlTextReaderPtr used
+ * @param reader  the xmlTextReader used
  * @param value  the entity reference node
  * @returns -1 in case of error, the index in the stack otherwise
  */
@@ -618,7 +618,7 @@ xmlTextReaderEntPush(xmlTextReaderPtr reader, xmlNodePtr value)
 /**
  * Pops the top element entity from the entities stack
  *
- * @param reader  the xmlTextReaderPtr used
+ * @param reader  the xmlTextReader used
  * @returns the entity just removed
  */
 static xmlNodePtr
@@ -782,7 +782,7 @@ xmlTextReaderCDataBlock(void *ctx, const xmlChar *ch, int len)
  * Push data down the progressive parser until a significant callback
  * got raised.
  *
- * @param reader  the xmlTextReaderPtr used
+ * @param reader  the xmlTextReader used
  * @returns -1 in case of failure, 0 otherwise
  */
 static int
@@ -890,7 +890,7 @@ xmlTextReaderPushData(xmlTextReaderPtr reader) {
 /**
  * Push the current node for validation
  *
- * @param reader  the xmlTextReaderPtr used
+ * @param reader  the xmlTextReader used
  */
 static int
 xmlTextReaderValidatePush(xmlTextReaderPtr reader) {
@@ -957,7 +957,7 @@ xmlTextReaderValidatePush(xmlTextReaderPtr reader) {
 /**
  * Push some CData for validation
  *
- * @param reader  the xmlTextReaderPtr used
+ * @param reader  the xmlTextReader used
  * @param data  pointer to the CData
  * @param len  length of the CData block in bytes.
  */
@@ -987,7 +987,7 @@ xmlTextReaderValidateCData(xmlTextReaderPtr reader,
 /**
  * Pop the current node from validation
  *
- * @param reader  the xmlTextReaderPtr used
+ * @param reader  the xmlTextReader used
  */
 static int
 xmlTextReaderValidatePop(xmlTextReaderPtr reader) {
@@ -1046,7 +1046,7 @@ xmlTextReaderValidatePop(xmlTextReaderPtr reader) {
  * entity substitution is not activated. As a result the parser interface
  * must walk through the entity and do the validation calls
  *
- * @param reader  the xmlTextReaderPtr used
+ * @param reader  the xmlTextReader used
  */
 static int
 xmlTextReaderValidateEntity(xmlTextReaderPtr reader) {
@@ -1159,7 +1159,7 @@ xmlTextReaderGetSuccessor(xmlNodePtr cur) {
  * descendant. It means the full DOM subtree must be available at the
  * end of the call.
  *
- * @param reader  the xmlTextReaderPtr used
+ * @param reader  the xmlTextReader used
  * @returns 1 if the node was expanded successfully, 0 if there is no more
  *          nodes to read, or -1 in case of error
  */
@@ -1193,7 +1193,7 @@ xmlTextReaderDoExpand(xmlTextReaderPtr reader) {
  *  Moves the position of the current instance to the next node in
  *  the stream, exposing its properties.
  *
- * @param reader  the xmlTextReaderPtr used
+ * @param reader  the xmlTextReader used
  * @returns 1 if the node was read successfully, 0 if there is no more
  *          nodes to read, or -1 in case of error
  */
@@ -1551,7 +1551,7 @@ node_end:
 /**
  * Gets the read state of the reader.
  *
- * @param reader  the xmlTextReaderPtr used
+ * @param reader  the xmlTextReader used
  * @returns the state value, or -1 in case of error
  */
 int
@@ -1565,7 +1565,7 @@ xmlTextReaderReadState(xmlTextReader *reader) {
  * Reads the contents of the current node and the full subtree. It then makes
  * the subtree available until the next xmlTextReaderRead() call
  *
- * @param reader  the xmlTextReaderPtr used
+ * @param reader  the xmlTextReader used
  * @returns a node pointer valid until the next xmlTextReaderRead() call
  *         or NULL in case of error.
  */
@@ -1586,7 +1586,7 @@ xmlTextReaderExpand(xmlTextReader *reader) {
  * Skip to the node following the current one in document order while
  * avoiding the subtree if any.
  *
- * @param reader  the xmlTextReaderPtr used
+ * @param reader  the xmlTextReader used
  * @returns 1 if the node was read successfully, 0 if there is no more
  *          nodes to read, or -1 in case of error
  */
@@ -1649,7 +1649,7 @@ xmlTextReaderDumpCopy(xmlTextReaderPtr reader, xmlOutputBufferPtr output,
 /**
  * Reads the contents of the current node, including child nodes and markup.
  *
- * @param reader  the xmlTextReaderPtr used
+ * @param reader  the xmlTextReader used
  * @returns a string containing the XML content, or NULL if the current node
  *         is neither an element nor attribute, or has no child nodes. The
  *         string must be deallocated by the caller.
@@ -1688,7 +1688,7 @@ xmlTextReaderReadInnerXml(xmlTextReader *reader)
 /**
  * Reads the contents of the current node, including child nodes and markup.
  *
- * @param reader  the xmlTextReaderPtr used
+ * @param reader  the xmlTextReader used
  * @returns a string containing the node and any XML content, or NULL if the
  *         current node cannot be serialized. The string must be deallocated
  *         by the caller.
@@ -1727,7 +1727,7 @@ xmlTextReaderReadOuterXml(xmlTextReader *reader)
 /**
  * Reads the contents of an element or a text node as a string.
  *
- * @param reader  the xmlTextReaderPtr used
+ * @param reader  the xmlTextReader used
  * @returns a string containing the contents of the non-empty Element or
  *         Text node (including CDATA sections), or NULL if the reader
  *         is positioned on any other type of node.
@@ -1872,7 +1872,7 @@ xmlTextReaderNextTree(xmlTextReaderPtr reader)
  *  Moves the position of the current instance to the next node in
  *  the stream, exposing its properties.
  *
- * @param reader  the xmlTextReaderPtr used
+ * @param reader  the xmlTextReader used
  * @returns 1 if the node was read successfully, 0 if there is no more
  *          nodes to read, or -1 in case of error
  */
@@ -1944,7 +1944,7 @@ found_node:
  * avoiding the subtree if any.
  * Currently implemented only for Readers built on a document
  *
- * @param reader  the xmlTextReaderPtr used
+ * @param reader  the xmlTextReader used
  * @returns 1 if the node was read successfully, 0 if there is no more
  *          nodes to read, or -1 in case of error
  */
@@ -1980,9 +1980,9 @@ xmlTextReaderNextSibling(xmlTextReader *reader) {
 /**
  * Create an xmlTextReader structure fed with `input`
  *
- * @param input  the xmlParserInputBufferPtr used to read data
+ * @param input  the xmlParserInputBuffer used to read data
  * @param URI  the URI information for the source if available
- * @returns the new xmlTextReaderPtr or NULL in case of error
+ * @returns the new xmlTextReader or NULL in case of error
  */
 xmlTextReader *
 xmlNewTextReader(xmlParserInputBuffer *input, const char *URI) {
@@ -2081,7 +2081,7 @@ xmlNewTextReader(xmlParserInputBuffer *input, const char *URI) {
  * Create an xmlTextReader structure fed with the resource at `URI`
  *
  * @param URI  the URI of the resource to process
- * @returns the new xmlTextReaderPtr or NULL in case of error
+ * @returns the new xmlTextReader or NULL in case of error
  */
 xmlTextReader *
 xmlNewTextReaderFilename(const char *URI) {
@@ -2122,7 +2122,7 @@ xmlNewTextReaderFilename(const char *URI) {
 /**
  * Deallocate all the resources associated to the reader
  *
- * @param reader  the xmlTextReaderPtr
+ * @param reader  the xmlTextReader
  */
 void
 xmlFreeTextReader(xmlTextReader *reader) {
@@ -2197,7 +2197,7 @@ xmlFreeTextReader(xmlTextReader *reader) {
  * This method releases any resources allocated by the current instance
  * changes the state to Closed and close any underlying input.
  *
- * @param reader  the xmlTextReaderPtr used
+ * @param reader  the xmlTextReader used
  * @returns 0 or -1 in case of error
  */
 int
@@ -2242,7 +2242,7 @@ xmlTextReaderClose(xmlTextReader *reader) {
  * Provides the value of the attribute with the specified index relative
  * to the containing element.
  *
- * @param reader  the xmlTextReaderPtr used
+ * @param reader  the xmlTextReader used
  * @param no  the zero-based index of the attribute relative to the containing element
  * @returns a string containing the value of the specified attribute, or NULL
  *    in case of error. The string must be deallocated by the caller.
@@ -2292,7 +2292,7 @@ xmlTextReaderGetAttributeNo(xmlTextReader *reader, int no) {
 /**
  * Provides the value of the attribute with the specified qualified name.
  *
- * @param reader  the xmlTextReaderPtr used
+ * @param reader  the xmlTextReader used
  * @param name  the qualified name of the attribute.
  * @returns a string containing the value of the specified attribute, or NULL
  *    in case of error. The string must be deallocated by the caller.
@@ -2375,7 +2375,7 @@ xmlTextReaderGetAttribute(xmlTextReader *reader, const xmlChar *name) {
 /**
  * Provides the value of the specified attribute
  *
- * @param reader  the xmlTextReaderPtr used
+ * @param reader  the xmlTextReader used
  * @param localName  the local name of the attribute.
  * @param namespaceURI  the namespace URI of the attribute.
  * @returns a string containing the value of the specified attribute, or NULL
@@ -2431,8 +2431,8 @@ xmlTextReaderGetAttributeNs(xmlTextReader *reader, const xmlChar *localName,
  * what's left in reader->input, and there is an allocation problem. Best
  * would be to rewrite it differently.
  *
- * @param reader  the xmlTextReaderPtr used
- * @returns the xmlParserInputBufferPtr attached to the XML or NULL
+ * @param reader  the xmlTextReader used
+ * @returns the xmlParserInputBuffer attached to the XML or NULL
  *    in case of error.
  */
 xmlParserInputBuffer *
@@ -2474,7 +2474,7 @@ xmlTextReaderGetRemainder(xmlTextReader *reader) {
 /**
  * Resolves a namespace prefix in the scope of the current element.
  *
- * @param reader  the xmlTextReaderPtr used
+ * @param reader  the xmlTextReader used
  * @param prefix  the prefix whose namespace URI is to be resolved. To return
  *          the default namespace, specify NULL
  * @returns a string containing the namespace URI to which the prefix maps
@@ -2504,7 +2504,7 @@ xmlTextReaderLookupNamespace(xmlTextReader *reader, const xmlChar *prefix) {
  * Moves the position of the current instance to the attribute with
  * the specified index relative to the containing element.
  *
- * @param reader  the xmlTextReaderPtr used
+ * @param reader  the xmlTextReader used
  * @param no  the zero-based index of the attribute relative to the containing
  *      element.
  * @returns 1 in case of success, -1 in case of error, 0 if not found
@@ -2552,7 +2552,7 @@ xmlTextReaderMoveToAttributeNo(xmlTextReader *reader, int no) {
  * Moves the position of the current instance to the attribute with
  * the specified qualified name.
  *
- * @param reader  the xmlTextReaderPtr used
+ * @param reader  the xmlTextReader used
  * @param name  the qualified name of the attribute.
  * @returns 1 in case of success, -1 in case of error, 0 if not found
  */
@@ -2653,7 +2653,7 @@ found:
  * Moves the position of the current instance to the attribute with the
  * specified local name and namespace URI.
  *
- * @param reader  the xmlTextReaderPtr used
+ * @param reader  the xmlTextReader used
  * @param localName  the local name of the attribute.
  * @param namespaceURI  the namespace URI of the attribute.
  * @returns 1 in case of success, -1 in case of error, 0 if not found
@@ -2712,7 +2712,7 @@ xmlTextReaderMoveToAttributeNs(xmlTextReader *reader,
  * Moves the position of the current instance to the first attribute
  * associated with the current node.
  *
- * @param reader  the xmlTextReaderPtr used
+ * @param reader  the xmlTextReader used
  * @returns 1 in case of success, -1 in case of error, 0 if not found
  */
 int
@@ -2739,7 +2739,7 @@ xmlTextReaderMoveToFirstAttribute(xmlTextReader *reader) {
  * Moves the position of the current instance to the next attribute
  * associated with the current node.
  *
- * @param reader  the xmlTextReaderPtr used
+ * @param reader  the xmlTextReader used
  * @returns 1 in case of success, -1 in case of error, 0 if not found
  */
 int
@@ -2776,7 +2776,7 @@ xmlTextReaderMoveToNextAttribute(xmlTextReader *reader) {
  * Moves the position of the current instance to the node that
  * contains the current Attribute  node.
  *
- * @param reader  the xmlTextReaderPtr used
+ * @param reader  the xmlTextReader used
  * @returns 1 in case of success, -1 in case of error, 0 if not moved
  */
 int
@@ -2797,7 +2797,7 @@ xmlTextReaderMoveToElement(xmlTextReader *reader) {
 /**
  * Parses an attribute value into one or more Text and EntityReference nodes.
  *
- * @param reader  the xmlTextReaderPtr used
+ * @param reader  the xmlTextReader used
  * @returns 1 in case of success, 0 if the reader was not positioned on an
  *         attribute node or all the attribute values have been read, or -1
  *         in case of error.
@@ -2851,7 +2851,7 @@ xmlTextReaderReadAttributeValue(xmlTextReader *reader) {
 /**
  * Determine the encoding of the document being read.
  *
- * @param reader  the xmlTextReaderPtr used
+ * @param reader  the xmlTextReader used
  * @returns a string containing the encoding of the document or NULL in
  * case of error.  The string is deallocated with the reader.
  */
@@ -2879,7 +2879,7 @@ xmlTextReaderConstEncoding(xmlTextReader *reader) {
 /**
  * Provides the number of attributes of the current node
  *
- * @param reader  the xmlTextReaderPtr used
+ * @param reader  the xmlTextReader used
  * @returns 0 i no attributes, -1 in case of error or the attribute count
  */
 int
@@ -2923,7 +2923,7 @@ xmlTextReaderAttributeCount(xmlTextReader *reader) {
  * Reference:
  * http://www.gnu.org/software/dotgnu/pnetlib-doc/System/Xml/XmlNodeType.html
  *
- * @param reader  the xmlTextReaderPtr used
+ * @param reader  the xmlTextReader used
  * @returns the xmlReaderTypes of the current node or -1 in case of error
  */
 int
@@ -2990,7 +2990,7 @@ xmlTextReaderNodeType(xmlTextReader *reader) {
 /**
  * Check if the current node is empty
  *
- * @param reader  the xmlTextReaderPtr used
+ * @param reader  the xmlTextReader used
  * @returns 1 if empty, 0 if not and -1 in case of error
  */
 int
@@ -3017,7 +3017,7 @@ xmlTextReaderIsEmptyElement(xmlTextReader *reader) {
 /**
  * The local name of the node.
  *
- * @param reader  the xmlTextReaderPtr used
+ * @param reader  the xmlTextReader used
  * @returns the local name or NULL if not available,
  *   if non NULL it need to be freed by the caller.
  */
@@ -3046,7 +3046,7 @@ xmlTextReaderLocalName(xmlTextReader *reader) {
 /**
  * The local name of the node.
  *
- * @param reader  the xmlTextReaderPtr used
+ * @param reader  the xmlTextReader used
  * @returns the local name or NULL if not available, the
  *         string will be deallocated with the reader.
  */
@@ -3075,7 +3075,7 @@ xmlTextReaderConstLocalName(xmlTextReader *reader) {
 /**
  * The qualified name of the node, equal to Prefix :LocalName.
  *
- * @param reader  the xmlTextReaderPtr used
+ * @param reader  the xmlTextReader used
  * @returns the local name or NULL if not available,
  *   if non NULL it need to be freed by the caller.
  */
@@ -3146,7 +3146,7 @@ xmlTextReaderName(xmlTextReader *reader) {
 /**
  * The qualified name of the node, equal to Prefix :LocalName.
  *
- * @param reader  the xmlTextReaderPtr used
+ * @param reader  the xmlTextReader used
  * @returns the local name or NULL if not available, the string is
  *         deallocated with the reader.
  */
@@ -3209,7 +3209,7 @@ xmlTextReaderConstName(xmlTextReader *reader) {
 /**
  * A shorthand reference to the namespace associated with the node.
  *
- * @param reader  the xmlTextReaderPtr used
+ * @param reader  the xmlTextReader used
  * @returns the prefix or NULL if not available,
  *    if non NULL it need to be freed by the caller.
  */
@@ -3239,7 +3239,7 @@ xmlTextReaderPrefix(xmlTextReader *reader) {
 /**
  * A shorthand reference to the namespace associated with the node.
  *
- * @param reader  the xmlTextReaderPtr used
+ * @param reader  the xmlTextReader used
  * @returns the prefix or NULL if not available, the string is deallocated
  *         with the reader.
  */
@@ -3269,7 +3269,7 @@ xmlTextReaderConstPrefix(xmlTextReader *reader) {
 /**
  * The URI defining the namespace associated with the node.
  *
- * @param reader  the xmlTextReaderPtr used
+ * @param reader  the xmlTextReader used
  * @returns the namespace URI or NULL if not available,
  *    if non NULL it need to be freed by the caller.
  */
@@ -3295,7 +3295,7 @@ xmlTextReaderNamespaceUri(xmlTextReader *reader) {
 /**
  * The URI defining the namespace associated with the node.
  *
- * @param reader  the xmlTextReaderPtr used
+ * @param reader  the xmlTextReader used
  * @returns the namespace URI or NULL if not available, the string
  *         will be deallocated with the reader
  */
@@ -3321,7 +3321,7 @@ xmlTextReaderConstNamespaceUri(xmlTextReader *reader) {
 /**
  * The base URI of the node.
  *
- * @param reader  the xmlTextReaderPtr used
+ * @param reader  the xmlTextReader used
  * @returns the base URI or NULL if not available,
  *    if non NULL it need to be freed by the caller.
  */
@@ -3342,7 +3342,7 @@ xmlTextReaderBaseUri(xmlTextReader *reader) {
 /**
  * The base URI of the node.
  *
- * @param reader  the xmlTextReaderPtr used
+ * @param reader  the xmlTextReader used
  * @returns the base URI or NULL if not available, the string
  *         will be deallocated with the reader
  */
@@ -3367,7 +3367,7 @@ xmlTextReaderConstBaseUri(xmlTextReader *reader) {
 /**
  * The depth of the node in the tree.
  *
- * @param reader  the xmlTextReaderPtr used
+ * @param reader  the xmlTextReader used
  * @returns the depth or -1 in case of error
  */
 int
@@ -3389,7 +3389,7 @@ xmlTextReaderDepth(xmlTextReader *reader) {
 /**
  * Whether the node has attributes.
  *
- * @param reader  the xmlTextReaderPtr used
+ * @param reader  the xmlTextReader used
  * @returns 1 if true, 0 if false, and -1 in case or error
  */
 int
@@ -3414,7 +3414,7 @@ xmlTextReaderHasAttributes(xmlTextReader *reader) {
 /**
  * Whether the node can have a text value.
  *
- * @param reader  the xmlTextReaderPtr used
+ * @param reader  the xmlTextReader used
  * @returns 1 if true, 0 if false, and -1 in case or error
  */
 int
@@ -3446,7 +3446,7 @@ xmlTextReaderHasValue(xmlTextReader *reader) {
 /**
  * Provides the text value of the node if present
  *
- * @param reader  the xmlTextReaderPtr used
+ * @param reader  the xmlTextReader used
  * @returns the string or NULL if not available. The result must be deallocated
  *     with xmlFree()
  */
@@ -3493,7 +3493,7 @@ xmlTextReaderValue(xmlTextReader *reader) {
 /**
  * Provides the text value of the node if present
  *
- * @param reader  the xmlTextReaderPtr used
+ * @param reader  the xmlTextReader used
  * @returns the string or NULL if not available. The result will be
  *     deallocated on the next Read() operation.
  */
@@ -3554,7 +3554,7 @@ xmlTextReaderConstValue(xmlTextReader *reader) {
  * Whether an Attribute  node was generated from the default value
  * defined in the DTD or schema.
  *
- * @param reader  the xmlTextReaderPtr used
+ * @param reader  the xmlTextReader used
  * @returns 0 if not defaulted, 1 if defaulted, and -1 in case of error
  */
 int
@@ -3567,7 +3567,7 @@ xmlTextReaderIsDefault(xmlTextReader *reader) {
 /**
  * The quotation mark character used to enclose the value of an attribute.
  *
- * @param reader  the xmlTextReaderPtr used
+ * @param reader  the xmlTextReader used
  * @returns " or ' and -1 in case of error
  */
 int
@@ -3581,7 +3581,7 @@ xmlTextReaderQuoteChar(xmlTextReader *reader) {
 /**
  * The xml:lang scope within which the node resides.
  *
- * @param reader  the xmlTextReaderPtr used
+ * @param reader  the xmlTextReader used
  * @returns the xml:lang value or NULL if none exists.,
  *    if non NULL it need to be freed by the caller.
  */
@@ -3597,7 +3597,7 @@ xmlTextReaderXmlLang(xmlTextReader *reader) {
 /**
  * The xml:lang scope within which the node resides.
  *
- * @param reader  the xmlTextReaderPtr used
+ * @param reader  the xmlTextReader used
  * @returns the xml:lang value or NULL if none exists.
  */
 const xmlChar *
@@ -3621,7 +3621,7 @@ xmlTextReaderConstXmlLang(xmlTextReader *reader) {
  * Get an interned string from the reader, allows for example to
  * speedup string name comparisons
  *
- * @param reader  the xmlTextReaderPtr used
+ * @param reader  the xmlTextReader used
  * @param str  the string to intern.
  * @returns an interned copy of the string or NULL in case of error. The
  *         string will be deallocated with the reader.
@@ -3640,7 +3640,7 @@ xmlTextReaderConstString(xmlTextReader *reader, const xmlChar *str) {
  * accepting out of range character entities like &\#0; is of course not
  * supported either.
  *
- * @param reader  the xmlTextReaderPtr used
+ * @param reader  the xmlTextReader used
  * @returns 1 or -1 in case of error.
  */
 int
@@ -3661,7 +3661,7 @@ xmlTextReaderNormalization(xmlTextReader *reader) {
  * properties. Note that some properties can only be changed before any
  * read has been done.
  *
- * @param reader  the xmlTextReaderPtr used
+ * @param reader  the xmlTextReader used
  * @param prop  the xmlParserProperties to set
  * @param value  usually 0 or 1 to (de)activate it
  * @returns 0 if the call was successful, or -1 in case of error
@@ -3724,7 +3724,7 @@ xmlTextReaderSetParserProp(xmlTextReader *reader, int prop, int value) {
 /**
  * Read the parser internal property.
  *
- * @param reader  the xmlTextReaderPtr used
+ * @param reader  the xmlTextReader used
  * @param prop  the xmlParserProperties to get
  * @returns the value, usually 0 or 1, or -1 in case of error.
  */
@@ -3788,12 +3788,12 @@ xmlTextReaderGetParserColumnNumber(xmlTextReader *reader)
 }
 
 /**
- * Hacking interface allowing to get the xmlNodePtr corresponding to the
+ * Hacking interface allowing to get the xmlNode corresponding to the
  * current node being accessed by the xmlTextReader. This is dangerous
  * because the underlying node may be destroyed on the next Reads.
  *
- * @param reader  the xmlTextReaderPtr used
- * @returns the xmlNodePtr or NULL in case of error.
+ * @param reader  the xmlTextReader used
+ * @returns the xmlNode or NULL in case of error.
  */
 xmlNode *
 xmlTextReaderCurrentNode(xmlTextReader *reader) {
@@ -3810,8 +3810,8 @@ xmlTextReaderCurrentNode(xmlTextReader *reader) {
  * The caller must also use xmlTextReaderCurrentDoc() to
  * keep an handle on the resulting document once parsing has finished
  *
- * @param reader  the xmlTextReaderPtr used
- * @returns the xmlNodePtr or NULL in case of error.
+ * @param reader  the xmlTextReader used
+ * @returns the xmlNode or NULL in case of error.
  */
 xmlNode *
 xmlTextReaderPreserve(xmlTextReader *reader) {
@@ -3845,7 +3845,7 @@ xmlTextReaderPreserve(xmlTextReader *reader) {
  * pattern. The caller must also use xmlTextReaderCurrentDoc() to
  * keep an handle on the resulting document once parsing has finished
  *
- * @param reader  the xmlTextReaderPtr used
+ * @param reader  the xmlTextReader used
  * @param pattern  an XPath subset pattern
  * @param namespaces  the prefix definitions, array of [URI, prefix] or NULL
  * @returns a non-negative number in case of success and -1 in case of error
@@ -3887,14 +3887,14 @@ xmlTextReaderPreservePattern(xmlTextReader *reader, const xmlChar *pattern,
 #endif
 
 /**
- * Hacking interface allowing to get the xmlDocPtr corresponding to the
+ * Hacking interface allowing to get the xmlDoc corresponding to the
  * current document being accessed by the xmlTextReader.
  * NOTE: as a result of this call, the reader will not destroy the
  *       associated XML document and calling xmlFreeDoc() on the result
  *       is needed once the reader parsing has finished.
  *
- * @param reader  the xmlTextReaderPtr used
- * @returns the xmlDocPtr or NULL in case of error.
+ * @param reader  the xmlTextReader used
+ * @returns the xmlDoc or NULL in case of error.
  */
 xmlDoc *
 xmlTextReaderCurrentDoc(xmlTextReader *reader) {
@@ -3917,7 +3917,7 @@ xmlTextReaderCurrentDoc(xmlTextReader *reader) {
  * The `schema` should not be freed until the reader is deallocated
  * or its use has been deactivated.
  *
- * @param reader  the xmlTextReaderPtr used
+ * @param reader  the xmlTextReader used
  * @param schema  a precompiled RelaxNG schema
  * @returns 0 in case the RelaxNG validation could be (de)activated and
  *         -1 in case of error.
@@ -3968,7 +3968,7 @@ xmlTextReaderRelaxNGSetSchema(xmlTextReader *reader, xmlRelaxNG *schema) {
 /**
  * Internal locator function for the readers
  *
- * @param ctx  the xmlTextReaderPtr used
+ * @param ctx  the xmlTextReader used
  * @param file  returned file information
  * @param line  returned line information
  * @returns 0 in case the Schema validation could be (de)activated and
@@ -4024,7 +4024,7 @@ xmlTextReaderLocator(void *ctx, const char **file, unsigned long *line) {
  * The `schema` should not be freed until the reader is deallocated
  * or its use has been deactivated.
  *
- * @param reader  the xmlTextReaderPtr used
+ * @param reader  the xmlTextReader used
  * @param schema  a precompiled Schema schema
  * @returns 0 in case the Schema validation could be (de)activated and
  *         -1 in case of error.
@@ -4101,7 +4101,7 @@ xmlTextReaderSetSchema(xmlTextReader *reader, xmlSchema *schema) {
  * Activation is only possible before the first Read().
  * If both `rng` and `ctxt` are NULL, then RelaxNG validation is deactivated.
  *
- * @param reader  the xmlTextReaderPtr used
+ * @param reader  the xmlTextReader used
  * @param rng  the path to a RelaxNG schema or NULL
  * @param ctxt  the RelaxNG schema validation context or NULL
  * @param options  options (not yet used)
@@ -4189,7 +4189,7 @@ xmlTextReaderRelaxNGValidateInternal(xmlTextReaderPtr reader,
  * Activation is only possible before the first Read().
  * If both `xsd` and `ctxt` are NULL then XML Schema validation is deactivated.
  *
- * @param reader  the xmlTextReaderPtr used
+ * @param reader  the xmlTextReader used
  * @param xsd  the path to a W3C XSD schema or NULL
  * @param ctxt  the XML Schema validation context or NULL
  * @param options  options (not used yet)
@@ -4296,7 +4296,7 @@ xmlTextReaderSchemaValidateInternal(xmlTextReaderPtr reader,
  * Activation is only possible before the first Read().
  * If `ctxt` is NULL, then XML Schema validation is deactivated.
  *
- * @param reader  the xmlTextReaderPtr used
+ * @param reader  the xmlTextReader used
  * @param ctxt  the XML Schema validation context or NULL
  * @param options  options (not used yet)
  * @returns 0 in case the schemas validation could be (de)activated and
@@ -4315,7 +4315,7 @@ xmlTextReaderSchemaValidateCtxt(xmlTextReader *reader,
  * Activation is only possible before the first Read().
  * If `xsd` is NULL, then XML Schema validation is deactivated.
  *
- * @param reader  the xmlTextReaderPtr used
+ * @param reader  the xmlTextReader used
  * @param xsd  the path to a W3C XSD schema or NULL
  * @returns 0 in case the schemas validation could be (de)activated and
  *         -1 in case of error.
@@ -4333,7 +4333,7 @@ xmlTextReaderSchemaValidate(xmlTextReader *reader, const char *xsd)
  * Activation is only possible before the first Read().
  * If `ctxt` is NULL, then RelaxNG schema validation is deactivated.
  *
- * @param reader  the xmlTextReaderPtr used
+ * @param reader  the xmlTextReader used
  * @param ctxt  the RelaxNG schema validation context or NULL
  * @param options  options (not used yet)
  * @returns 0 in case the schemas validation could be (de)activated and
@@ -4352,7 +4352,7 @@ xmlTextReaderRelaxNGValidateCtxt(xmlTextReader *reader,
  * Activation is only possible before the first Read().
  * If `rng` is NULL, then RelaxNG schema validation is deactivated.
  *
- * @param reader  the xmlTextReaderPtr used
+ * @param reader  the xmlTextReader used
  * @param rng  the path to a RelaxNG schema or NULL
  * @returns 0 in case the schemas validation could be (de)activated and
  *         -1 in case of error.
@@ -4368,7 +4368,7 @@ xmlTextReaderRelaxNGValidate(xmlTextReader *reader, const char *rng)
  * Determine whether the current node is a namespace declaration
  * rather than a regular attribute.
  *
- * @param reader  the xmlTextReaderPtr used
+ * @param reader  the xmlTextReader used
  * @returns 1 if the current node is a namespace declaration, 0 if it
  * is a regular attribute or other type of node, or -1 in case of
  * error.
@@ -4394,7 +4394,7 @@ xmlTextReaderIsNamespaceDecl(xmlTextReader *reader) {
 /**
  * Determine the XML version of the document being read.
  *
- * @param reader  the xmlTextReaderPtr used
+ * @param reader  the xmlTextReader used
  * @returns a string containing the XML version of the document or NULL
  * in case of error.  The string is deallocated with the reader.
  */
@@ -4419,7 +4419,7 @@ xmlTextReaderConstXmlVersion(xmlTextReader *reader) {
 /**
  * Determine the standalone status of the document being read.
  *
- * @param reader  the xmlTextReaderPtr used
+ * @param reader  the xmlTextReader used
  * @returns 1 if the document was declared to be standalone, 0 if it
  * was declared to be not standalone, or -1 if the document did not
  * specify its standalone status or in case of error.
@@ -4448,7 +4448,7 @@ xmlTextReaderStandalone(xmlTextReader *reader) {
 /**
  * Obtain the line number for the given locator.
  *
- * @param locator  the xmlTextReaderLocatorPtr used
+ * @param locator  the void used
  * @returns the line number or -1 in case of error.
  */
 int
@@ -4482,7 +4482,7 @@ xmlTextReaderLocatorLineNumber(xmlTextReaderLocatorPtr locator) {
 /**
  * Obtain the base URI for the given locator.
  *
- * @param locator  the xmlTextReaderLocatorPtr used
+ * @param locator  the void used
  * @returns the base URI or NULL in case of error,
  *    if non NULL it need to be freed by the caller.
  */
@@ -4521,7 +4521,7 @@ xmlTextReaderLocatorBaseURI(xmlTextReaderLocatorPtr locator) {
  *
  * If `f` is NULL, the default error and warning handlers are restored.
  *
- * @param reader  the xmlTextReaderPtr used
+ * @param reader  the xmlTextReader used
  * @param f  	the callback function to call on error and warnings
  * @param arg  a user argument to pass to the callback function
  */
@@ -4578,7 +4578,7 @@ xmlTextReaderSetErrorHandler(xmlTextReader *reader,
  *
  * If `f` is NULL, the default error and warning handlers are restored.
  *
- * @param reader  the xmlTextReaderPtr used
+ * @param reader  the xmlTextReader used
  * @param f  	the callback function to call on error and warnings
  * @param arg  a user argument to pass to the callback function
  */
@@ -4631,7 +4631,7 @@ xmlTextReaderSetStructuredErrorHandler(xmlTextReader *reader,
 /**
  * Retrieve the error callback function and user argument.
  *
- * @param reader  the xmlTextReaderPtr used
+ * @param reader  the xmlTextReader used
  * @param f  	the callback function or NULL is no callback has been registered
  * @param arg  a user argument
  */
@@ -4669,7 +4669,7 @@ xmlTextReaderSetResourceLoader(xmlTextReader *reader,
 /**
  * Retrieve the validity status from the parser context
  *
- * @param reader  the xmlTextReaderPtr used
+ * @param reader  the xmlTextReader used
  * @returns the flag value 1 if valid, 0 if no, and -1 in case of error
  */
 int
@@ -4700,7 +4700,7 @@ xmlTextReaderIsValid(xmlTextReader *reader)
  * Setup an XML reader with new options
  *
  * @param reader  an XML reader
- * @param input  xmlParserInputBufferPtr used to feed the reader, will
+ * @param input  xmlParserInputBuffer used to feed the reader, will
  *         be destroyed with it.
  * @param URL  the base URL to use for the document
  * @param encoding  the document encoding, or NULL
diff --git a/xmlsave.c b/xmlsave.c
index d88d1b72..2d24175f 100644
--- a/xmlsave.c
+++ b/xmlsave.c
@@ -303,7 +303,7 @@ xmlBufDumpNotationDeclScan(void *nota, void *buf,
 /**
  * This will dump the content of the notation table as an XML DTD definition
  *
- * @param buf  an xmlBufPtr output
+ * @param buf  an xmlBuf output
  * @param table  A notation table
  */
 static void
@@ -410,7 +410,7 @@ xmlBufDumpElementContent(xmlOutputBufferPtr buf,
  * This will dump the content of the element declaration as an XML
  * DTD definition
  *
- * @param buf  an xmlBufPtr output
+ * @param buf  an xmlBuf output
  * @param elem  An element table
  */
 static void
@@ -585,7 +585,7 @@ xmlBufDumpEntityContent(xmlOutputBufferPtr buf, const xmlChar *content) {
 /**
  * This will dump the content of the entity table as an XML DTD definition
  *
- * @param buf  an xmlBufPtr output
+ * @param buf  an xmlBuf output
  * @param ent  An entity table
  */
 static void
diff --git a/xmlschemas.c b/xmlschemas.c
index 7ef50498..c3a9b2d7 100644
--- a/xmlschemas.c
+++ b/xmlschemas.c
@@ -28093,7 +28093,7 @@ endElementNsSplit(void *ctx, const xmlChar * localname,
  * but the calls to the original will be maintained.
  *
  * @param ctxt  a schema validation context
- * @param sax  a pointer to the original xmlSAXHandlerPtr
+ * @param sax  a pointer to the original xmlSAXHandler
  * @param user_data  a pointer to the original SAX user data pointer
  * @returns a pointer to a data structure needed to unplug the validation layer
  *         or NULL in case of errors.
@@ -28286,7 +28286,7 @@ xmlSchemaValidateSetLocator(xmlSchemaValidCtxt *vctxt,
 /**
  * Internal locator function for the readers
  *
- * @param ctx  the xmlTextReaderPtr used
+ * @param ctx  the xmlTextReader used
  * @param file  returned file information
  * @param line  returned line information
  * @returns 0 in case the Schema validation could be (de)activated and
diff --git a/xmlschemastypes.c b/xmlschemastypes.c
index c6d9b424..2efa0ab3 100644
--- a/xmlschemastypes.c
+++ b/xmlschemastypes.c
@@ -3753,8 +3753,8 @@ xmlSchemaCompareDurations(xmlSchemaValPtr x, xmlSchemaValPtr y)
  * Makes a copy of `v`. The calling program is responsible for freeing
  * the returned value.
  *
- * @param v  the \#xmlSchemaValPtr value to duplicate
- * @returns a pointer to a duplicated \#xmlSchemaValPtr or NULL if error.
+ * @param v  the \#xmlSchemaVal value to duplicate
+ * @returns a pointer to a duplicated \#xmlSchemaVal or NULL if error.
  */
 static xmlSchemaValPtr
 xmlSchemaDupVal (xmlSchemaValPtr v)
@@ -3880,9 +3880,9 @@ error:
  * or \#XML_SCHEMAS_GYEAR. The returned \#xmlSchemaVal is the same type as
  * `dt`. The calling program is responsible for freeing the returned value.
  *
- * @param dt  an \#xmlSchemaValPtr
- * @param dur  an \#xmlSchemaValPtr of type \#XS_DURATION
- * @returns a pointer to a new \#xmlSchemaVal or NULL if error.
+ * @param dt  an xmlSchemaVal
+ * @param dur  an xmlSchemaVal of type \#XS_DURATION
+ * @returns a pointer to a new xmlSchemaVal or NULL if error.
  */
 static xmlSchemaValPtr
 _xmlSchemaDateAdd (xmlSchemaValPtr dt, xmlSchemaValPtr dur)
@@ -4031,7 +4031,7 @@ _xmlSchemaDateAdd (xmlSchemaValPtr dt, xmlSchemaValPtr dur)
  * Normalize `dt` to GMT time. The `offset` parameter is subtracted from
  * the return value is a time-zone offset is present on `dt`.
  *
- * @param dt  an \#xmlSchemaValPtr of a date/time type value.
+ * @param dt  an \#xmlSchemaVal of a date/time type value.
  * @param offset  number of seconds to adjust `dt` by.
  * @returns a normalized copy of `dt` or NULL if error.
  */
@@ -4071,7 +4071,7 @@ xmlSchemaDateNormalize (xmlSchemaValPtr dt, double offset)
  * years. This is a function  because negative
  * years must be handled a little differently and there is no zero year.
  *
- * @param dt  an \#xmlSchemaValPtr
+ * @param dt  an xmlSchemaVal
  * @returns number of days.
  */
 static long
@@ -4100,7 +4100,7 @@ _xmlSchemaDateCastYMToDays (const xmlSchemaValPtr dt)
 /**
  * Calculates the number of seconds in the time portion of `dt`.
  *
- * @param dt  an \#xmlSchemaValPtr
+ * @param dt  an xmlSchemaVal
  * @returns seconds.
  */
 #define TIME_TO_NUMBER(dt)                              \
@@ -5234,7 +5234,7 @@ xmlSchemaValidateListSimpleTypeFacet(xmlSchemaFacet *facet,
 	}
     } else
 	/*
-	* NOTE: That we can pass NULL as xmlSchemaValPtr to
+	* NOTE: That we can pass NULL as xmlSchemaVal to
 	* xmlSchemaValidateFacet, since the remaining facet types
 	* are: XML_SCHEMA_FACET_PATTERN, XML_SCHEMA_FACET_ENUMERATION.
 	*/
diff --git a/xmlwriter.c b/xmlwriter.c
index cae198ef..6bbd2636 100644
--- a/xmlwriter.c
+++ b/xmlwriter.c
@@ -155,12 +155,12 @@ xmlWriterErrMsgInt(xmlTextWriterPtr ctxt, xmlParserErrors error,
 }
 
 /**
- * Create a new xmlTextWriter structure using an xmlOutputBufferPtr
+ * Create a new xmlTextWriter structure using an xmlOutputBuffer
  * NOTE: the `out` parameter will be deallocated when the writer is closed
  *       (if the call succeed.)
  *
- * @param out  an xmlOutputBufferPtr
- * @returns the new xmlTextWriterPtr or NULL in case of error
+ * @param out  an xmlOutputBuffer
+ * @returns the new xmlTextWriter or NULL in case of error
  */
 xmlTextWriter *
 xmlNewTextWriter(xmlOutputBuffer *out)
@@ -219,7 +219,7 @@ xmlNewTextWriter(xmlOutputBuffer *out)
  *
  * @param uri  the URI of the resource for the output
  * @param compression  compress the output?
- * @returns the new xmlTextWriterPtr or NULL in case of error
+ * @returns the new xmlTextWriter or NULL in case of error
  */
 xmlTextWriter *
 xmlNewTextWriterFilename(const char *uri, int compression)
@@ -251,9 +251,9 @@ xmlNewTextWriterFilename(const char *uri, int compression)
  * Create a new xmlTextWriter structure with `buf` as output
  * TODO: handle compression
  *
- * @param buf  xmlBufferPtr
+ * @param buf  xmlBuffer
  * @param compression  compress the output?
- * @returns the new xmlTextWriterPtr or NULL in case of error
+ * @returns the new xmlTextWriter or NULL in case of error
  */
 xmlTextWriter *
 xmlNewTextWriterMemory(xmlBuffer *buf, int compression ATTRIBUTE_UNUSED)
@@ -287,9 +287,9 @@ xmlNewTextWriterMemory(xmlBuffer *buf, int compression ATTRIBUTE_UNUSED)
  *       (if the call succeeds).
  * TODO: handle compression
  *
- * @param ctxt  xmlParserCtxtPtr to hold the new XML document tree
+ * @param ctxt  xmlParserCtxt to hold the new XML document tree
  * @param compression  compress the output?
- * @returns the new xmlTextWriterPtr or NULL in case of error
+ * @returns the new xmlTextWriter or NULL in case of error
  */
 xmlTextWriter *
 xmlNewTextWriterPushParser(xmlParserCtxt *ctxt,
@@ -327,11 +327,11 @@ xmlNewTextWriterPushParser(xmlParserCtxt *ctxt,
 }
 
 /**
- * Create a new xmlTextWriter structure with @*doc as output
+ * Create a new xmlTextWriter structure with `doc` as output
  *
- * @param doc  address of a xmlDocPtr to hold the new XML document tree
+ * @param doc  address of a xmlDoc to hold the new XML document tree
  * @param compression  compress the output?
- * @returns the new xmlTextWriterPtr or NULL in case of error
+ * @returns the new xmlTextWriter or NULL in case of error
  */
 xmlTextWriter *
 xmlNewTextWriterDoc(xmlDoc ** doc, int compression)
@@ -387,10 +387,10 @@ xmlNewTextWriterDoc(xmlDoc ** doc, int compression)
  * Create a new xmlTextWriter structure with `doc` as output
  * starting at `node`
  *
- * @param doc  xmlDocPtr
- * @param node  xmlNodePtr or NULL for doc->children
+ * @param doc  xmlDoc
+ * @param node  xmlNode or NULL for doc->children
  * @param compression  compress the output?
- * @returns the new xmlTextWriterPtr or NULL in case of error
+ * @returns the new xmlTextWriter or NULL in case of error
  */
 xmlTextWriter *
 xmlNewTextWriterTree(xmlDoc *doc, xmlNode *node, int compression)
@@ -441,7 +441,7 @@ xmlNewTextWriterTree(xmlDoc *doc, xmlNode *node, int compression)
 /**
  * Deallocate all the resources associated to the writer
  *
- * @param writer  the xmlTextWriterPtr
+ * @param writer  the xmlTextWriter
  */
 void
 xmlFreeTextWriter(xmlTextWriter *writer)
@@ -477,7 +477,7 @@ xmlFreeTextWriter(xmlTextWriter *writer)
 /**
  * Start a new xml document
  *
- * @param writer  the xmlTextWriterPtr
+ * @param writer  the xmlTextWriter
  * @param version  the xml version ("1.0") or NULL for default ("1.0")
  * @param encoding  the encoding or NULL for default
  * @param standalone  "yes" or "no" or NULL for default
@@ -598,7 +598,7 @@ xmlTextWriterStartDocument(xmlTextWriter *writer, const char *version,
  * End an xml document. All open elements are closed, and
  * the content is flushed to the output.
  *
- * @param writer  the xmlTextWriterPtr
+ * @param writer  the xmlTextWriter
  * @returns the bytes written or -1 in case of error
  */
 int
@@ -686,7 +686,7 @@ xmlTextWriterEndDocument(xmlTextWriter *writer)
 /**
  * Start an xml comment.
  *
- * @param writer  the xmlTextWriterPtr
+ * @param writer  the xmlTextWriter
  * @returns the bytes written (may be 0 because of buffering) or -1 in case of error
  */
 int
@@ -768,7 +768,7 @@ xmlTextWriterStartComment(xmlTextWriter *writer)
 /**
  * End the current xml comment.
  *
- * @param writer  the xmlTextWriterPtr
+ * @param writer  the xmlTextWriter
  * @returns the bytes written (may be 0 because of buffering) or -1 in case of error
  */
 int
@@ -822,7 +822,7 @@ xmlTextWriterEndComment(xmlTextWriter *writer)
 /**
  * Write an xml comment.
  *
- * @param writer  the xmlTextWriterPtr
+ * @param writer  the xmlTextWriter
  * @param format  format string (see printf)
  * @param ...  extra parameters for the format
  * @returns the bytes written (may be 0 because of buffering) or -1 in case of error
@@ -845,7 +845,7 @@ xmlTextWriterWriteFormatComment(xmlTextWriter *writer,
 /**
  * Write an xml comment.
  *
- * @param writer  the xmlTextWriterPtr
+ * @param writer  the xmlTextWriter
  * @param format  format string (see printf)
  * @param argptr  pointer to the first member of the variable argument list.
  * @returns the bytes written (may be 0 because of buffering) or -1 in case of error
@@ -876,7 +876,7 @@ xmlTextWriterWriteVFormatComment(xmlTextWriter *writer,
 /**
  * Write an xml comment.
  *
- * @param writer  the xmlTextWriterPtr
+ * @param writer  the xmlTextWriter
  * @param content  comment string
  * @returns the bytes written (may be 0 because of buffering) or -1 in case of error
  */
@@ -906,7 +906,7 @@ xmlTextWriterWriteComment(xmlTextWriter *writer, const xmlChar * content)
 /**
  * Start an xml element.
  *
- * @param writer  the xmlTextWriterPtr
+ * @param writer  the xmlTextWriter
  * @param name  element name
  * @returns the bytes written (may be 0 because of buffering) or -1 in case of error
  */
@@ -999,7 +999,7 @@ xmlTextWriterStartElement(xmlTextWriter *writer, const xmlChar * name)
 /**
  * Start an xml element with namespace support.
  *
- * @param writer  the xmlTextWriterPtr
+ * @param writer  the xmlTextWriter
  * @param prefix  namespace prefix or NULL
  * @param name  element local name
  * @param namespaceURI  namespace URI or NULL
@@ -1065,7 +1065,7 @@ xmlTextWriterStartElementNS(xmlTextWriter *writer,
 /**
  * End the current xml element.
  *
- * @param writer  the xmlTextWriterPtr
+ * @param writer  the xmlTextWriter
  * @returns the bytes written (may be 0 because of buffering) or -1 in case of error
  */
 int
@@ -1155,7 +1155,7 @@ xmlTextWriterEndElement(xmlTextWriter *writer)
 /**
  * End the current xml element. Writes an end tag even if the element is empty
  *
- * @param writer  the xmlTextWriterPtr
+ * @param writer  the xmlTextWriter
  * @returns the bytes written (may be 0 because of buffering) or -1 in case of error
  */
 int
@@ -1236,7 +1236,7 @@ xmlTextWriterFullEndElement(xmlTextWriter *writer)
 /**
  * Write a formatted raw xml text.
  *
- * @param writer  the xmlTextWriterPtr
+ * @param writer  the xmlTextWriter
  * @param format  format string (see printf)
  * @param ...  extra parameters for the format
  * @returns the bytes written (may be 0 because of buffering) or -1 in case of error
@@ -1259,7 +1259,7 @@ xmlTextWriterWriteFormatRaw(xmlTextWriter *writer, const char *format,
 /**
  * Write a formatted raw xml text.
  *
- * @param writer  the xmlTextWriterPtr
+ * @param writer  the xmlTextWriter
  * @param format  format string (see printf)
  * @param argptr  pointer to the first member of the variable argument list.
  * @returns the bytes written (may be 0 because of buffering) or -1 in case of error
@@ -1288,7 +1288,7 @@ xmlTextWriterWriteVFormatRaw(xmlTextWriter *writer, const char *format,
  * Write an xml text.
  * TODO: what about entities and special chars??
  *
- * @param writer  the xmlTextWriterPtr
+ * @param writer  the xmlTextWriter
  * @param content  text string
  * @param len  length of the text string
  * @returns the bytes written (may be 0 because of buffering) or -1 in case of error
@@ -1341,7 +1341,7 @@ xmlTextWriterWriteRawLen(xmlTextWriter *writer, const xmlChar * content,
 /**
  * Write a raw xml text.
  *
- * @param writer  the xmlTextWriterPtr
+ * @param writer  the xmlTextWriter
  * @param content  text string
  * @returns the bytes written (may be 0 because of buffering) or -1 in case of error
  */
@@ -1354,7 +1354,7 @@ xmlTextWriterWriteRaw(xmlTextWriter *writer, const xmlChar * content)
 /**
  * Write a formatted xml text.
  *
- * @param writer  the xmlTextWriterPtr
+ * @param writer  the xmlTextWriter
  * @param format  format string (see printf)
  * @param ...  extra parameters for the format
  * @returns the bytes written (may be 0 because of buffering) or -1 in case of error
@@ -1380,7 +1380,7 @@ xmlTextWriterWriteFormatString(xmlTextWriter *writer, const char *format,
 /**
  * Write a formatted xml text.
  *
- * @param writer  the xmlTextWriterPtr
+ * @param writer  the xmlTextWriter
  * @param format  format string (see printf)
  * @param argptr  pointer to the first member of the variable argument list.
  * @returns the bytes written (may be 0 because of buffering) or -1 in case of error
@@ -1408,7 +1408,7 @@ xmlTextWriterWriteVFormatString(xmlTextWriter *writer,
 /**
  * Write an xml text.
  *
- * @param writer  the xmlTextWriterPtr
+ * @param writer  the xmlTextWriter
  * @param content  text string
  * @returns the bytes written (may be 0 because of buffering) or -1 in case of error
  */
@@ -1467,7 +1467,7 @@ xmlTextWriterWriteString(xmlTextWriter *writer, const xmlChar * content)
  * Write base64 encoded data to an xmlOutputBuffer.
  * Adapted from John Walker's base64.c (http://www.fourmilab.ch/).
  *
- * @param out  the xmlOutputBufferPtr
+ * @param out  the xmlOutputBuffer
  * @param data  binary data
  * @param len  the number of bytes to encode
  * @returns the bytes written (may be 0 because of buffering) or -1 in case of error
@@ -1546,7 +1546,7 @@ xmlOutputBufferWriteBase64(xmlOutputBufferPtr out, int len,
 /**
  * Write an base64 encoded xml text.
  *
- * @param writer  the xmlTextWriterPtr
+ * @param writer  the xmlTextWriter
  * @param data  binary data
  * @param start  the position within the data of the first byte to encode
  * @param len  the number of bytes to encode
@@ -1592,7 +1592,7 @@ xmlTextWriterWriteBase64(xmlTextWriter *writer, const char *data,
 /**
  * Write hqx encoded data to an xmlOutputBuffer.
  *
- * @param out  the xmlOutputBufferPtr
+ * @param out  the xmlOutputBuffer
  * @param data  binary data
  * @param len  the number of bytes to encode
  * @returns the bytes written (may be 0 because of buffering)
@@ -1634,7 +1634,7 @@ xmlOutputBufferWriteBinHex(xmlOutputBufferPtr out,
 /**
  * Write a BinHex encoded xml text.
  *
- * @param writer  the xmlTextWriterPtr
+ * @param writer  the xmlTextWriter
  * @param data  binary data
  * @param start  the position within the data of the first byte to encode
  * @param len  the number of bytes to encode
@@ -1680,7 +1680,7 @@ xmlTextWriterWriteBinHex(xmlTextWriter *writer, const char *data,
 /**
  * Start an xml attribute.
  *
- * @param writer  the xmlTextWriterPtr
+ * @param writer  the xmlTextWriter
  * @param name  element name
  * @returns the bytes written (may be 0 because of buffering) or -1 in case of error
  */
@@ -1742,7 +1742,7 @@ xmlTextWriterStartAttribute(xmlTextWriter *writer, const xmlChar * name)
 /**
  * Start an xml attribute with namespace support.
  *
- * @param writer  the xmlTextWriterPtr
+ * @param writer  the xmlTextWriter
  * @param prefix  namespace prefix or NULL
  * @param name  element local name
  * @param namespaceURI  namespace URI or NULL
@@ -1832,7 +1832,7 @@ xmlTextWriterStartAttributeNS(xmlTextWriter *writer,
 /**
  * End the current xml element.
  *
- * @param writer  the xmlTextWriterPtr
+ * @param writer  the xmlTextWriter
  * @returns the bytes written (may be 0 because of buffering) or -1 in case of error
  */
 int
@@ -1877,7 +1877,7 @@ xmlTextWriterEndAttribute(xmlTextWriter *writer)
 /**
  * Write a formatted xml attribute.
  *
- * @param writer  the xmlTextWriterPtr
+ * @param writer  the xmlTextWriter
  * @param name  attribute name
  * @param format  format string (see printf)
  * @param ...  extra parameters for the format
@@ -1902,7 +1902,7 @@ xmlTextWriterWriteFormatAttribute(xmlTextWriter *writer,
 /**
  * Write a formatted xml attribute.
  *
- * @param writer  the xmlTextWriterPtr
+ * @param writer  the xmlTextWriter
  * @param name  attribute name
  * @param format  format string (see printf)
  * @param argptr  pointer to the first member of the variable argument list.
@@ -1932,7 +1932,7 @@ xmlTextWriterWriteVFormatAttribute(xmlTextWriter *writer,
 /**
  * Write an xml attribute.
  *
- * @param writer  the xmlTextWriterPtr
+ * @param writer  the xmlTextWriter
  * @param name  attribute name
  * @param content  attribute content
  * @returns the bytes written (may be 0 because of buffering) or -1 in case of error
@@ -1964,7 +1964,7 @@ xmlTextWriterWriteAttribute(xmlTextWriter *writer, const xmlChar * name,
 /**
  * Write a formatted xml attribute.with namespace support
  *
- * @param writer  the xmlTextWriterPtr
+ * @param writer  the xmlTextWriter
  * @param prefix  namespace prefix
  * @param name  attribute local name
  * @param namespaceURI  namespace URI
@@ -1994,7 +1994,7 @@ xmlTextWriterWriteFormatAttributeNS(xmlTextWriter *writer,
 /**
  * Write a formatted xml attribute.with namespace support
  *
- * @param writer  the xmlTextWriterPtr
+ * @param writer  the xmlTextWriter
  * @param prefix  namespace prefix
  * @param name  attribute local name
  * @param namespaceURI  namespace URI
@@ -2029,7 +2029,7 @@ xmlTextWriterWriteVFormatAttributeNS(xmlTextWriter *writer,
 /**
  * Write an xml attribute.
  *
- * @param writer  the xmlTextWriterPtr
+ * @param writer  the xmlTextWriter
  * @param prefix  namespace prefix
  * @param name  attribute local name
  * @param namespaceURI  namespace URI
@@ -2068,7 +2068,7 @@ xmlTextWriterWriteAttributeNS(xmlTextWriter *writer,
 /**
  * Write a formatted xml element.
  *
- * @param writer  the xmlTextWriterPtr
+ * @param writer  the xmlTextWriter
  * @param name  element name
  * @param format  format string (see printf)
  * @param ...  extra parameters for the format
@@ -2093,7 +2093,7 @@ xmlTextWriterWriteFormatElement(xmlTextWriter *writer,
 /**
  * Write a formatted xml element.
  *
- * @param writer  the xmlTextWriterPtr
+ * @param writer  the xmlTextWriter
  * @param name  element name
  * @param format  format string (see printf)
  * @param argptr  pointer to the first member of the variable argument list.
@@ -2123,7 +2123,7 @@ xmlTextWriterWriteVFormatElement(xmlTextWriter *writer,
 /**
  * Write an xml element.
  *
- * @param writer  the xmlTextWriterPtr
+ * @param writer  the xmlTextWriter
  * @param name  element name
  * @param content  element content
  * @returns the bytes written (may be 0 because of buffering) or -1 in case of error
@@ -2157,7 +2157,7 @@ xmlTextWriterWriteElement(xmlTextWriter *writer, const xmlChar * name,
 /**
  * Write a formatted xml element with namespace support.
  *
- * @param writer  the xmlTextWriterPtr
+ * @param writer  the xmlTextWriter
  * @param prefix  namespace prefix
  * @param name  element local name
  * @param namespaceURI  namespace URI
@@ -2187,7 +2187,7 @@ xmlTextWriterWriteFormatElementNS(xmlTextWriter *writer,
 /**
  * Write a formatted xml element with namespace support.
  *
- * @param writer  the xmlTextWriterPtr
+ * @param writer  the xmlTextWriter
  * @param prefix  namespace prefix
  * @param name  element local name
  * @param namespaceURI  namespace URI
@@ -2222,7 +2222,7 @@ xmlTextWriterWriteVFormatElementNS(xmlTextWriter *writer,
 /**
  * Write an xml element with namespace support.
  *
- * @param writer  the xmlTextWriterPtr
+ * @param writer  the xmlTextWriter
  * @param prefix  namespace prefix
  * @param name  element local name
  * @param namespaceURI  namespace URI
@@ -2262,7 +2262,7 @@ xmlTextWriterWriteElementNS(xmlTextWriter *writer,
 /**
  * Start an xml PI.
  *
- * @param writer  the xmlTextWriterPtr
+ * @param writer  the xmlTextWriter
  * @param target  PI target
  * @returns the bytes written (may be 0 because of buffering) or -1 in case of error
  */
@@ -2357,7 +2357,7 @@ xmlTextWriterStartPI(xmlTextWriter *writer, const xmlChar * target)
 /**
  * End the current xml PI.
  *
- * @param writer  the xmlTextWriterPtr
+ * @param writer  the xmlTextWriter
  * @returns the bytes written (may be 0 because of buffering) or -1 in case of error
  */
 int
@@ -2406,7 +2406,7 @@ xmlTextWriterEndPI(xmlTextWriter *writer)
 /**
  * Write a formatted PI.
  *
- * @param writer  the xmlTextWriterPtr
+ * @param writer  the xmlTextWriter
  * @param target  PI target
  * @param format  format string (see printf)
  * @param ...  extra parameters for the format
@@ -2430,7 +2430,7 @@ xmlTextWriterWriteFormatPI(xmlTextWriter *writer, const xmlChar * target,
 /**
  * Write a formatted xml PI.
  *
- * @param writer  the xmlTextWriterPtr
+ * @param writer  the xmlTextWriter
  * @param target  PI target
  * @param format  format string (see printf)
  * @param argptr  pointer to the first member of the variable argument list.
@@ -2460,7 +2460,7 @@ xmlTextWriterWriteVFormatPI(xmlTextWriter *writer,
 /**
  * Write an xml PI.
  *
- * @param writer  the xmlTextWriterPtr
+ * @param writer  the xmlTextWriter
  * @param target  PI target
  * @param content  PI content
  * @returns the bytes written (may be 0 because of buffering) or -1 in case of error
@@ -2494,7 +2494,7 @@ xmlTextWriterWritePI(xmlTextWriter *writer, const xmlChar * target,
 /**
  * Start an xml CDATA section.
  *
- * @param writer  the xmlTextWriterPtr
+ * @param writer  the xmlTextWriter
  * @returns the bytes written (may be 0 because of buffering) or -1 in case of error
  */
 int
@@ -2571,7 +2571,7 @@ xmlTextWriterStartCDATA(xmlTextWriter *writer)
 /**
  * End an xml CDATA section.
  *
- * @param writer  the xmlTextWriterPtr
+ * @param writer  the xmlTextWriter
  * @returns the bytes written (may be 0 because of buffering) or -1 in case of error
  */
 int
@@ -2612,7 +2612,7 @@ xmlTextWriterEndCDATA(xmlTextWriter *writer)
 /**
  * Write a formatted xml CDATA.
  *
- * @param writer  the xmlTextWriterPtr
+ * @param writer  the xmlTextWriter
  * @param format  format string (see printf)
  * @param ...  extra parameters for the format
  * @returns the bytes written (may be 0 because of buffering) or -1 in case of error
@@ -2635,7 +2635,7 @@ xmlTextWriterWriteFormatCDATA(xmlTextWriter *writer, const char *format,
 /**
  * Write a formatted xml CDATA.
  *
- * @param writer  the xmlTextWriterPtr
+ * @param writer  the xmlTextWriter
  * @param format  format string (see printf)
  * @param argptr  pointer to the first member of the variable argument list.
  * @returns the bytes written (may be 0 because of buffering) or -1 in case of error
@@ -2663,7 +2663,7 @@ xmlTextWriterWriteVFormatCDATA(xmlTextWriter *writer, const char *format,
 /**
  * Write an xml CDATA.
  *
- * @param writer  the xmlTextWriterPtr
+ * @param writer  the xmlTextWriter
  * @param content  CDATA content
  * @returns the bytes written (may be 0 because of buffering) or -1 in case of error
  */
@@ -2695,7 +2695,7 @@ xmlTextWriterWriteCDATA(xmlTextWriter *writer, const xmlChar * content)
 /**
  * Start an xml DTD.
  *
- * @param writer  the xmlTextWriterPtr
+ * @param writer  the xmlTextWriter
  * @param name  the name of the DTD
  * @param pubid  the public identifier, which is an alternative to the system identifier
  * @param sysid  the system identifier, which is the URI of the DTD
@@ -2833,7 +2833,7 @@ xmlTextWriterStartDTD(xmlTextWriter *writer,
 /**
  * End an xml DTD.
  *
- * @param writer  the xmlTextWriterPtr
+ * @param writer  the xmlTextWriter
  * @returns the bytes written (may be 0 because of buffering) or -1 in case of error
  */
 int
@@ -2908,7 +2908,7 @@ xmlTextWriterEndDTD(xmlTextWriter *writer)
 /**
  * Write a DTD with a formatted markup declarations part.
  *
- * @param writer  the xmlTextWriterPtr
+ * @param writer  the xmlTextWriter
  * @param name  the name of the DTD
  * @param pubid  the public identifier, which is an alternative to the system identifier
  * @param sysid  the system identifier, which is the URI of the DTD
@@ -2937,7 +2937,7 @@ xmlTextWriterWriteFormatDTD(xmlTextWriter *writer,
 /**
  * Write a DTD with a formatted markup declarations part.
  *
- * @param writer  the xmlTextWriterPtr
+ * @param writer  the xmlTextWriter
  * @param name  the name of the DTD
  * @param pubid  the public identifier, which is an alternative to the system identifier
  * @param sysid  the system identifier, which is the URI of the DTD
@@ -2971,7 +2971,7 @@ xmlTextWriterWriteVFormatDTD(xmlTextWriter *writer,
 /**
  * Write a DTD.
  *
- * @param writer  the xmlTextWriterPtr
+ * @param writer  the xmlTextWriter
  * @param name  the name of the DTD
  * @param pubid  the public identifier, which is an alternative to the system identifier
  * @param sysid  the system identifier, which is the URI of the DTD
@@ -3009,7 +3009,7 @@ xmlTextWriterWriteDTD(xmlTextWriter *writer,
 /**
  * Start an xml DTD element.
  *
- * @param writer  the xmlTextWriterPtr
+ * @param writer  the xmlTextWriter
  * @param name  the name of the DTD element
  * @returns the bytes written (may be 0 because of buffering) or -1 in case of error
  */
@@ -3095,7 +3095,7 @@ xmlTextWriterStartDTDElement(xmlTextWriter *writer, const xmlChar * name)
 /**
  * End an xml DTD element.
  *
- * @param writer  the xmlTextWriterPtr
+ * @param writer  the xmlTextWriter
  * @returns the bytes written (may be 0 because of buffering) or -1 in case of error
  */
 int
@@ -3144,7 +3144,7 @@ xmlTextWriterEndDTDElement(xmlTextWriter *writer)
 /**
  * Write a formatted DTD element.
  *
- * @param writer  the xmlTextWriterPtr
+ * @param writer  the xmlTextWriter
  * @param name  the name of the DTD element
  * @param format  format string (see printf)
  * @param ...  extra parameters for the format
@@ -3169,7 +3169,7 @@ xmlTextWriterWriteFormatDTDElement(xmlTextWriter *writer,
 /**
  * Write a formatted DTD element.
  *
- * @param writer  the xmlTextWriterPtr
+ * @param writer  the xmlTextWriter
  * @param name  the name of the DTD element
  * @param format  format string (see printf)
  * @param argptr  pointer to the first member of the variable argument list.
@@ -3199,7 +3199,7 @@ xmlTextWriterWriteVFormatDTDElement(xmlTextWriter *writer,
 /**
  * Write a DTD element.
  *
- * @param writer  the xmlTextWriterPtr
+ * @param writer  the xmlTextWriter
  * @param name  the name of the DTD element
  * @param content  content of the element
  * @returns the bytes written (may be 0 because of buffering) or -1 in case of error
@@ -3236,7 +3236,7 @@ xmlTextWriterWriteDTDElement(xmlTextWriter *writer,
 /**
  * Start an xml DTD ATTLIST.
  *
- * @param writer  the xmlTextWriterPtr
+ * @param writer  the xmlTextWriter
  * @param name  the name of the DTD ATTLIST
  * @returns the bytes written (may be 0 because of buffering) or -1 in case of error
  */
@@ -3322,7 +3322,7 @@ xmlTextWriterStartDTDAttlist(xmlTextWriter *writer, const xmlChar * name)
 /**
  * End an xml DTD attribute list.
  *
- * @param writer  the xmlTextWriterPtr
+ * @param writer  the xmlTextWriter
  * @returns the bytes written (may be 0 because of buffering) or -1 in case of error
  */
 int
@@ -3371,7 +3371,7 @@ xmlTextWriterEndDTDAttlist(xmlTextWriter *writer)
 /**
  * Write a formatted DTD ATTLIST.
  *
- * @param writer  the xmlTextWriterPtr
+ * @param writer  the xmlTextWriter
  * @param name  the name of the DTD ATTLIST
  * @param format  format string (see printf)
  * @param ...  extra parameters for the format
@@ -3396,7 +3396,7 @@ xmlTextWriterWriteFormatDTDAttlist(xmlTextWriter *writer,
 /**
  * Write a formatted DTD ATTLIST.
  *
- * @param writer  the xmlTextWriterPtr
+ * @param writer  the xmlTextWriter
  * @param name  the name of the DTD ATTLIST
  * @param format  format string (see printf)
  * @param argptr  pointer to the first member of the variable argument list.
@@ -3426,7 +3426,7 @@ xmlTextWriterWriteVFormatDTDAttlist(xmlTextWriter *writer,
 /**
  * Write a DTD ATTLIST.
  *
- * @param writer  the xmlTextWriterPtr
+ * @param writer  the xmlTextWriter
  * @param name  the name of the DTD ATTLIST
  * @param content  content of the ATTLIST
  * @returns the bytes written (may be 0 because of buffering) or -1 in case of error
@@ -3463,7 +3463,7 @@ xmlTextWriterWriteDTDAttlist(xmlTextWriter *writer,
 /**
  * Start an xml DTD ATTLIST.
  *
- * @param writer  the xmlTextWriterPtr
+ * @param writer  the xmlTextWriter
  * @param pe  TRUE if this is a parameter entity, FALSE if not
  * @param name  the name of the DTD ATTLIST
  * @returns the bytes written (may be 0 because of buffering) or -1 in case of error
@@ -3563,7 +3563,7 @@ xmlTextWriterStartDTDEntity(xmlTextWriter *writer,
 /**
  * End an xml DTD entity.
  *
- * @param writer  the xmlTextWriterPtr
+ * @param writer  the xmlTextWriter
  * @returns the bytes written (may be 0 because of buffering) or -1 in case of error
  */
 int
@@ -3618,7 +3618,7 @@ xmlTextWriterEndDTDEntity(xmlTextWriter *writer)
 /**
  * Write a formatted DTD internal entity.
  *
- * @param writer  the xmlTextWriterPtr
+ * @param writer  the xmlTextWriter
  * @param pe  TRUE if this is a parameter entity, FALSE if not
  * @param name  the name of the DTD entity
  * @param format  format string (see printf)
@@ -3646,7 +3646,7 @@ xmlTextWriterWriteFormatDTDInternalEntity(xmlTextWriter *writer,
 /**
  * Write a formatted DTD internal entity.
  *
- * @param writer  the xmlTextWriterPtr
+ * @param writer  the xmlTextWriter
  * @param pe  TRUE if this is a parameter entity, FALSE if not
  * @param name  the name of the DTD entity
  * @param format  format string (see printf)
@@ -3679,7 +3679,7 @@ xmlTextWriterWriteVFormatDTDInternalEntity(xmlTextWriter *writer,
 /**
  * Write a DTD entity.
  *
- * @param writer  the xmlTextWriterPtr
+ * @param writer  the xmlTextWriter
  * @param pe  TRUE if this is a parameter entity, FALSE if not
  * @param name  the name of the DTD entity
  * @param pubid  the public identifier, which is an alternative to the system identifier
@@ -3713,7 +3713,7 @@ xmlTextWriterWriteDTDEntity(xmlTextWriter *writer,
 /**
  * Write a DTD internal entity.
  *
- * @param writer  the xmlTextWriterPtr
+ * @param writer  the xmlTextWriter
  * @param pe  TRUE if this is a parameter entity, FALSE if not
  * @param name  the name of the DTD entity
  * @param content  content of the entity
@@ -3753,7 +3753,7 @@ xmlTextWriterWriteDTDInternalEntity(xmlTextWriter *writer,
 /**
  * Write a DTD external entity. The entity must have been started with xmlTextWriterStartDTDEntity()
  *
- * @param writer  the xmlTextWriterPtr
+ * @param writer  the xmlTextWriter
  * @param pe  TRUE if this is a parameter entity, FALSE if not
  * @param name  the name of the DTD entity
  * @param pubid  the public identifier, which is an alternative to the system identifier
@@ -3801,7 +3801,7 @@ xmlTextWriterWriteDTDExternalEntity(xmlTextWriter *writer,
 /**
  * Write the contents of a DTD external entity.
  *
- * @param writer  the xmlTextWriterPtr
+ * @param writer  the xmlTextWriter
  * @param pubid  the public identifier, which is an alternative to the system identifier
  * @param sysid  the system identifier, which is the URI of the DTD
  * @param ndataid  the xml notation name.
@@ -3931,7 +3931,7 @@ xmlTextWriterWriteDTDExternalEntityContents(xmlTextWriter *writer,
 /**
  * Write a DTD entity.
  *
- * @param writer  the xmlTextWriterPtr
+ * @param writer  the xmlTextWriter
  * @param name  the name of the xml notation
  * @param pubid  the public identifier, which is an alternative to the system identifier
  * @param sysid  the system identifier, which is the URI of the DTD
@@ -4052,7 +4052,7 @@ xmlTextWriterWriteDTDNotation(xmlTextWriter *writer,
 /**
  * Flush the output buffer.
  *
- * @param writer  the xmlTextWriterPtr
+ * @param writer  the xmlTextWriter
  * @returns the bytes written (may be 0 because of buffering) or -1 in case of error
  */
 int
@@ -4076,7 +4076,7 @@ xmlTextWriterFlush(xmlTextWriter *writer)
  *
  * @since 2.13.0
  *
- * @param writer  the xmlTextWriterPtr
+ * @param writer  the xmlTextWriter
  * @returns an xmlParserErrors code.
  */
 int
@@ -4105,7 +4105,7 @@ xmlTextWriterClose(xmlTextWriter *writer)
 /**
  * Free callback for the xmlList.
  *
- * @param lk  the xmlLinkPtr
+ * @param lk  the xmlLink
  */
 static void
 xmlFreeTextWriterStackEntry(xmlLinkPtr lk)
@@ -4156,7 +4156,7 @@ xmlCmpTextWriterStackEntry(const void *data0, const void *data1)
 /**
  * Output the current namespace declarations.
  *
- * @param writer  the xmlTextWriterPtr
+ * @param writer  the xmlTextWriter
  */
 static int
 xmlTextWriterOutputNSDecl(xmlTextWriterPtr writer)
@@ -4200,7 +4200,7 @@ xmlTextWriterOutputNSDecl(xmlTextWriterPtr writer)
 /**
  * Free callback for the xmlList.
  *
- * @param lk  the xmlLinkPtr
+ * @param lk  the xmlLink
  */
 static void
 xmlFreeTextWriterNsStackEntry(xmlLinkPtr lk)
@@ -4256,7 +4256,7 @@ xmlCmpTextWriterNsStackEntry(const void *data0, const void *data1)
 /**
  * Write callback for the xmlOutputBuffer with target xmlBuffer
  *
- * @param context  the xmlBufferPtr
+ * @param context  the xmlBuffer
  * @param str  the data to write
  * @param len  the length of the data
  * @returns -1, 0, 1
@@ -4281,7 +4281,7 @@ xmlTextWriterWriteDocCallback(void *context, const char *str, int len)
 /**
  * Close callback for the xmlOutputBuffer with target xmlBuffer
  *
- * @param context  the xmlBufferPtr
+ * @param context  the xmlBuffer
  * @returns -1, 0, 1
  */
 static int
@@ -4394,7 +4394,7 @@ xmlTextWriterStartDocumentCallback(void *ctx)
 /**
  * Set indentation output. indent = 0 do not indentation. indent > 0 do indentation.
  *
- * @param writer  the xmlTextWriterPtr
+ * @param writer  the xmlTextWriter
  * @param indent  do indentation?
  * @returns -1 on error or 0 otherwise.
  */
@@ -4413,7 +4413,7 @@ xmlTextWriterSetIndent(xmlTextWriter *writer, int indent)
 /**
  * Set string indentation.
  *
- * @param writer  the xmlTextWriterPtr
+ * @param writer  the xmlTextWriter
  * @param str  the xmlChar string
  * @returns -1 on error or 0 otherwise.
  */
@@ -4436,7 +4436,7 @@ xmlTextWriterSetIndentString(xmlTextWriter *writer, const xmlChar * str)
 /**
  * Set the character used for quoting attributes.
  *
- * @param writer  the xmlTextWriterPtr
+ * @param writer  the xmlTextWriter
  * @param quotechar  the quote character
  * @returns -1 on error or 0 otherwise.
  */
@@ -4454,7 +4454,7 @@ xmlTextWriterSetQuoteChar(xmlTextWriter *writer, xmlChar quotechar)
 /**
  * Write indent string.
  *
- * @param writer  the xmlTextWriterPtr
+ * @param writer  the xmlTextWriter
  * @returns -1 on error or the number of strings written.
  */
 static int
@@ -4480,7 +4480,7 @@ xmlTextWriterWriteIndent(xmlTextWriterPtr writer)
 /**
  * Write state dependent strings.
  *
- * @param writer  the xmlTextWriterPtr
+ * @param writer  the xmlTextWriter
  * @param p  the xmlTextWriterStackEntry
  * @returns -1 on error or the number of characters written.
  */
diff --git a/xpath.c b/xpath.c
index d42b4b11..772f3a6e 100644
--- a/xpath.c
+++ b/xpath.c
@@ -918,7 +918,7 @@ xmlXPathFreeObjectEntry(void *obj, const xmlChar *name);
 /**
  * Create a new Xpath component
  *
- * @returns the newly allocated xmlXPathCompExprPtr or NULL in case of error
+ * @returns the newly allocated xmlXPathCompExpr or NULL in case of error
  */
 static xmlXPathCompExprPtr
 xmlXPathNewCompExpr(void) {
@@ -1591,7 +1591,7 @@ xmlXPathContextSetCache(xmlXPathContext *ctxt,
 
 /**
  * This is the cached version of xmlXPathWrapNodeSet().
- * Wrap the Nodeset `val` in a new xmlXPathObjectPtr
+ * Wrap the Nodeset `val` in a new xmlXPathObject
  *
  * In case of error the node set is destroyed and NULL is returned.
  *
@@ -1661,7 +1661,7 @@ xmlXPathCacheWrapString(xmlXPathParserContextPtr pctxt, xmlChar *val)
 
 /**
  * This is the cached version of xmlXPathNewNodeSet().
- * Acquire an xmlXPathObjectPtr of type NodeSet and initialize
+ * Acquire an xmlXPathObject of type NodeSet and initialize
  * it with the single Node `val`
  *
  * @param pctxt  the XPath context
@@ -1729,7 +1729,7 @@ xmlXPathCacheNewNodeSet(xmlXPathParserContextPtr pctxt, xmlNodePtr val)
 
 /**
  * This is the cached version of xmlXPathNewString().
- * Acquire an xmlXPathObjectPtr of type string and of value `val`
+ * Acquire an xmlXPathObject of type string and of value `val`
  *
  * @param pctxt  the XPath context
  * @param val  the xmlChar * value
@@ -1772,7 +1772,7 @@ xmlXPathCacheNewString(xmlXPathParserContextPtr pctxt, const xmlChar *val)
 
 /**
  * This is the cached version of xmlXPathNewCString().
- * Acquire an xmlXPathObjectPtr of type string and of value `val`
+ * Acquire an xmlXPathObject of type string and of value `val`
  *
  * @param pctxt  the XPath context
  * @param val  the char * value
@@ -1786,7 +1786,7 @@ xmlXPathCacheNewCString(xmlXPathParserContextPtr pctxt, const char *val)
 
 /**
  * This is the cached version of xmlXPathNewBoolean().
- * Acquires an xmlXPathObjectPtr of type boolean and of value `val`
+ * Acquires an xmlXPathObject of type boolean and of value `val`
  *
  * @param pctxt  the XPath context
  * @param val  the boolean value
@@ -1820,7 +1820,7 @@ xmlXPathCacheNewBoolean(xmlXPathParserContextPtr pctxt, int val)
 
 /**
  * This is the cached version of xmlXPathNewFloat().
- * Acquires an xmlXPathObjectPtr of type double and of value `val`
+ * Acquires an xmlXPathObject of type double and of value `val`
  *
  * @param pctxt  the XPath context
  * @param val  the double value
@@ -2649,9 +2649,9 @@ xmlXPathNodeSetFreeNs(xmlNs *ns) {
 }
 
 /**
- * Create a new xmlNodeSetPtr of type double and of value `val`
+ * Create a new xmlNodeSet of type double and of value `val`
  *
- * @param val  an initial xmlNodePtr, or NULL
+ * @param val  an initial xmlNode, or NULL
  * @returns the newly created object.
  */
 xmlNodeSet *
@@ -2785,10 +2785,10 @@ xmlXPathNodeSetAddNs(xmlNodeSet *cur, xmlNode *node, xmlNs *ns) {
 }
 
 /**
- * add a new xmlNodePtr to an existing NodeSet
+ * add a new xmlNode to an existing NodeSet
  *
  * @param cur  the initial node set
- * @param val  a new xmlNodePtr
+ * @param val  a new xmlNode
  * @returns 0 in case of success, and -1 in case of error
  */
 int
@@ -2825,11 +2825,11 @@ xmlXPathNodeSetAdd(xmlNodeSet *cur, xmlNode *val) {
 }
 
 /**
- * add a new xmlNodePtr to an existing NodeSet, optimized version
+ * add a new xmlNode to an existing NodeSet, optimized version
  * when we are sure the node is not already in the set.
  *
  * @param cur  the initial node set
- * @param val  a new xmlNodePtr
+ * @param val  a new xmlNode
  * @returns 0 in case of success and -1 in case of failure
  */
 int
@@ -3034,10 +3034,10 @@ error:
 }
 
 /**
- * Removes an xmlNodePtr from an existing NodeSet
+ * Removes an xmlNode from an existing NodeSet
  *
  * @param cur  the initial node set
- * @param val  an xmlNodePtr
+ * @param val  an xmlNode
  */
 void
 xmlXPathNodeSetDel(xmlNodeSet *cur, xmlNode *val) {
@@ -3086,7 +3086,7 @@ xmlXPathNodeSetRemove(xmlNodeSet *cur, int val) {
 /**
  * Free the NodeSet compound (not the actual nodes !).
  *
- * @param obj  the xmlNodeSetPtr to free
+ * @param obj  the xmlNodeSet to free
  */
 void
 xmlXPathFreeNodeSet(xmlNodeSet *obj) {
@@ -3172,7 +3172,7 @@ xmlXPathNodeSetKeepLast(xmlNodeSetPtr set)
 }
 
 /**
- * Create a new xmlXPathObjectPtr of type NodeSet and initialize
+ * Create a new xmlXPathObject of type NodeSet and initialize
  * it with the single Node `val`
  *
  * @param val  the NodePtr value
@@ -3198,7 +3198,7 @@ xmlXPathNewNodeSet(xmlNode *val) {
 }
 
 /**
- * Create a new xmlXPathObjectPtr of type Value Tree (XSLT) and initialize
+ * Create a new xmlXPathObject of type Value Tree (XSLT) and initialize
  * it with the tree root `val`
  *
  * @param val  the NodePtr value
@@ -3217,7 +3217,7 @@ xmlXPathNewValueTree(xmlNode *val) {
 }
 
 /**
- * Create a new xmlXPathObjectPtr of type NodeSet and initialize
+ * Create a new xmlXPathObject of type NodeSet and initialize
  * it with the Nodeset `val`
  *
  * @param val  an existing NodeSet
@@ -3247,7 +3247,7 @@ xmlXPathNewNodeSetList(xmlNodeSet *val)
 }
 
 /**
- * Wrap the Nodeset `val` in a new xmlXPathObjectPtr
+ * Wrap the Nodeset `val` in a new xmlXPathObject
  *
  * In case of error the node set is destroyed and NULL is returned.
  *
@@ -3270,7 +3270,7 @@ xmlXPathWrapNodeSet(xmlNodeSet *val) {
 }
 
 /**
- * Free up the xmlXPathObjectPtr `obj` but don't deallocate the objects in
+ * Free up the xmlXPathObject `obj` but don't deallocate the objects in
  * the list contrary to xmlXPathFreeObject().
  *
  * @param obj  an existing NodeSetList object
@@ -4038,7 +4038,7 @@ xmlXPathRegisteredNsCleanup(xmlXPathContext *ctxt) {
 /* Allocations are terrible, one needs to optimize all this !!! */
 
 /**
- * Create a new xmlXPathObjectPtr of type double and of value `val`
+ * Create a new xmlXPathObject of type double and of value `val`
  *
  * @param val  the double value
  * @returns the newly created object.
@@ -4057,7 +4057,7 @@ xmlXPathNewFloat(double val) {
 }
 
 /**
- * Create a new xmlXPathObjectPtr of type boolean and of value `val`
+ * Create a new xmlXPathObject of type boolean and of value `val`
  *
  * @param val  the boolean value
  * @returns the newly created object.
@@ -4076,7 +4076,7 @@ xmlXPathNewBoolean(int val) {
 }
 
 /**
- * Create a new xmlXPathObjectPtr of type string and of value `val`
+ * Create a new xmlXPathObject of type string and of value `val`
  *
  * @param val  the xmlChar * value
  * @returns the newly created object.
@@ -4124,7 +4124,7 @@ xmlXPathWrapString (xmlChar *val) {
 }
 
 /**
- * Create a new xmlXPathObjectPtr of type string and of value `val`
+ * Create a new xmlXPathObject of type string and of value `val`
  *
  * @param val  the char * value
  * @returns the newly created object.
@@ -4214,7 +4214,7 @@ xmlXPathObjectCopy(xmlXPathObject *val) {
 }
 
 /**
- * Free up an xmlXPathObjectPtr object.
+ * Free up an xmlXPathObject object.
  *
  * @param obj  the object to free
  */
@@ -4241,7 +4241,7 @@ xmlXPathFreeObjectEntry(void *obj, const xmlChar *name ATTRIBUTE_UNUSED) {
  * XPath object or stores it in the cache.
  *
  * @param ctxt  XPath context
- * @param obj  the xmlXPathObjectPtr to free or to cache
+ * @param obj  the xmlXPathObject to free or to cache
  */
 static void
 xmlXPathReleaseObject(xmlXPathContextPtr ctxt, xmlXPathObjectPtr obj)
@@ -11987,7 +11987,7 @@ xmlXPathOptimizeExpression(xmlXPathParserContextPtr pctxt,
  *
  * @param ctxt  an XPath context
  * @param str  the XPath expression
- * @returns the xmlXPathCompExprPtr resulting from the compilation or NULL.
+ * @returns the xmlXPathCompExpr resulting from the compilation or NULL.
  *         the caller has to free the object.
  */
 xmlXPathCompExpr *
@@ -12071,7 +12071,7 @@ xmlXPathCtxtCompile(xmlXPathContext *ctxt, const xmlChar *str) {
  * Compile an XPath expression
  *
  * @param str  the XPath expression
- * @returns the xmlXPathCompExprPtr resulting from the compilation or NULL.
+ * @returns the xmlXPathCompExpr resulting from the compilation or NULL.
  *         the caller has to free the object.
  */
 xmlXPathCompExpr *
@@ -12087,7 +12087,7 @@ xmlXPathCompile(const xmlChar *str) {
  * @param ctxt  the XPath context
  * @param resObjPtr  the resulting XPath object or NULL
  * @param toBool  1 if only a boolean result is requested
- * @returns the xmlXPathObjectPtr resulting from the evaluation or NULL.
+ * @returns the xmlXPathObject resulting from the evaluation or NULL.
  *         the caller has to free the object.
  */
 static int
@@ -12134,7 +12134,7 @@ xmlXPathCompiledEvalInternal(xmlXPathCompExprPtr comp,
  *
  * @param comp  the compiled XPath expression
  * @param ctx  the XPath context
- * @returns the xmlXPathObjectPtr resulting from the evaluation or NULL.
+ * @returns the xmlXPathObject resulting from the evaluation or NULL.
  *         the caller has to free the object.
  */
 xmlXPathObject *
@@ -12225,7 +12225,7 @@ xmlXPathEvalExpr(xmlXPathParserContext *ctxt) {
  *
  * @param str  the XPath expression
  * @param ctx  the XPath context
- * @returns the xmlXPathObjectPtr resulting from the evaluation or NULL.
+ * @returns the xmlXPathObject resulting from the evaluation or NULL.
  *         the caller has to free the object.
  */
 xmlXPathObject *
@@ -12285,7 +12285,7 @@ xmlXPathSetContextNode(xmlNode *node, xmlXPathContext *ctx) {
  * @param node  the node to to use as the context node
  * @param str  the XPath expression
  * @param ctx  the XPath context
- * @returns the xmlXPathObjectPtr resulting from the evaluation or NULL.
+ * @returns the xmlXPathObject resulting from the evaluation or NULL.
  *         the caller has to free the object.
  */
 xmlXPathObject *
@@ -12302,7 +12302,7 @@ xmlXPathNodeEval(xmlNode *node, const xmlChar *str, xmlXPathContext *ctx) {
  *
  * @param str  the XPath expression
  * @param ctxt  the XPath context
- * @returns the xmlXPathObjectPtr resulting from the evaluation or NULL.
+ * @returns the xmlXPathObject resulting from the evaluation or NULL.
  *         the caller has to free the object.
  */
 xmlXPathObject *
diff --git a/xpointer.c b/xpointer.c
index bc0e1a3e..56d71eea 100644
--- a/xpointer.c
+++ b/xpointer.c
@@ -589,7 +589,7 @@ xmlXPtrNewContext(xmlDoc *doc, xmlNode *here, xmlNode *origin) {
  *
  * @param str  the XPointer expression
  * @param ctx  the XPointer context
- * @returns the xmlXPathObjectPtr resulting from the evaluation or NULL.
+ * @returns the xmlXPathObject resulting from the evaluation or NULL.
  *         the caller has to free the object.
  */
 xmlXPathObject *