diff --git a/include/libxml/xmlautomata.h b/include/libxml/xmlautomata.h
index f40e8af9..97d0abf9 100644
--- a/include/libxml/xmlautomata.h
+++ b/include/libxml/xmlautomata.h
@@ -39,24 +39,31 @@ typedef xmlAutomataState *xmlAutomataStatePtr;
 /*
  * Building API
  */
+XML_DEPRECATED
 XMLPUBFUN xmlAutomataPtr
 		    xmlNewAutomata		(void);
+XML_DEPRECATED
 XMLPUBFUN void
 		    xmlFreeAutomata		(xmlAutomataPtr am);
 
+XML_DEPRECATED
 XMLPUBFUN xmlAutomataStatePtr
 		    xmlAutomataGetInitState	(xmlAutomataPtr am);
+XML_DEPRECATED
 XMLPUBFUN int
 		    xmlAutomataSetFinalState	(xmlAutomataPtr am,
 						 xmlAutomataStatePtr state);
+XML_DEPRECATED
 XMLPUBFUN xmlAutomataStatePtr
 		    xmlAutomataNewState		(xmlAutomataPtr am);
+XML_DEPRECATED
 XMLPUBFUN xmlAutomataStatePtr
 		    xmlAutomataNewTransition	(xmlAutomataPtr am,
 						 xmlAutomataStatePtr from,
 						 xmlAutomataStatePtr to,
 						 const xmlChar *token,
 						 void *data);
+XML_DEPRECATED
 XMLPUBFUN xmlAutomataStatePtr
 		    xmlAutomataNewTransition2	(xmlAutomataPtr am,
 						 xmlAutomataStatePtr from,
@@ -64,6 +71,7 @@ XMLPUBFUN xmlAutomataStatePtr
 						 const xmlChar *token,
 						 const xmlChar *token2,
 						 void *data);
+XML_DEPRECATED
 XMLPUBFUN xmlAutomataStatePtr
                     xmlAutomataNewNegTrans	(xmlAutomataPtr am,
 						 xmlAutomataStatePtr from,
@@ -72,6 +80,7 @@ XMLPUBFUN xmlAutomataStatePtr
 						 const xmlChar *token2,
 						 void *data);
 
+XML_DEPRECATED
 XMLPUBFUN xmlAutomataStatePtr
 		    xmlAutomataNewCountTrans	(xmlAutomataPtr am,
 						 xmlAutomataStatePtr from,
@@ -80,6 +89,7 @@ XMLPUBFUN xmlAutomataStatePtr
 						 int min,
 						 int max,
 						 void *data);
+XML_DEPRECATED
 XMLPUBFUN xmlAutomataStatePtr
 		    xmlAutomataNewCountTrans2	(xmlAutomataPtr am,
 						 xmlAutomataStatePtr from,
@@ -89,6 +99,7 @@ XMLPUBFUN xmlAutomataStatePtr
 						 int min,
 						 int max,
 						 void *data);
+XML_DEPRECATED
 XMLPUBFUN xmlAutomataStatePtr
 		    xmlAutomataNewOnceTrans	(xmlAutomataPtr am,
 						 xmlAutomataStatePtr from,
@@ -97,6 +108,7 @@ XMLPUBFUN xmlAutomataStatePtr
 						 int min,
 						 int max,
 						 void *data);
+XML_DEPRECATED
 XMLPUBFUN xmlAutomataStatePtr
 		    xmlAutomataNewOnceTrans2	(xmlAutomataPtr am,
 						 xmlAutomataStatePtr from,
@@ -106,32 +118,39 @@ XMLPUBFUN xmlAutomataStatePtr
 						 int min,
 						 int max,
 						 void *data);
+XML_DEPRECATED
 XMLPUBFUN xmlAutomataStatePtr
 		    xmlAutomataNewAllTrans	(xmlAutomataPtr am,
 						 xmlAutomataStatePtr from,
 						 xmlAutomataStatePtr to,
 						 int lax);
+XML_DEPRECATED
 XMLPUBFUN xmlAutomataStatePtr
 		    xmlAutomataNewEpsilon	(xmlAutomataPtr am,
 						 xmlAutomataStatePtr from,
 						 xmlAutomataStatePtr to);
+XML_DEPRECATED
 XMLPUBFUN xmlAutomataStatePtr
 		    xmlAutomataNewCountedTrans	(xmlAutomataPtr am,
 						 xmlAutomataStatePtr from,
 						 xmlAutomataStatePtr to,
 						 int counter);
+XML_DEPRECATED
 XMLPUBFUN xmlAutomataStatePtr
 		    xmlAutomataNewCounterTrans	(xmlAutomataPtr am,
 						 xmlAutomataStatePtr from,
 						 xmlAutomataStatePtr to,
 						 int counter);
+XML_DEPRECATED
 XMLPUBFUN int
 		    xmlAutomataNewCounter	(xmlAutomataPtr am,
 						 int min,
 						 int max);
 
+XML_DEPRECATED
 XMLPUBFUN struct _xmlRegexp *
 		    xmlAutomataCompile		(xmlAutomataPtr am);
+XML_DEPRECATED
 XMLPUBFUN int
 		    xmlAutomataIsDeterminist	(xmlAutomataPtr am);
 
diff --git a/include/libxml/xmlregexp.h b/include/libxml/xmlregexp.h
index 210f99b3..edbdc98d 100644
--- a/include/libxml/xmlregexp.h
+++ b/include/libxml/xmlregexp.h
@@ -70,28 +70,34 @@ typedef void (*xmlRegExecCallbacks) (xmlRegExecCtxtPtr exec,
 /*
  * The progressive API
  */
+XML_DEPRECATED
 XMLPUBFUN xmlRegExecCtxtPtr
 		    xmlRegNewExecCtxt	(xmlRegexpPtr comp,
 					 xmlRegExecCallbacks callback,
 					 void *data);
+XML_DEPRECATED
 XMLPUBFUN void
 		    xmlRegFreeExecCtxt	(xmlRegExecCtxtPtr exec);
+XML_DEPRECATED
 XMLPUBFUN int
 		    xmlRegExecPushString(xmlRegExecCtxtPtr exec,
 					 const xmlChar *value,
 					 void *data);
+XML_DEPRECATED
 XMLPUBFUN int
 		    xmlRegExecPushString2(xmlRegExecCtxtPtr exec,
 					 const xmlChar *value,
 					 const xmlChar *value2,
 					 void *data);
 
+XML_DEPRECATED
 XMLPUBFUN int
 		    xmlRegExecNextValues(xmlRegExecCtxtPtr exec,
 					 int *nbval,
 					 int *nbneg,
 					 xmlChar **values,
 					 int *terminal);
+XML_DEPRECATED
 XMLPUBFUN int
 		    xmlRegExecErrInfo	(xmlRegExecCtxtPtr exec,
 					 const xmlChar **string,