diff --git a/globals.c b/globals.c
index e0b8b554d4068703573ee5f82f269c5813d5f20b_Z2xvYmFscy5j..757bcde2887c9d45b94b6fc8c31fa644265f96c4_Z2xvYmFscy5j 100644
--- a/globals.c
+++ b/globals.c
@@ -175,6 +175,8 @@
 /**
  * xmlBufferAllocScheme:
  *
+ * DEPRECATED: Don't use.
+ *
  * Global setting, default allocation policy for buffers, default is
  * XML_BUFFER_ALLOC_EXACT
  */
@@ -183,6 +185,8 @@
 /**
  * xmlDefaultBufferSize:
  *
+ * DEPRECATED: Don't use.
+ *
  * Global setting, default buffer size. Default value is BASE_BUFFER_SIZE
  */
 int xmlDefaultBufferSize = BASE_BUFFER_SIZE;
@@ -235,6 +239,8 @@
 /**
  * xmlPedanticParserDefaultValue:
  *
+ * DEPRECATED: Use the modern options API with XML_PARSE_PEDANTIC.
+ *
  * Global setting, indicate that the parser be pedantic
  * Disabled by default.
  */
@@ -243,6 +249,8 @@
 /**
  * xmlLineNumbersDefaultValue:
  *
+ * DEPRECATED: The modern options API always enables line numbers.
+ *
  * Global setting, indicate that the parser should store the line number
  * in the content field of elements in the DOM tree.
  * Disabled by default since this may not be safe for old classes of
@@ -358,6 +366,9 @@
 /**
  * xmlDefaultSAXHandler:
  *
+ * DEPRECATED: This handler is unused and will be removed from future
+ * versions.
+ *
  * Default SAX version1 handler for XML, builds the DOM tree
  */
 xmlSAXHandlerV1 xmlDefaultSAXHandler = {
@@ -395,6 +406,8 @@
 /**
  * xmlDefaultSAXLocator:
  *
+ * DEPRECATED: Don't use
+ *
  * The default SAX Locator
  * { getPublicId, getSystemId, getLineNumber, getColumnNumber}
  */
@@ -409,6 +422,9 @@
 /**
  * htmlDefaultSAXHandler:
  *
+ * DEPRECATED: This handler is unused and will be removed from future
+ * versions.
+ *
  * Default old SAX v1 handler for HTML, builds the DOM tree
  */
 xmlSAXHandlerV1 htmlDefaultSAXHandler = {
diff --git a/include/libxml/globals.h b/include/libxml/globals.h
index e0b8b554d4068703573ee5f82f269c5813d5f20b_aW5jbHVkZS9saWJ4bWwvZ2xvYmFscy5o..757bcde2887c9d45b94b6fc8c31fa644265f96c4_aW5jbHVkZS9saWJ4bWwvZ2xvYmFscy5o 100644
--- a/include/libxml/globals.h
+++ b/include/libxml/globals.h
@@ -253,8 +253,9 @@
 #endif /* LIBXML_THREAD_ALLOC_ENABLED */
 
 #ifdef LIBXML_HTML_ENABLED
+XML_DEPRECATED
 XMLPUBFUN xmlSAXHandlerV1 * XMLCALL __htmlDefaultSAXHandler(void);
 #ifdef LIBXML_THREAD_ENABLED
 #define htmlDefaultSAXHandler \
 (*(__htmlDefaultSAXHandler()))
 #else
@@ -256,8 +257,9 @@
 XMLPUBFUN xmlSAXHandlerV1 * XMLCALL __htmlDefaultSAXHandler(void);
 #ifdef LIBXML_THREAD_ENABLED
 #define htmlDefaultSAXHandler \
 (*(__htmlDefaultSAXHandler()))
 #else
+XML_DEPRECATED
 XMLPUBVAR xmlSAXHandlerV1 htmlDefaultSAXHandler;
 #endif
 #endif
@@ -277,8 +279,9 @@
  */
 
 
+XML_DEPRECATED
 XMLPUBFUN int * XMLCALL __oldXMLWDcompatibility(void);
 #ifdef LIBXML_THREAD_ENABLED
 #define oldXMLWDcompatibility \
 (*(__oldXMLWDcompatibility()))
 #else
@@ -280,8 +283,9 @@
 XMLPUBFUN int * XMLCALL __oldXMLWDcompatibility(void);
 #ifdef LIBXML_THREAD_ENABLED
 #define oldXMLWDcompatibility \
 (*(__oldXMLWDcompatibility()))
 #else
+XML_DEPRECATED
 XMLPUBVAR int oldXMLWDcompatibility;
 #endif
 
@@ -285,8 +289,9 @@
 XMLPUBVAR int oldXMLWDcompatibility;
 #endif
 
+XML_DEPRECATED
 XMLPUBFUN xmlBufferAllocationScheme * XMLCALL __xmlBufferAllocScheme(void);
 #ifdef LIBXML_THREAD_ENABLED
 #define xmlBufferAllocScheme \
 (*(__xmlBufferAllocScheme()))
 #else
@@ -288,7 +293,8 @@
 XMLPUBFUN xmlBufferAllocationScheme * XMLCALL __xmlBufferAllocScheme(void);
 #ifdef LIBXML_THREAD_ENABLED
 #define xmlBufferAllocScheme \
 (*(__xmlBufferAllocScheme()))
 #else
+XML_DEPRECATED
 XMLPUBVAR xmlBufferAllocationScheme xmlBufferAllocScheme;
 #endif
@@ -293,5 +299,6 @@
 XMLPUBVAR xmlBufferAllocationScheme xmlBufferAllocScheme;
 #endif
+XML_DEPRECATED
 XMLPUBFUN xmlBufferAllocationScheme XMLCALL
 	xmlThrDefBufferAllocScheme(xmlBufferAllocationScheme v);
 
@@ -295,8 +302,9 @@
 XMLPUBFUN xmlBufferAllocationScheme XMLCALL
 	xmlThrDefBufferAllocScheme(xmlBufferAllocationScheme v);
 
+XML_DEPRECATED
 XMLPUBFUN int * XMLCALL __xmlDefaultBufferSize(void);
 #ifdef LIBXML_THREAD_ENABLED
 #define xmlDefaultBufferSize \
 (*(__xmlDefaultBufferSize()))
 #else
@@ -298,7 +306,8 @@
 XMLPUBFUN int * XMLCALL __xmlDefaultBufferSize(void);
 #ifdef LIBXML_THREAD_ENABLED
 #define xmlDefaultBufferSize \
 (*(__xmlDefaultBufferSize()))
 #else
+XML_DEPRECATED
 XMLPUBVAR int xmlDefaultBufferSize;
 #endif
@@ -303,4 +312,5 @@
 XMLPUBVAR int xmlDefaultBufferSize;
 #endif
+XML_DEPRECATED
 XMLPUBFUN int XMLCALL xmlThrDefDefaultBufferSize(int v);
 
@@ -305,7 +315,8 @@
 XMLPUBFUN int XMLCALL xmlThrDefDefaultBufferSize(int v);
 
+XML_DEPRECATED
 XMLPUBFUN xmlSAXHandlerV1 * XMLCALL __xmlDefaultSAXHandler(void);
 #ifdef LIBXML_THREAD_ENABLED
 #define xmlDefaultSAXHandler \
 (*(__xmlDefaultSAXHandler()))
 #else
@@ -307,8 +318,9 @@
 XMLPUBFUN xmlSAXHandlerV1 * XMLCALL __xmlDefaultSAXHandler(void);
 #ifdef LIBXML_THREAD_ENABLED
 #define xmlDefaultSAXHandler \
 (*(__xmlDefaultSAXHandler()))
 #else
+XML_DEPRECATED
 XMLPUBVAR xmlSAXHandlerV1 xmlDefaultSAXHandler;
 #endif
 
@@ -312,8 +324,9 @@
 XMLPUBVAR xmlSAXHandlerV1 xmlDefaultSAXHandler;
 #endif
 
+XML_DEPRECATED
 XMLPUBFUN xmlSAXLocator * XMLCALL __xmlDefaultSAXLocator(void);
 #ifdef LIBXML_THREAD_ENABLED
 #define xmlDefaultSAXLocator \
 (*(__xmlDefaultSAXLocator()))
 #else
@@ -315,8 +328,9 @@
 XMLPUBFUN xmlSAXLocator * XMLCALL __xmlDefaultSAXLocator(void);
 #ifdef LIBXML_THREAD_ENABLED
 #define xmlDefaultSAXLocator \
 (*(__xmlDefaultSAXLocator()))
 #else
+XML_DEPRECATED
 XMLPUBVAR xmlSAXLocator xmlDefaultSAXLocator;
 #endif
 
@@ -397,8 +411,9 @@
 #endif
 XMLPUBFUN int XMLCALL xmlThrDefKeepBlanksDefaultValue(int v);
 
+XML_DEPRECATED
 XMLPUBFUN int * XMLCALL __xmlLineNumbersDefaultValue(void);
 #ifdef LIBXML_THREAD_ENABLED
 #define xmlLineNumbersDefaultValue \
 (*(__xmlLineNumbersDefaultValue()))
 #else
@@ -400,7 +415,8 @@
 XMLPUBFUN int * XMLCALL __xmlLineNumbersDefaultValue(void);
 #ifdef LIBXML_THREAD_ENABLED
 #define xmlLineNumbersDefaultValue \
 (*(__xmlLineNumbersDefaultValue()))
 #else
+XML_DEPRECATED
 XMLPUBVAR int xmlLineNumbersDefaultValue;
 #endif
@@ -405,5 +421,6 @@
 XMLPUBVAR int xmlLineNumbersDefaultValue;
 #endif
+XML_DEPRECATED
 XMLPUBFUN int XMLCALL xmlThrDefLineNumbersDefaultValue(int v);
 
 XMLPUBFUN int * XMLCALL __xmlLoadExtDtdDefaultValue(void);
@@ -432,8 +449,9 @@
 XMLPUBVAR const char * xmlParserVersion;
 #endif
 
+XML_DEPRECATED
 XMLPUBFUN int * XMLCALL __xmlPedanticParserDefaultValue(void);
 #ifdef LIBXML_THREAD_ENABLED
 #define xmlPedanticParserDefaultValue \
 (*(__xmlPedanticParserDefaultValue()))
 #else
@@ -435,7 +453,8 @@
 XMLPUBFUN int * XMLCALL __xmlPedanticParserDefaultValue(void);
 #ifdef LIBXML_THREAD_ENABLED
 #define xmlPedanticParserDefaultValue \
 (*(__xmlPedanticParserDefaultValue()))
 #else
+XML_DEPRECATED
 XMLPUBVAR int xmlPedanticParserDefaultValue;
 #endif
@@ -440,5 +459,6 @@
 XMLPUBVAR int xmlPedanticParserDefaultValue;
 #endif
+XML_DEPRECATED
 XMLPUBFUN int XMLCALL xmlThrDefPedanticParserDefaultValue(int v);
 
 XMLPUBFUN int * XMLCALL __xmlSaveNoEmptyTags(void);
@@ -459,8 +479,9 @@
 #endif
 XMLPUBFUN int XMLCALL xmlThrDefSubstituteEntitiesDefaultValue(int v);
 
+XML_DEPRECATED
 XMLPUBFUN xmlRegisterNodeFunc * XMLCALL __xmlRegisterNodeDefaultValue(void);
 #ifdef LIBXML_THREAD_ENABLED
 #define xmlRegisterNodeDefaultValue \
 (*(__xmlRegisterNodeDefaultValue()))
 #else
@@ -462,8 +483,9 @@
 XMLPUBFUN xmlRegisterNodeFunc * XMLCALL __xmlRegisterNodeDefaultValue(void);
 #ifdef LIBXML_THREAD_ENABLED
 #define xmlRegisterNodeDefaultValue \
 (*(__xmlRegisterNodeDefaultValue()))
 #else
+XML_DEPRECATED
 XMLPUBVAR xmlRegisterNodeFunc xmlRegisterNodeDefaultValue;
 #endif
 
@@ -467,8 +489,9 @@
 XMLPUBVAR xmlRegisterNodeFunc xmlRegisterNodeDefaultValue;
 #endif
 
+XML_DEPRECATED
 XMLPUBFUN xmlDeregisterNodeFunc * XMLCALL __xmlDeregisterNodeDefaultValue(void);
 #ifdef LIBXML_THREAD_ENABLED
 #define xmlDeregisterNodeDefaultValue \
 (*(__xmlDeregisterNodeDefaultValue()))
 #else
@@ -470,8 +493,9 @@
 XMLPUBFUN xmlDeregisterNodeFunc * XMLCALL __xmlDeregisterNodeDefaultValue(void);
 #ifdef LIBXML_THREAD_ENABLED
 #define xmlDeregisterNodeDefaultValue \
 (*(__xmlDeregisterNodeDefaultValue()))
 #else
+XML_DEPRECATED
 XMLPUBVAR xmlDeregisterNodeFunc xmlDeregisterNodeDefaultValue;
 #endif
 
@@ -475,9 +499,10 @@
 XMLPUBVAR xmlDeregisterNodeFunc xmlDeregisterNodeDefaultValue;
 #endif
 
+XML_DEPRECATED
 XMLPUBFUN xmlParserInputBufferCreateFilenameFunc * XMLCALL \
 				__xmlParserInputBufferCreateFilenameValue(void);
 #ifdef LIBXML_THREAD_ENABLED
 #define xmlParserInputBufferCreateFilenameValue \
 (*(__xmlParserInputBufferCreateFilenameValue()))
 #else
@@ -478,9 +503,10 @@
 XMLPUBFUN xmlParserInputBufferCreateFilenameFunc * XMLCALL \
 				__xmlParserInputBufferCreateFilenameValue(void);
 #ifdef LIBXML_THREAD_ENABLED
 #define xmlParserInputBufferCreateFilenameValue \
 (*(__xmlParserInputBufferCreateFilenameValue()))
 #else
+XML_DEPRECATED
 XMLPUBVAR xmlParserInputBufferCreateFilenameFunc xmlParserInputBufferCreateFilenameValue;
 #endif
 
@@ -484,8 +510,9 @@
 XMLPUBVAR xmlParserInputBufferCreateFilenameFunc xmlParserInputBufferCreateFilenameValue;
 #endif
 
+XML_DEPRECATED
 XMLPUBFUN xmlOutputBufferCreateFilenameFunc * XMLCALL __xmlOutputBufferCreateFilenameValue(void);
 #ifdef LIBXML_THREAD_ENABLED
 #define xmlOutputBufferCreateFilenameValue \
 (*(__xmlOutputBufferCreateFilenameValue()))
 #else
@@ -487,8 +514,9 @@
 XMLPUBFUN xmlOutputBufferCreateFilenameFunc * XMLCALL __xmlOutputBufferCreateFilenameValue(void);
 #ifdef LIBXML_THREAD_ENABLED
 #define xmlOutputBufferCreateFilenameValue \
 (*(__xmlOutputBufferCreateFilenameValue()))
 #else
+XML_DEPRECATED
 XMLPUBVAR xmlOutputBufferCreateFilenameFunc xmlOutputBufferCreateFilenameValue;
 #endif
 
diff --git a/python/generator.py b/python/generator.py
index e0b8b554d4068703573ee5f82f269c5813d5f20b_cHl0aG9uL2dlbmVyYXRvci5weQ==..757bcde2887c9d45b94b6fc8c31fa644265f96c4_cHl0aG9uL2dlbmVyYXRvci5weQ== 100755
--- a/python/generator.py
+++ b/python/generator.py
@@ -319,6 +319,9 @@
     'xmlScanName': True,
     'xmlSchemaCleanupTypes': True,
     'xmlSchemaInitTypes': True,
+    'xmlThrDefDefaultBufferSize': True,
+    'xmlThrDefLineNumbersDefaultValue': True,
+    'xmlThrDefPedanticParserDefaultValue': True,
     'xmlXPathInit': True,
     'xmlXPtrEvalRangePredicate': True,
     'xmlXPtrNewCollapsedRange': True,