diff --git a/include/libxml/SAX.h b/include/libxml/SAX.h
index 20093ceb..61876d10 100644
--- a/include/libxml/SAX.h
+++ b/include/libxml/SAX.h
@@ -23,47 +23,61 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+XML_DEPRECATED
 XMLPUBFUN const xmlChar * XMLCALL
 		getPublicId			(void *ctx);
+XML_DEPRECATED
 XMLPUBFUN const xmlChar * XMLCALL
 		getSystemId			(void *ctx);
+XML_DEPRECATED
 XMLPUBFUN void XMLCALL
 		setDocumentLocator		(void *ctx,
 						 xmlSAXLocatorPtr loc);
 
+XML_DEPRECATED
 XMLPUBFUN int XMLCALL
 		getLineNumber			(void *ctx);
+XML_DEPRECATED
 XMLPUBFUN int XMLCALL
 		getColumnNumber			(void *ctx);
 
+XML_DEPRECATED
 XMLPUBFUN int XMLCALL
 		isStandalone			(void *ctx);
+XML_DEPRECATED
 XMLPUBFUN int XMLCALL
 		hasInternalSubset		(void *ctx);
+XML_DEPRECATED
 XMLPUBFUN int XMLCALL
 		hasExternalSubset		(void *ctx);
 
+XML_DEPRECATED
 XMLPUBFUN void XMLCALL
 		internalSubset			(void *ctx,
 						 const xmlChar *name,
 						 const xmlChar *ExternalID,
 						 const xmlChar *SystemID);
+XML_DEPRECATED
 XMLPUBFUN void XMLCALL
 		externalSubset			(void *ctx,
 						 const xmlChar *name,
 						 const xmlChar *ExternalID,
 						 const xmlChar *SystemID);
+XML_DEPRECATED
 XMLPUBFUN xmlEntityPtr XMLCALL
 		getEntity			(void *ctx,
 						 const xmlChar *name);
+XML_DEPRECATED
 XMLPUBFUN xmlEntityPtr XMLCALL
 		getParameterEntity		(void *ctx,
 						 const xmlChar *name);
+XML_DEPRECATED
 XMLPUBFUN xmlParserInputPtr XMLCALL
 		resolveEntity			(void *ctx,
 						 const xmlChar *publicId,
 						 const xmlChar *systemId);
 
+XML_DEPRECATED
 XMLPUBFUN void XMLCALL
 		entityDecl			(void *ctx,
 						 const xmlChar *name,
@@ -71,6 +85,7 @@ XMLPUBFUN void XMLCALL
 						 const xmlChar *publicId,
 						 const xmlChar *systemId,
 						 xmlChar *content);
+XML_DEPRECATED
 XMLPUBFUN void XMLCALL
 		attributeDecl			(void *ctx,
 						 const xmlChar *elem,
@@ -79,16 +94,19 @@ XMLPUBFUN void XMLCALL
 						 int def,
 						 const xmlChar *defaultValue,
 						 xmlEnumerationPtr tree);
+XML_DEPRECATED
 XMLPUBFUN void XMLCALL
 		elementDecl			(void *ctx,
 						 const xmlChar *name,
 						 int type,
 						 xmlElementContentPtr content);
+XML_DEPRECATED
 XMLPUBFUN void XMLCALL
 		notationDecl			(void *ctx,
 						 const xmlChar *name,
 						 const xmlChar *publicId,
 						 const xmlChar *systemId);
+XML_DEPRECATED
 XMLPUBFUN void XMLCALL
 		unparsedEntityDecl		(void *ctx,
 						 const xmlChar *name,
@@ -96,69 +114,88 @@ XMLPUBFUN void XMLCALL
 						 const xmlChar *systemId,
 						 const xmlChar *notationName);
 
+XML_DEPRECATED
 XMLPUBFUN void XMLCALL
 		startDocument			(void *ctx);
+XML_DEPRECATED
 XMLPUBFUN void XMLCALL
 		endDocument			(void *ctx);
+XML_DEPRECATED
 XMLPUBFUN void XMLCALL
 		attribute			(void *ctx,
 						 const xmlChar *fullname,
 						 const xmlChar *value);
+XML_DEPRECATED
 XMLPUBFUN void XMLCALL
 		startElement			(void *ctx,
 						 const xmlChar *fullname,
 						 const xmlChar **atts);
+XML_DEPRECATED
 XMLPUBFUN void XMLCALL
 		endElement			(void *ctx,
 						 const xmlChar *name);
+XML_DEPRECATED
 XMLPUBFUN void XMLCALL
 		reference			(void *ctx,
 						 const xmlChar *name);
+XML_DEPRECATED
 XMLPUBFUN void XMLCALL
 		characters			(void *ctx,
 						 const xmlChar *ch,
 						 int len);
+XML_DEPRECATED
 XMLPUBFUN void XMLCALL
 		ignorableWhitespace		(void *ctx,
 						 const xmlChar *ch,
 						 int len);
+XML_DEPRECATED
 XMLPUBFUN void XMLCALL
 		processingInstruction		(void *ctx,
 						 const xmlChar *target,
 						 const xmlChar *data);
+XML_DEPRECATED
 XMLPUBFUN void XMLCALL
 		globalNamespace			(void *ctx,
 						 const xmlChar *href,
 						 const xmlChar *prefix);
+XML_DEPRECATED
 XMLPUBFUN void XMLCALL
 		setNamespace			(void *ctx,
 						 const xmlChar *name);
+XML_DEPRECATED
 XMLPUBFUN xmlNsPtr XMLCALL
 		getNamespace			(void *ctx);
+XML_DEPRECATED
 XMLPUBFUN int XMLCALL
 		checkNamespace			(void *ctx,
 						 xmlChar *nameSpace);
+XML_DEPRECATED
 XMLPUBFUN void XMLCALL
 		namespaceDecl			(void *ctx,
 						 const xmlChar *href,
 						 const xmlChar *prefix);
+XML_DEPRECATED
 XMLPUBFUN void XMLCALL
 		comment				(void *ctx,
 						 const xmlChar *value);
+XML_DEPRECATED
 XMLPUBFUN void XMLCALL
 		cdataBlock			(void *ctx,
 						 const xmlChar *value,
 						 int len);
 
 #ifdef LIBXML_SAX1_ENABLED
+XML_DEPRECATED
 XMLPUBFUN void XMLCALL
 		initxmlDefaultSAXHandler	(xmlSAXHandlerV1 *hdlr,
 						 int warning);
 #ifdef LIBXML_HTML_ENABLED
+XML_DEPRECATED
 XMLPUBFUN void XMLCALL
 		inithtmlDefaultSAXHandler	(xmlSAXHandlerV1 *hdlr);
 #endif
 #ifdef LIBXML_DOCB_ENABLED
+XML_DEPRECATED
 XMLPUBFUN void XMLCALL
 		initdocbDefaultSAXHandler	(xmlSAXHandlerV1 *hdlr);
 #endif
diff --git a/include/libxml/entities.h b/include/libxml/entities.h
index 47b4573e..2b60d9e6 100644
--- a/include/libxml/entities.h
+++ b/include/libxml/entities.h
@@ -75,6 +75,7 @@ typedef xmlEntitiesTable *xmlEntitiesTablePtr;
  */
 
 #ifdef LIBXML_LEGACY_ENABLED
+XML_DEPRECATED
 XMLPUBFUN void XMLCALL
 		xmlInitializePredefinedEntities	(void);
 #endif /* LIBXML_LEGACY_ENABLED */
@@ -112,6 +113,7 @@ XMLPUBFUN xmlEntityPtr XMLCALL
 			xmlGetParameterEntity	(xmlDocPtr doc,
 						 const xmlChar *name);
 #ifdef LIBXML_LEGACY_ENABLED
+XML_DEPRECATED
 XMLPUBFUN const xmlChar * XMLCALL
 			xmlEncodeEntities	(xmlDocPtr doc,
 						 const xmlChar *input);
diff --git a/include/libxml/parser.h b/include/libxml/parser.h
index 0ba1c387..5dad587a 100644
--- a/include/libxml/parser.h
+++ b/include/libxml/parser.h
@@ -996,13 +996,16 @@ XMLPUBFUN xmlParserCtxtPtr XMLCALL
 /*
  * Reading/setting optional parsing features.
  */
+XML_DEPRECATED
 XMLPUBFUN int XMLCALL
 		xmlGetFeaturesList	(int *len,
 					 const char **result);
+XML_DEPRECATED
 XMLPUBFUN int XMLCALL
 		xmlGetFeature		(xmlParserCtxtPtr ctxt,
 					 const char *name,
 					 void *result);
+XML_DEPRECATED
 XMLPUBFUN int XMLCALL
 		xmlSetFeature		(xmlParserCtxtPtr ctxt,
 					 const char *name,
diff --git a/include/libxml/parserInternals.h b/include/libxml/parserInternals.h
index 1f26ce20..9f3c76f2 100644
--- a/include/libxml/parserInternals.h
+++ b/include/libxml/parserInternals.h
@@ -597,25 +597,34 @@ typedef	void	(*xmlEntityReferenceFunc)	(xmlEntityPtr ent,
 						 xmlNodePtr firstNode,
 						 xmlNodePtr lastNode);
 
+XML_DEPRECATED
 XMLPUBFUN void XMLCALL		xmlSetEntityReferenceFunc	(xmlEntityReferenceFunc func);
 
+XML_DEPRECATED
 XMLPUBFUN xmlChar * XMLCALL
 			xmlParseQuotedString	(xmlParserCtxtPtr ctxt);
+XML_DEPRECATED
 XMLPUBFUN void XMLCALL
                         xmlParseNamespace       (xmlParserCtxtPtr ctxt);
+XML_DEPRECATED
 XMLPUBFUN xmlChar * XMLCALL
 			xmlNamespaceParseNSDef	(xmlParserCtxtPtr ctxt);
+XML_DEPRECATED
 XMLPUBFUN xmlChar * XMLCALL
 			xmlScanName		(xmlParserCtxtPtr ctxt);
+XML_DEPRECATED
 XMLPUBFUN xmlChar * XMLCALL
 			xmlNamespaceParseNCName	(xmlParserCtxtPtr ctxt);
+XML_DEPRECATED
 XMLPUBFUN void XMLCALL	xmlParserHandleReference(xmlParserCtxtPtr ctxt);
+XML_DEPRECATED
 XMLPUBFUN xmlChar * XMLCALL
 			xmlNamespaceParseQName	(xmlParserCtxtPtr ctxt,
 						 xmlChar **prefix);
 /**
  * Entities
  */
+XML_DEPRECATED
 XMLPUBFUN xmlChar * XMLCALL
 		xmlDecodeEntities		(xmlParserCtxtPtr ctxt,
 						 int len,
@@ -623,6 +632,7 @@ XMLPUBFUN xmlChar * XMLCALL
 						 xmlChar end,
 						 xmlChar  end2,
 						 xmlChar end3);
+XML_DEPRECATED
 XMLPUBFUN void XMLCALL
 			xmlHandleEntity		(xmlParserCtxtPtr ctxt,
 						 xmlEntityPtr entity);
diff --git a/include/libxml/tree.h b/include/libxml/tree.h
index 1e79be92..9823654a 100644
--- a/include/libxml/tree.h
+++ b/include/libxml/tree.h
@@ -763,6 +763,7 @@ XMLPUBFUN xmlDtdPtr XMLCALL
 XMLPUBFUN void XMLCALL
 		xmlFreeDtd		(xmlDtdPtr cur);
 #ifdef LIBXML_LEGACY_ENABLED
+XML_DEPRECATED
 XMLPUBFUN xmlNsPtr XMLCALL
 		xmlNewGlobalNs		(xmlDocPtr doc,
 					 const xmlChar *href,