Index: regex.c
--- regex.c.orig	2004-04-17 15:09:09.000000000 +0200
+++ regex.c	2004-05-10 10:16:35.000000000 +0200
@@ -10,7 +10,8 @@
 
 #include <stdio.h> 
 #include <ctype.h>
-#include <wctype.h>
+#include <libutf8.h>
+#include <utf8/wctype.h>
 
 #include "b.h"
 #include "utf8.h"
Index: termcap.c
--- termcap.c.orig	2004-04-10 07:20:20.000000000 +0200
+++ termcap.c	2004-05-10 10:14:36.000000000 +0200
@@ -20,6 +20,7 @@
 #endif
 #ifdef TERMINFO
 #ifdef HAVE_TERM_H
+#include <curses.h>
 #include <term.h>
 #endif
 #endif
Index: utf8.h
--- utf8.h.orig	2004-04-18 03:26:00.000000000 +0200
+++ utf8.h	2004-05-10 10:17:46.000000000 +0200
@@ -10,6 +10,7 @@
 
 #include "config.h"
 #include "types.h"
+#include "libutf8.h"
 
 /* UTF-8 Encoder
  *
Index: utils.c
--- utils.c.orig	2004-04-23 00:35:28.000000000 +0200
+++ utils.c	2004-05-10 10:18:13.000000000 +0200
@@ -16,6 +16,7 @@
 #ifdef HAVE_STDLIB_H
 #include <stdlib.h>
 #endif
+#include "libutf8.h"
 
 #include "blocks.h"
 #include "utils.h"