diff -ur w3c-libwww-5.4.0.old/Library/cvs2sql/cvs2sql.c w3c-libwww-5.4.0/Library/cvs2sql/cvs2sql.c
--- w3c-libwww-5.4.0.old/Library/cvs2sql/cvs2sql.c	2009-02-16 22:53:15.000000000 +0100
+++ w3c-libwww-5.4.0/Library/cvs2sql/cvs2sql.c	2009-02-16 22:36:59.000000000 +0100
@@ -15,6 +15,7 @@
 #include "WWWLib.h"			      /* Global Library Include file */
 #include "WWWSQL.h"
 #include "HTextImp.h"
+#include "HTHome.h"
 
 #define APP_NAME			"cvs2sql"
 #define APP_VERSION			"1.0"
diff -ur w3c-libwww-5.4.0.old/Library/src/HTAssoc.c w3c-libwww-5.4.0/Library/src/HTAssoc.c
--- w3c-libwww-5.4.0.old/Library/src/HTAssoc.c	2009-02-16 22:53:15.000000000 +0100
+++ w3c-libwww-5.4.0/Library/src/HTAssoc.c	2009-02-16 22:36:59.000000000 +0100
@@ -129,7 +129,7 @@
 	HTAssocList * cur = list;
 	HTAssoc * assoc;
 	while ((assoc = (HTAssoc *) HTAssocList_nextObject(cur))) {
-	    if (!strcmp(HTAssoc_name(assoc), name))
+	    if (!strcmp(assoc->name, name))
 		return HTAssoc_value(assoc);
 	}
     }
diff -ur w3c-libwww-5.4.0.old/Library/src/HTList.h w3c-libwww-5.4.0/Library/src/HTList.h
--- w3c-libwww-5.4.0.old/Library/src/HTList.h	2009-02-16 22:53:15.000000000 +0100
+++ w3c-libwww-5.4.0/Library/src/HTList.h	2009-02-16 22:36:59.000000000 +0100
@@ -140,7 +140,7 @@
 This method returns the first element to the list or NULL if list
 is empty
 */
-extern void * HTList_firstObject  (HTList * me);
+extern void * HTList_firstObject (HTList * me);
 
 /*
 .
@@ -167,7 +167,7 @@
 and few items are many positions away from their sorted location. If the
 list gets very long then you may wanna use a quicksort instead.
 */
-extern BOOL HTList_insertionSort(HTList * list, HTComparer * comp);
+extern BOOL HTList_insertionSort (HTList * list, HTComparer * comp);
 
 /*
 .
diff -ur w3c-libwww-5.4.0.old/LineMode/src/GridText.h w3c-libwww-5.4.0/LineMode/src/GridText.h
--- w3c-libwww-5.4.0.old/LineMode/src/GridText.h	2009-02-16 22:53:16.000000000 +0100
+++ w3c-libwww-5.4.0/LineMode/src/GridText.h	2009-02-16 22:36:59.000000000 +0100
@@ -34,6 +34,9 @@
 extern BOOL HText_canScrollUp (HText * text);
 extern BOOL HText_canScrollDown (HText * text);
 
+extern BOOL HText_select (HText * text);
+extern BOOL HText_selectAnchor (HText * text, HTChildAnchor * anchor);
+
 /* Move display within window */
 extern void HText_scrollUp (HText * text);	/* One page */
 extern void HText_scrollDown (HText * text);	/* One page */
@@ -91,5 +94,3 @@
 
 
 */
-
-
diff -ur w3c-libwww-5.4.0.old/LineMode/src/HTBrowse.c w3c-libwww-5.4.0/LineMode/src/HTBrowse.c
--- w3c-libwww-5.4.0.old/LineMode/src/HTBrowse.c	2009-02-16 22:53:16.000000000 +0100
+++ w3c-libwww-5.4.0/LineMode/src/HTBrowse.c	2009-02-16 22:36:59.000000000 +0100
@@ -1260,7 +1260,7 @@
 
       case '>':
 	if (!lm->host) {
-	    HText *curText = HTMainText;     /* Remember current main vindow */
+	    HText *curText = HTMainText;     /* Remember current main window */
 	    req = Thread_new(lm, NO, LM_NO_UPDATE);
 	    HTRequest_setReloadMode(req, HT_CACHE_FLUSH_MEM);
 	    if (OutSource) HTRequest_setOutputFormat(req, WWW_SOURCE);
diff -ur w3c-libwww-5.4.0.old/Robot/src/HTRobot.c w3c-libwww-5.4.0/Robot/src/HTRobot.c
--- w3c-libwww-5.4.0.old/Robot/src/HTRobot.c	2009-02-16 22:53:15.000000000 +0100
+++ w3c-libwww-5.4.0/Robot/src/HTRobot.c	2009-02-16 22:46:41.000000000 +0100
@@ -396,11 +396,15 @@
     return NULL;
 }
 
+/*
+**  assert(a != NULL)
+**  assert(b != NULL)
+*/
 PRIVATE int FormatSort (const void * a, const void * b)
 {
     MetaDist * aa = (MetaDist *) a;
     MetaDist * bb = (MetaDist *) b;
-    return strcmp(HTAtom_name(bb->name), HTAtom_name(aa->name));
+    return strcmp((bb->name)->name, (aa->name)->name);
 }
 
 PRIVATE BOOL log_meta_distribution (const char * logfile, HTList * distribution)