--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2009-06-29  Bruno Haible  <bruno@clisp.org>
 
+	Define u32_totitle as a wrapper around u32_ct_totitle.
+	* lib/unicase/u32-totitle.c: Update.
+	* modules/unicase/u32-totitle (Depends-on): Add unicase/u32-ct-totitle,
+	unicase/empty-prefix-context, unicase/empty-suffix-context. Clean up.
+
 	Define u16_totitle as a wrapper around u16_ct_totitle.
 	* lib/unicase/u16-totitle.c: Update.
 	* modules/unicase/u16-totitle (Depends-on): Add unicase/u16-ct-totitle,

--- a/lib/unicase/u32-totitle.c
+++ b/lib/unicase/u32-totitle.c
@@ -20,22 +20,7 @@
 /* Specification.  */
 #include "unicase.h"
 
-#include <errno.h>
-#include <stdbool.h>
-#include <stddef.h>
-#include <stdlib.h>
-
-#include "unistr.h"
-#include "unictype.h"
-#include "uniwbrk.h"
-#include "uninorm.h"
-#include "special-casing.h"
-
 #define FUNC u32_totitle
 #define UNIT uint32_t
-#define U_WORDBREAKS u32_wordbreaks
-#define U_MBTOUC_UNSAFE u32_mbtouc_unsafe
-#define U_UCTOMB u32_uctomb
-#define U_CPY u32_cpy
-#define U_NORMALIZE u32_normalize
+#define U_CT_TOTITLE u32_ct_totitle
 #include "u-totitle.h"

--- a/modules/unicase/u32-totitle
+++ b/modules/unicase/u32-totitle
@@ -7,23 +7,9 @@
 
 Depends-on:
 unicase/base
-unicase/special-casing
-unicase/totitle
-unicase/tolower
-uniwbrk/wordbreak-property
-uniwbrk/u32-wordbreaks
-unictype/category-of
-unictype/category-test
-unictype/category-Lt
-unictype/combining-class
-unictype/property-lowercase
-unictype/property-uppercase
-unictype/property-soft-dotted
-unistr/u32-mbtouc-unsafe
-unistr/u32-uctomb
-unistr/u32-cpy
-uninorm/u32-normalize
-stdbool
+unicase/u32-ct-totitle
+unicase/empty-prefix-context
+unicase/empty-suffix-context
 
 configure.ac: