--- ./src/av-sh/Makefile.in.orig	2005-04-20 11:04:55.000000000 +0200
+++ ./src/av-sh/Makefile.in	2006-07-13 17:43:31.000000000 +0200
@@ -31,6 +31,8 @@
 include $(top_builddir)/config/avango-defines
 include $(top_builddir)/config/avango-rules
 
+NCURSES_LIBS=		-lncurses
+
 CXXLOCALINCLUDE =-I$(srcdir) -I$(top_builddir)/include $(PERFORMER_INCLUDEDIR)
 LOCALDEFINES =-DAVANGO_VERSION=\"$(AVANGO_VERSION)\"
 
@@ -98,12 +100,12 @@
 
 ifeq ($(LIB_VERSION_PREFIX),linux)
 
-$(BINDIR)/av-daemon:	PROGRAM_LIBS =-lfpIODevice $(LIBFP_LIBS) -lavthread
+$(BINDIR)/av-daemon:	PROGRAM_LIBS =-lfpIODevice $(LIBFP_LIBS) -lavthread $(NCURSES_LIBS)
 
 ifeq ($(VIEWKIT_AVAILABLE),yes)
-$(BINDIR)/av-sh:	PROGRAM_LIBS =$(VIEWKIT_LD_SEARCH_PATH) $(VIEWKIT_LIBS) -lfpRootService -lfpLightService $(LIBFP_LIBS)
+$(BINDIR)/av-sh:	PROGRAM_LIBS =$(VIEWKIT_LD_SEARCH_PATH) $(VIEWKIT_LIBS) -lfpRootService -lfpLightService $(LIBFP_LIBS) $(NCURSES_LIBS)
 else
-$(BINDIR)/av-sh:	PROGRAM_LIBS =-lfpRootService -lfpLightService $(LIBFP_LIBS)
+$(BINDIR)/av-sh:	PROGRAM_LIBS =-lfpRootService -lfpLightService $(LIBFP_LIBS) $(NCURSES_LIBS)
 endif
 
 endif
--- ./src/modules/io-drivers/misc/Makefile.in.orig	2005-04-20 11:05:31.000000000 +0200
+++ ./src/modules/io-drivers/misc/Makefile.in	2006-07-13 16:59:52.000000000 +0200
@@ -31,8 +31,8 @@
 include $(top_builddir)/config/avango-defines
 include $(top_builddir)/config/avango-rules
 
-CLOCALINCLUDE =-I$(srcdir) -I$(srcdir)/..
-CXXLOCALINCLUDE =-I$(srcdir)
+CLOCALINCLUDE =-I$(srcdir) -I$(srcdir)/.. -I$(top_builddir)/include
+CXXLOCALINCLUDE =-I$(srcdir) -I$(top_builddir)/include
 LOCALDEFINES =$(C_WOFFALL_FLAGS)
 
 ifeq ($(LIB_VERSION_PREFIX),linux)
--- ./src/modules/services/fpURLService.c++.orig	2006-07-13 15:36:57.000000000 +0200
+++ ./src/modules/services/fpURLService.c++	2006-07-13 16:07:45.000000000 +0200
@@ -33,7 +33,9 @@
 #include "modules/services/fpURLService.h"
 
 #if !defined(AVANGO_NO_LIBWWW)
+#  if defined(HAVE_W3C_LIBWWW_WWWCONF_H)
 #  include <w3c-libwww/wwwconf.h>
+#  endif
 #  include <w3c-libwww/wwwsys.h>
 #  include <w3c-libwww/WWWUtil.h>
 #  include <w3c-libwww/WWWCore.h>
--- ./src/loader/libpfdecompress/Makefile.in.orig	2005-06-05 03:10:15.000000000 +0200
+++ ./src/loader/libpfdecompress/Makefile.in	2006-07-13 17:44:54.000000000 +0200
@@ -32,7 +32,7 @@
 include $(top_builddir)/config/avango-defines
 include $(top_builddir)/config/avango-rules
 
-CXXLOCALINCLUDE =-I$(srcdir) $(PERFORMER_INCLUDEDIR)
+CXXLOCALINCLUDE =-I$(srcdir) $(PERFORMER_INCLUDEDIR) -I$(top_builddir)/include
 LOCALDEFINES =-DAVANGO_VERSION=\"$(AVANGO_VERSION)\"
 
 HEADERS = \
--- ./src/loader/libpfobj/Makefile.in.orig	2005-06-05 03:10:16.000000000 +0200
+++ ./src/loader/libpfobj/Makefile.in	2006-07-13 17:48:48.000000000 +0200
@@ -33,7 +33,7 @@
 include $(top_builddir)/config/avango-rules
 
 CLOCALINCLUDE =-I$(srcdir) $(PERFORMER_INCLUDEDIR)
-CXXLOCALINCLUDE =$(CLOCALINCLUDE)
+CXXLOCALINCLUDE =$(CLOCALINCLUDE) -I$(top_builddir)/include
 LOCALDEFINES =-DAVANGO_VERSION=\"$(AVANGO_VERSION)\"
 
 HEADERS = \
--- ./src/ensemble/ensemble/util/printe.ml.orig	2004-07-22 13:05:30.000000000 +0200
+++ ./src/ensemble/ensemble/util/printe.ml	2006-07-13 17:33:16.000000000 +0200
@@ -14,8 +14,8 @@
 
 (* $Id: printe.ml,v 1.1.1.1 2004/07/22 11:05:30 jogo_sf Exp $ *)
 
-external format_int: string -> int -> string = "format_int"
-external format_float: string -> float -> string = "format_float"
+external format_int: string -> int -> string = "caml_format_int"
+external format_float: string -> float -> string = "caml_format_float"
 (*
 let format_int f i = Printf.sprintf f i
 let format_float f i = Printf.sprintf f i
--- ./src/ensemble/ensemble/socket/s/heapc.c.orig	2004-07-22 13:05:31.000000000 +0200
+++ ./src/ensemble/ensemble/socket/s/heapc.c	2006-07-13 17:42:26.000000000 +0200
@@ -11,7 +11,7 @@
 /* End: from minor_gc.h */
 
 
-extern value gc_full_major(value v) ;
+extern value caml_gc_full_major(value v) ;
 
 typedef struct {
   asize_t size;
@@ -76,7 +76,8 @@
 
 value skt_heap(void) {
   unsigned int i ;
-  gc_full_major(Val_unit) ;
+
+  caml_gc_full_major(Val_unit) ;
   
   /* Scan major heap.
    */
@@ -146,12 +147,12 @@
   return copy_string(addr_buf) ;
 }
 
-extern long stat_minor_words ; /* gc_ctrl.c */
+extern long caml_stat_minor_words ; /* gc_ctrl.c */
 
 /* This code is extracted from gc_ctrl.c */
 value skt_minor_words(void) {
   long ret ;
-  ret = stat_minor_words + Wsize_bsize (young_end - young_ptr) ;
+  ret = caml_stat_minor_words + Wsize_bsize (young_end - young_ptr) ;
   return Val_long(ret) ;
 }  
 
--- ./aclocal.m4.orig	2005-12-17 22:56:18.000000000 +0100
+++ ./aclocal.m4	2006-07-13 16:26:59.000000000 +0200
@@ -2174,6 +2174,7 @@
                      w3c-libwww/WWWMIME.h \
                      w3c-libwww/WWWNews.h \
                      w3c-libwww/WWWUtil.h \
+                     w3c-libwww/wwwconf.h \
                      w3c-libwww/wwwsys.h,,
                      AC_MSG_ERROR([w3c-libwww headers incomplete.]),
                      [
--- ./configure.orig	2005-12-17 22:56:21.000000000 +0100
+++ ./configure	2006-07-13 16:10:56.000000000 +0200
@@ -9025,6 +9025,7 @@
                      w3c-libwww/WWWMIME.h \
                      w3c-libwww/WWWNews.h \
                      w3c-libwww/WWWUtil.h \
+                     w3c-libwww/wwwconf.h \
                      w3c-libwww/wwwsys.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--- ./config/config.h.in.orig	2006-07-13 16:12:34.000000000 +0200
+++ ./config/config.h.in	2006-07-13 16:12:37.000000000 +0200
@@ -540,6 +540,9 @@
 /* Define to 1 if you have the <w3c-libwww/WWWCache.h> header file. */
 #undef HAVE_W3C_LIBWWW_WWWCACHE_H
 
+/* Define to 1 if you have the <w3c-libwww/wwwconf.h> header file. */
+#undef HAVE_W3C_LIBWWW_WWWCONF_H
+
 /* Define to 1 if you have the <w3c-libwww/WWWCore.h> header file. */
 #undef HAVE_W3C_LIBWWW_WWWCORE_H