diff --git a/ChangeLog b/ChangeLog
index 54256dc6..284b13db 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sat Apr  8 14:54:54 CEST 2000 Daniel Veillard <Daniel.Veillard@w3.org>
+
+	* xpath.c uri.h parserInternals.h: cosmetic changes from
+	  "Timur I. Bakeyev" <timur@bat.ru>, including making 
+	  xmlCreateURI() public
+
 Fri Apr  7 18:35:02 CEST 2000 Daniel Veillard <Daniel.Veillard@w3.org>
 
 	* xmlIO.[ch] parser.c: cleane up the xmlParserInputBuffer mess
diff --git a/include/libxml/parserInternals.h b/include/libxml/parserInternals.h
index b29f11c3..0972de42 100644
--- a/include/libxml/parserInternals.h
+++ b/include/libxml/parserInternals.h
@@ -28,7 +28,7 @@ extern "C" {
  * any Unicode character, excluding the surrogate blocks, FFFE, and FFFF.
  */
 #define IS_CHAR(c)							\
-    ((((c) == 0x09) || ((c) == 0x0a) || ((c) == 0x0d) ||		\
+    ((((c) == 0x09) || ((c) == 0x0A) || ((c) == 0x0D) ||		\
       (((c) >= 0x20) && ((c) != 0xFFFE) && ((c) != 0xFFFF))) &&		\
       (((c) <= 0xD7FF) || ((c) >= 0xE000)) && ((c) >= 0) &&		\
       ((c) <= 0x10FFFF))
@@ -36,7 +36,7 @@ extern "C" {
 /*
  * [3] S ::= (#x20 | #x9 | #xD | #xA)+
  */
-#define IS_BLANK(c) (((c) == 0x20) || ((c) == 0x09) || ((c) == 0xa) ||	\
+#define IS_BLANK(c) (((c) == 0x20) || ((c) == 0x09) || ((c) == 0xA) ||	\
                      ((c) == 0x0D))
 
 /*
diff --git a/include/libxml/uri.h b/include/libxml/uri.h
index f54754a7..59c4467c 100644
--- a/include/libxml/uri.h
+++ b/include/libxml/uri.h
@@ -39,6 +39,7 @@ struct _xmlURI {
  * xmlChar *	xmlNodeGetBase	(xmlDocPtr doc,
  *                               xmlNodePtr cur);
  */
+xmlURIPtr	xmlCreateURI		(void);
 xmlChar *	xmlBuildURI		(const xmlChar *URI,
 	                        	 const xmlChar *base);
 xmlURIPtr	xmlParseURI		(const char *URI);
diff --git a/parserInternals.h b/parserInternals.h
index b29f11c3..0972de42 100644
--- a/parserInternals.h
+++ b/parserInternals.h
@@ -28,7 +28,7 @@ extern "C" {
  * any Unicode character, excluding the surrogate blocks, FFFE, and FFFF.
  */
 #define IS_CHAR(c)							\
-    ((((c) == 0x09) || ((c) == 0x0a) || ((c) == 0x0d) ||		\
+    ((((c) == 0x09) || ((c) == 0x0A) || ((c) == 0x0D) ||		\
       (((c) >= 0x20) && ((c) != 0xFFFE) && ((c) != 0xFFFF))) &&		\
       (((c) <= 0xD7FF) || ((c) >= 0xE000)) && ((c) >= 0) &&		\
       ((c) <= 0x10FFFF))
@@ -36,7 +36,7 @@ extern "C" {
 /*
  * [3] S ::= (#x20 | #x9 | #xD | #xA)+
  */
-#define IS_BLANK(c) (((c) == 0x20) || ((c) == 0x09) || ((c) == 0xa) ||	\
+#define IS_BLANK(c) (((c) == 0x20) || ((c) == 0x09) || ((c) == 0xA) ||	\
                      ((c) == 0x0D))
 
 /*
diff --git a/uri.h b/uri.h
index f54754a7..59c4467c 100644
--- a/uri.h
+++ b/uri.h
@@ -39,6 +39,7 @@ struct _xmlURI {
  * xmlChar *	xmlNodeGetBase	(xmlDocPtr doc,
  *                               xmlNodePtr cur);
  */
+xmlURIPtr	xmlCreateURI		(void);
 xmlChar *	xmlBuildURI		(const xmlChar *URI,
 	                        	 const xmlChar *base);
 xmlURIPtr	xmlParseURI		(const char *URI);
diff --git a/xpath.c b/xpath.c
index c3700774..a8867a4d 100644
--- a/xpath.c
+++ b/xpath.c
@@ -110,7 +110,7 @@ int isinf(double d) {
 #elif defined(finite) || defined(HAVE_FINITE)
 int isinf(double x) { return !finite(x) && x==x; }
 #elif defined(HUGE_VAL)
-static int isinf(double x)
+int isinf(double x)
 {
     if (x == HUGE_VAL)
         return(1);