diff --git a/SAX.h b/SAX.h
index 2912f36f..09ccf3f7 100644
--- a/SAX.h
+++ b/SAX.h
@@ -1,5 +1,5 @@
 /*
- * SAX.c : Default SAX handler interfaces.
+ * SAX.h : Default SAX handler interfaces.
  *
  * See Copyright for the status of this software.
  *
@@ -14,6 +14,10 @@
 
 #ifndef __XML_SAX_H__
 #define __XML_SAX_H__
+
+#ifdef __cplusplus
+#define extern "C" {
+#endif
 const xmlChar *	getPublicId			(void *ctx);
 const xmlChar *	getSystemId			(void *ctx);
 void	setDocumentLocator			(void *ctx,
@@ -105,4 +109,7 @@ void		cdataBlock			(void *ctx,
 
 void		xmlDefaultSAXHandlerInit	(void);
 void		htmlDefaultSAXHandlerInit	(void);
+#ifdef __cplusplus
+}
+#endif
 #endif /* __XML_SAX_H__ */
diff --git a/doc/xml.html b/doc/xml.html
index 0e74ab79..9c6909c8 100644
Binary files a/doc/xml.html and b/doc/xml.html differ
diff --git a/include/libxml/SAX.h b/include/libxml/SAX.h
index 2912f36f..09ccf3f7 100644
--- a/include/libxml/SAX.h
+++ b/include/libxml/SAX.h
@@ -1,5 +1,5 @@
 /*
- * SAX.c : Default SAX handler interfaces.
+ * SAX.h : Default SAX handler interfaces.
  *
  * See Copyright for the status of this software.
  *
@@ -14,6 +14,10 @@
 
 #ifndef __XML_SAX_H__
 #define __XML_SAX_H__
+
+#ifdef __cplusplus
+#define extern "C" {
+#endif
 const xmlChar *	getPublicId			(void *ctx);
 const xmlChar *	getSystemId			(void *ctx);
 void	setDocumentLocator			(void *ctx,
@@ -105,4 +109,7 @@ void		cdataBlock			(void *ctx,
 
 void		xmlDefaultSAXHandlerInit	(void);
 void		htmlDefaultSAXHandlerInit	(void);
+#ifdef __cplusplus
+}
+#endif
 #endif /* __XML_SAX_H__ */
diff --git a/include/libxml/xpath.h b/include/libxml/xpath.h
index 9a082ced..1e5aea45 100644
--- a/include/libxml/xpath.h
+++ b/include/libxml/xpath.h
@@ -12,6 +12,9 @@
 #ifndef __XML_XPATH_H__
 #define __XML_XPATH_H__
 
+#ifdef __cplusplus
+#define extern "C" {
+#endif
 #include "tree.h"
 
 typedef struct xmlXPathParserContext *xmlXPathParserContextPtr;
@@ -202,4 +205,7 @@ void		   xmlXPathFreeObject		(xmlXPathObjectPtr obj);
 xmlXPathObjectPtr  xmlXPathEvalExpression	(const xmlChar *str,
 						 xmlXPathContextPtr ctxt);
 
+#ifdef __cplusplus
+}
+#endif
 #endif /* ! __XML_XPATH_H__ */
diff --git a/xml-error.h b/xml-error.h
index 329656aa..b210e190 100644
--- a/xml-error.h
+++ b/xml-error.h
@@ -1,6 +1,9 @@
 #ifndef __XML_ERROR_H__
 #define __XML_ERROR_H__
 
+#ifdef __cplusplus
+#define extern "C" {
+#endif
 #include "parser.h"
 
 typedef enum {
@@ -131,4 +134,7 @@ void	xmlParserValidityWarning(void *ctx,
 void	xmlParserPrintFileInfo	(xmlParserInputPtr input);
 void	xmlParserPrintFileContext(xmlParserInputPtr input);
 
+#ifdef __cplusplus
+}
+#endif
 #endif /* __XML_ERROR_H__ */
diff --git a/xpath.h b/xpath.h
index 9a082ced..1e5aea45 100644
--- a/xpath.h
+++ b/xpath.h
@@ -12,6 +12,9 @@
 #ifndef __XML_XPATH_H__
 #define __XML_XPATH_H__
 
+#ifdef __cplusplus
+#define extern "C" {
+#endif
 #include "tree.h"
 
 typedef struct xmlXPathParserContext *xmlXPathParserContextPtr;
@@ -202,4 +205,7 @@ void		   xmlXPathFreeObject		(xmlXPathObjectPtr obj);
 xmlXPathObjectPtr  xmlXPathEvalExpression	(const xmlChar *str,
 						 xmlXPathContextPtr ctxt);
 
+#ifdef __cplusplus
+}
+#endif
 #endif /* ! __XML_XPATH_H__ */