diff --git a/include/libxml/xmlIO.h b/include/libxml/xmlIO.h
index 4165bb38..66eebd42 100644
--- a/include/libxml/xmlIO.h
+++ b/include/libxml/xmlIO.h
@@ -418,9 +418,11 @@ XMLPUBFUN xmlParserInputBufferCreateFilenameFunc
 XMLPUBFUN xmlOutputBufferCreateFilenameFunc
 	xmlOutputBufferCreateFilenameDefault(
 		xmlOutputBufferCreateFilenameFunc func);
+XML_DEPRECATED
 XMLPUBFUN xmlOutputBufferCreateFilenameFunc
 	xmlThrDefOutputBufferCreateFilenameDefault(
 		xmlOutputBufferCreateFilenameFunc func);
+XML_DEPRECATED
 XMLPUBFUN xmlParserInputBufferCreateFilenameFunc
 	xmlThrDefParserInputBufferCreateFilenameDefault(
 		xmlParserInputBufferCreateFilenameFunc func);
diff --git a/include/libxml/xmlerror.h b/include/libxml/xmlerror.h
index 7d83f451..c77db6b3 100644
--- a/include/libxml/xmlerror.h
+++ b/include/libxml/xmlerror.h
@@ -892,6 +892,7 @@ XML_GLOBALS_ERROR
 XMLPUBFUN void
     xmlSetGenericErrorFunc	(void *ctx,
 				 xmlGenericErrorFunc handler);
+XML_DEPRECATED
 XMLPUBFUN void
     xmlThrDefSetGenericErrorFunc(void *ctx,
                                  xmlGenericErrorFunc handler);
@@ -902,6 +903,7 @@ XMLPUBFUN void
 XMLPUBFUN void
     xmlSetStructuredErrorFunc	(void *ctx,
 				 xmlStructuredErrorFunc handler);
+XML_DEPRECATED
 XMLPUBFUN void
     xmlThrDefSetStructuredErrorFunc(void *ctx,
                                  xmlStructuredErrorFunc handler);
diff --git a/include/libxml/xmlsave.h b/include/libxml/xmlsave.h
index 86b6285f..e266e467 100644
--- a/include/libxml/xmlsave.h
+++ b/include/libxml/xmlsave.h
@@ -82,10 +82,13 @@ XMLPUBFUN int
 		xmlSaveSetAttrEscape	(xmlSaveCtxtPtr ctxt,
 					 xmlCharEncodingOutputFunc escape);
 
+XML_DEPRECATED
 XMLPUBFUN int
                 xmlThrDefIndentTreeOutput(int v);
+XML_DEPRECATED
 XMLPUBFUN const char *
                 xmlThrDefTreeIndentString(const char * v);
+XML_DEPRECATED
 XMLPUBFUN int
                 xmlThrDefSaveNoEmptyTags(int v);
 
diff --git a/python/generator.py b/python/generator.py
index 466a2e68..149e0dfe 100755
--- a/python/generator.py
+++ b/python/generator.py
@@ -388,12 +388,15 @@ deprecated_funcs = {
     'xmlThrDefDefaultBufferSize': True,
     'xmlThrDefDoValidityCheckingDefaultValue': True,
     'xmlThrDefGetWarningsDefaultValue': True,
+    'xmlThrDefIndentTreeOutput': True,
     'xmlThrDefKeepBlanksDefaultValue': True,
     'xmlThrDefLineNumbersDefaultValue': True,
     'xmlThrDefLoadExtDtdDefaultValue': True,
     'xmlThrDefParserDebugEntities': True,
     'xmlThrDefPedanticParserDefaultValue': True,
+    'xmlThrDefSaveNoEmptyTags': True,
     'xmlThrDefSubstituteEntitiesDefaultValue': True,
+    'xmlThrDefTreeIndentString': True,
     'xmlValidCtxtNormalizeAttributeValue': True,
     'xmlValidNormalizeAttributeValue': True,
     'xmlValidateAttributeValue': True,
diff --git a/python/libxml.c b/python/libxml.c
index 5b30b34a..681091e3 100644
--- a/python/libxml.c
+++ b/python/libxml.c
@@ -1510,7 +1510,9 @@ static void
 libxml_xmlErrorInitialize(void)
 {
     xmlSetGenericErrorFunc(NULL, libxml_xmlErrorFuncHandler);
+XML_IGNORE_DEPRECATION_WARNINGS
     xmlThrDefSetGenericErrorFunc(NULL, libxml_xmlErrorFuncHandler);
+XML_POP_WARNINGS
 }
 
 static PyObject *