Adjust includes.

diff --git a/charset/Makefile b/charset/Makefile
index dbd352f7b916ca4275ed32a076a03cb56b9b61d5..b944a79f1dbd79afe9740fc8e11427a607f991ff 100644 (file)
--- a/charset/Makefile
+++ b/charset/Makefile
@@ -2,8 +2,7 @@
 
 DIRS+=charset
 
-LIBCHARSET_MODS=toupper tolower tocat toligatures utf8 unaccent strlen debug \
-       charconv setnames unistream fb-charconv
+LIBCHARSET_MODS=toupper tolower tocat toligatures unaccent charconv setnames fb-charconv
 
 obj/charset/libcharset.a: $(addsuffix .o,$(addprefix obj/charset/,$(LIBCHARSET_MODS)))
 obj/charset/libcharset.so: $(addsuffix .oo,$(addprefix obj/charset/,$(LIBCHARSET_MODS)))

diff --git a/charset/tocat.c b/charset/tocat.c
index a3b0832d82ccd19bcd52f0d96903d023f03e77b4..583c31ddf32df438c17848628373d5c8a57e4c9d 100644 (file)
--- a/charset/tocat.c
+++ b/charset/tocat.c
@@ -8,5 +8,5 @@
  */
 
 #include "lib/lib.h"
-#include "charset/unicode.h"
+#include "charset/unicat.h"
 #include "charset/U-cat.h"

diff --git a/charset/toligatures.c b/charset/toligatures.c
index d5f8425230abdb959a22aee7993ebfa661cea207..c74c7a7ba37be73edf44c75ea9fe0e2c470bc7ab 100644 (file)
--- a/charset/toligatures.c
+++ b/charset/toligatures.c
@@ -8,7 +8,7 @@
  */
 
 #include "lib/lib.h"
-#include "charset/unicode.h"
+#include "charset/unicat.h"
 #include "charset/U-ligatures.h"
 
 const word *

diff --git a/charset/tolower.c b/charset/tolower.c
index 7a24f2cbb05aaddfadbf2f19a62f9ca1483739b7..189c3151267453d950b6eda0e1ae0ccca971ce4e 100644 (file)
--- a/charset/tolower.c
+++ b/charset/tolower.c
@@ -8,5 +8,5 @@
  */
 
 #include "lib/lib.h"
-#include "charset/unicode.h"
+#include "charset/unicat.h"
 #include "charset/U-lower.h"

diff --git a/charset/toupper.c b/charset/toupper.c
index 5a650b9d334abb23797073b6780d3ac9c90830ee..61301d9047c4919cb57ca1364309e14c9bc4bddf 100644 (file)
--- a/charset/toupper.c
+++ b/charset/toupper.c
@@ -8,5 +8,5 @@
  */
 
 #include "lib/lib.h"
-#include "charset/unicode.h"
+#include "charset/unicat.h"
 #include "charset/U-upper.h"

diff --git a/charset/unaccent.c b/charset/unaccent.c
index 7ec249604e4968d62d709e10a573aa3ae751ced1..a5083e91a0d1ee8b960930f7f4d3eb8dac918e8c 100644 (file)
--- a/charset/unaccent.c
+++ b/charset/unaccent.c
@@ -8,5 +8,5 @@
  */
 
 #include "lib/lib.h"
-#include "charset/unicode.h"
+#include "charset/unicat.h"
 #include "charset/U-unacc.h"