--- a/ChangeLog	Mon Jan 28 00:10:21 2019 +0100
+++ b/ChangeLog	Mon Jan 28 01:20:11 2019 +0100
@@ -1,3 +1,47 @@
+2019-01-27  Bruno Haible  <bruno@clisp.org>
+
+	Avoid build errors due to wrong references between modules.
+	* lib/uninorm/canonical-decomposition.c: Include
+	"uninorm/decomposition-table.h", not "decomposition-table.h".
+	* lib/uninorm/decomposition.c: Likewise.
+	* lib/uninorm/u8-normalize.c: Include "uninorm/decompose-internal.h",
+	not "decompose-internal.h".
+	* lib/uninorm/u16-normalize.c: Likewise.
+	* lib/uninorm/u32-normalize.c: Likewise.
+	* lib/uninorm/uninorm-filter.c: Likewise.
+	* lib/uninorm/nfkc.c: Likewise.
+	* lib/uninorm/nfkd.c: Likewise.
+	* lib/unicase/u8-casemap.c: Include "unicase/caseprop.h", not
+	"caseprop.h".
+	* lib/unicase/u8-ct-totitle.c: Likewise.
+	* lib/unicase/u8-prefix-context.c: Likewise.
+	* lib/unicase/u8-suffix-context.c: Likewise.
+	* lib/unicase/u16-casemap.c: Likewise.
+	* lib/unicase/u16-ct-totitle.c: Likewise.
+	* lib/unicase/u16-prefix-context.c: Likewise.
+	* lib/unicase/u16-suffix-context.c: Likewise.
+	* lib/unicase/u32-casemap.c: Likewise.
+	* lib/unicase/u32-ct-totitle.c: Likewise.
+	* lib/unicase/u32-prefix-context.c: Likewise.
+	* lib/unicase/u32-suffix-context.c: Likewise.
+	* lib/unicase/u8-tolower.c: Include "unicase/unicasemap.h", not
+	"unicasemap.h".
+	* lib/unicase/u8-toupper.c: Likewise.
+	* lib/unicase/u8-ct-tolower.c: Likewise.
+	* lib/unicase/u8-ct-toupper.c: Likewise.
+	* lib/unicase/u16-tolower.c: Likewise.
+	* lib/unicase/u16-toupper.c: Likewise.
+	* lib/unicase/u16-ct-tolower.c: Likewise.
+	* lib/unicase/u16-ct-toupper.c: Likewise.
+	* lib/unicase/u32-tolower.c: Likewise.
+	* lib/unicase/u32-toupper.c: Likewise.
+	* lib/unicase/u32-ct-tolower.c: Likewise.
+	* lib/unicase/u32-ct-toupper.c: Likewise.
+	* lib/unicase/u8-ct-casefold.c: Include "unicase/unicasemap.h", not
+	"unicasemap.h", and "unicase/casefold.h", not "casefold.h".
+	* lib/unicase/u16-ct-casefold.c: Likewise.
+	* lib/unicase/u32-ct-casefold.c: Likewise.
+
 2019-01-27  Bruno Haible  <bruno@clisp.org>
 
 	gperf: Fix error when this module is required by some test module.

--- a/lib/unicase/u16-casemap.c	Mon Jan 28 00:10:21 2019 +0100
+++ b/lib/unicase/u16-casemap.c	Mon Jan 28 01:20:11 2019 +0100
@@ -27,7 +27,7 @@
 #include "unistr.h"
 #include "unictype.h"
 #include "uninorm.h"
-#include "caseprop.h"
+#include "unicase/caseprop.h"
 #include "context.h"
 #include "unicase/special-casing.h"
 

--- a/lib/unicase/u16-ct-casefold.c	Mon Jan 28 00:10:21 2019 +0100
+++ b/lib/unicase/u16-ct-casefold.c	Mon Jan 28 01:20:11 2019 +0100
@@ -24,9 +24,9 @@
 #include <stddef.h>
 #include <stdlib.h>
 
-#include "unicasemap.h"
+#include "unicase/unicasemap.h"
 #include "unicase/special-casing.h"
-#include "casefold.h"
+#include "unicase/casefold.h"
 
 #define FUNC u16_ct_casefold
 #define UNIT uint16_t

--- a/lib/unicase/u16-ct-tolower.c	Mon Jan 28 00:10:21 2019 +0100
+++ b/lib/unicase/u16-ct-tolower.c	Mon Jan 28 01:20:11 2019 +0100
@@ -22,7 +22,7 @@
 
 #include <stddef.h>
 
-#include "unicasemap.h"
+#include "unicase/unicasemap.h"
 #include "unicase/special-casing.h"
 
 uint16_t *

--- a/lib/unicase/u16-ct-totitle.c	Mon Jan 28 00:10:21 2019 +0100
+++ b/lib/unicase/u16-ct-totitle.c	Mon Jan 28 01:20:11 2019 +0100
@@ -29,7 +29,7 @@
 #include "unictype.h"
 #include "uniwbrk.h"
 #include "uninorm.h"
-#include "caseprop.h"
+#include "unicase/caseprop.h"
 #include "context.h"
 #include "unicase/special-casing.h"
 

--- a/lib/unicase/u16-ct-toupper.c	Mon Jan 28 00:10:21 2019 +0100
+++ b/lib/unicase/u16-ct-toupper.c	Mon Jan 28 01:20:11 2019 +0100
@@ -22,7 +22,7 @@
 
 #include <stddef.h>
 
-#include "unicasemap.h"
+#include "unicase/unicasemap.h"
 #include "unicase/special-casing.h"
 
 uint16_t *

--- a/lib/unicase/u16-prefix-context.c	Mon Jan 28 00:10:21 2019 +0100
+++ b/lib/unicase/u16-prefix-context.c	Mon Jan 28 01:20:11 2019 +0100
@@ -22,7 +22,7 @@
 
 #include "unictype.h"
 #include "unistr.h"
-#include "caseprop.h"
+#include "unicase/caseprop.h"
 #include "context.h"
 
 #define FUNC1 u16_casing_prefix_context

--- a/lib/unicase/u16-suffix-context.c	Mon Jan 28 00:10:21 2019 +0100
+++ b/lib/unicase/u16-suffix-context.c	Mon Jan 28 01:20:11 2019 +0100
@@ -22,7 +22,7 @@
 
 #include "unictype.h"
 #include "unistr.h"
-#include "caseprop.h"
+#include "unicase/caseprop.h"
 #include "context.h"
 
 #define FUNC1 u16_casing_suffix_context

--- a/lib/unicase/u16-tolower.c	Mon Jan 28 00:10:21 2019 +0100
+++ b/lib/unicase/u16-tolower.c	Mon Jan 28 01:20:11 2019 +0100
@@ -22,7 +22,7 @@
 
 #include <stddef.h>
 
-#include "unicasemap.h"
+#include "unicase/unicasemap.h"
 #include "unicase/special-casing.h"
 
 uint16_t *

--- a/lib/unicase/u16-toupper.c	Mon Jan 28 00:10:21 2019 +0100
+++ b/lib/unicase/u16-toupper.c	Mon Jan 28 01:20:11 2019 +0100
@@ -22,7 +22,7 @@
 
 #include <stddef.h>
 
-#include "unicasemap.h"
+#include "unicase/unicasemap.h"
 #include "unicase/special-casing.h"
 
 uint16_t *

--- a/lib/unicase/u32-casemap.c	Mon Jan 28 00:10:21 2019 +0100
+++ b/lib/unicase/u32-casemap.c	Mon Jan 28 01:20:11 2019 +0100
@@ -27,7 +27,7 @@
 #include "unistr.h"
 #include "unictype.h"
 #include "uninorm.h"
-#include "caseprop.h"
+#include "unicase/caseprop.h"
 #include "context.h"
 #include "unicase/special-casing.h"
 

--- a/lib/unicase/u32-ct-casefold.c	Mon Jan 28 00:10:21 2019 +0100
+++ b/lib/unicase/u32-ct-casefold.c	Mon Jan 28 01:20:11 2019 +0100
@@ -24,9 +24,9 @@
 #include <stddef.h>
 #include <stdlib.h>
 
-#include "unicasemap.h"
+#include "unicase/unicasemap.h"
 #include "unicase/special-casing.h"
-#include "casefold.h"
+#include "unicase/casefold.h"
 
 #define FUNC u32_ct_casefold
 #define UNIT uint32_t

--- a/lib/unicase/u32-ct-tolower.c	Mon Jan 28 00:10:21 2019 +0100
+++ b/lib/unicase/u32-ct-tolower.c	Mon Jan 28 01:20:11 2019 +0100
@@ -22,7 +22,7 @@
 
 #include <stddef.h>
 
-#include "unicasemap.h"
+#include "unicase/unicasemap.h"
 #include "unicase/special-casing.h"
 
 uint32_t *

--- a/lib/unicase/u32-ct-totitle.c	Mon Jan 28 00:10:21 2019 +0100
+++ b/lib/unicase/u32-ct-totitle.c	Mon Jan 28 01:20:11 2019 +0100
@@ -29,7 +29,7 @@
 #include "unictype.h"
 #include "uniwbrk.h"
 #include "uninorm.h"
-#include "caseprop.h"
+#include "unicase/caseprop.h"
 #include "context.h"
 #include "unicase/special-casing.h"
 

--- a/lib/unicase/u32-ct-toupper.c	Mon Jan 28 00:10:21 2019 +0100
+++ b/lib/unicase/u32-ct-toupper.c	Mon Jan 28 01:20:11 2019 +0100
@@ -22,7 +22,7 @@
 
 #include <stddef.h>
 
-#include "unicasemap.h"
+#include "unicase/unicasemap.h"
 #include "unicase/special-casing.h"
 
 uint32_t *

--- a/lib/unicase/u32-prefix-context.c	Mon Jan 28 00:10:21 2019 +0100
+++ b/lib/unicase/u32-prefix-context.c	Mon Jan 28 01:20:11 2019 +0100
@@ -22,7 +22,7 @@
 
 #include "unictype.h"
 #include "unistr.h"
-#include "caseprop.h"
+#include "unicase/caseprop.h"
 #include "context.h"
 
 #define FUNC1 u32_casing_prefix_context

--- a/lib/unicase/u32-suffix-context.c	Mon Jan 28 00:10:21 2019 +0100
+++ b/lib/unicase/u32-suffix-context.c	Mon Jan 28 01:20:11 2019 +0100
@@ -22,7 +22,7 @@
 
 #include "unictype.h"
 #include "unistr.h"
-#include "caseprop.h"
+#include "unicase/caseprop.h"
 #include "context.h"
 
 #define FUNC1 u32_casing_suffix_context

--- a/lib/unicase/u32-tolower.c	Mon Jan 28 00:10:21 2019 +0100
+++ b/lib/unicase/u32-tolower.c	Mon Jan 28 01:20:11 2019 +0100
@@ -22,7 +22,7 @@
 
 #include <stddef.h>
 
-#include "unicasemap.h"
+#include "unicase/unicasemap.h"
 #include "unicase/special-casing.h"
 
 uint32_t *

--- a/lib/unicase/u32-toupper.c	Mon Jan 28 00:10:21 2019 +0100
+++ b/lib/unicase/u32-toupper.c	Mon Jan 28 01:20:11 2019 +0100
@@ -22,7 +22,7 @@
 
 #include <stddef.h>
 
-#include "unicasemap.h"
+#include "unicase/unicasemap.h"
 #include "unicase/special-casing.h"
 
 uint32_t *

--- a/lib/unicase/u8-casemap.c	Mon Jan 28 00:10:21 2019 +0100
+++ b/lib/unicase/u8-casemap.c	Mon Jan 28 01:20:11 2019 +0100
@@ -27,7 +27,7 @@
 #include "unistr.h"
 #include "unictype.h"
 #include "uninorm.h"
-#include "caseprop.h"
+#include "unicase/caseprop.h"
 #include "context.h"
 #include "unicase/special-casing.h"
 

--- a/lib/unicase/u8-ct-casefold.c	Mon Jan 28 00:10:21 2019 +0100
+++ b/lib/unicase/u8-ct-casefold.c	Mon Jan 28 01:20:11 2019 +0100
@@ -24,9 +24,9 @@
 #include <stddef.h>
 #include <stdlib.h>
 
-#include "unicasemap.h"
+#include "unicase/unicasemap.h"
 #include "unicase/special-casing.h"
-#include "casefold.h"
+#include "unicase/casefold.h"
 
 #define FUNC u8_ct_casefold
 #define UNIT uint8_t

--- a/lib/unicase/u8-ct-tolower.c	Mon Jan 28 00:10:21 2019 +0100
+++ b/lib/unicase/u8-ct-tolower.c	Mon Jan 28 01:20:11 2019 +0100
@@ -22,7 +22,7 @@
 
 #include <stddef.h>
 
-#include "unicasemap.h"
+#include "unicase/unicasemap.h"
 #include "unicase/special-casing.h"
 
 uint8_t *

--- a/lib/unicase/u8-ct-totitle.c	Mon Jan 28 00:10:21 2019 +0100
+++ b/lib/unicase/u8-ct-totitle.c	Mon Jan 28 01:20:11 2019 +0100
@@ -29,7 +29,7 @@
 #include "unictype.h"
 #include "uniwbrk.h"
 #include "uninorm.h"
-#include "caseprop.h"
+#include "unicase/caseprop.h"
 #include "context.h"
 #include "unicase/special-casing.h"
 

--- a/lib/unicase/u8-ct-toupper.c	Mon Jan 28 00:10:21 2019 +0100
+++ b/lib/unicase/u8-ct-toupper.c	Mon Jan 28 01:20:11 2019 +0100
@@ -22,7 +22,7 @@
 
 #include <stddef.h>
 
-#include "unicasemap.h"
+#include "unicase/unicasemap.h"
 #include "unicase/special-casing.h"
 
 uint8_t *

--- a/lib/unicase/u8-prefix-context.c	Mon Jan 28 00:10:21 2019 +0100
+++ b/lib/unicase/u8-prefix-context.c	Mon Jan 28 01:20:11 2019 +0100
@@ -22,7 +22,7 @@
 
 #include "unictype.h"
 #include "unistr.h"
-#include "caseprop.h"
+#include "unicase/caseprop.h"
 #include "context.h"
 
 #define FUNC1 u8_casing_prefix_context

--- a/lib/unicase/u8-suffix-context.c	Mon Jan 28 00:10:21 2019 +0100
+++ b/lib/unicase/u8-suffix-context.c	Mon Jan 28 01:20:11 2019 +0100
@@ -22,7 +22,7 @@
 
 #include "unictype.h"
 #include "unistr.h"
-#include "caseprop.h"
+#include "unicase/caseprop.h"
 #include "context.h"
 
 #define FUNC1 u8_casing_suffix_context

--- a/lib/unicase/u8-tolower.c	Mon Jan 28 00:10:21 2019 +0100
+++ b/lib/unicase/u8-tolower.c	Mon Jan 28 01:20:11 2019 +0100
@@ -22,7 +22,7 @@
 
 #include <stddef.h>
 
-#include "unicasemap.h"
+#include "unicase/unicasemap.h"
 #include "unicase/special-casing.h"
 
 uint8_t *

--- a/lib/unicase/u8-toupper.c	Mon Jan 28 00:10:21 2019 +0100
+++ b/lib/unicase/u8-toupper.c	Mon Jan 28 01:20:11 2019 +0100
@@ -22,7 +22,7 @@
 
 #include <stddef.h>
 
-#include "unicasemap.h"
+#include "unicase/unicasemap.h"
 #include "unicase/special-casing.h"
 
 uint8_t *

--- a/lib/uninorm/canonical-decomposition.c	Mon Jan 28 00:10:21 2019 +0100
+++ b/lib/uninorm/canonical-decomposition.c	Mon Jan 28 01:20:11 2019 +0100
@@ -22,7 +22,7 @@
 
 #include <stdlib.h>
 
-#include "decomposition-table.h"
+#include "uninorm/decomposition-table.h"
 
 int
 uc_canonical_decomposition (ucs4_t uc, ucs4_t *decomposition)

--- a/lib/uninorm/decomposition.c	Mon Jan 28 00:10:21 2019 +0100
+++ b/lib/uninorm/decomposition.c	Mon Jan 28 01:20:11 2019 +0100
@@ -20,7 +20,7 @@
 /* Specification.  */
 #include "uninorm.h"
 
-#include "decomposition-table.h"
+#include "uninorm/decomposition-table.h"
 
 int
 uc_decomposition (ucs4_t uc, int *decomp_tag, ucs4_t *decomposition)

--- a/lib/uninorm/nfkc.c	Mon Jan 28 00:10:21 2019 +0100
+++ b/lib/uninorm/nfkc.c	Mon Jan 28 01:20:11 2019 +0100
@@ -21,7 +21,7 @@
 #include "uninorm.h"
 
 #include "normalize-internal.h"
-#include "decompose-internal.h"
+#include "uninorm/decompose-internal.h"
 
 const struct unicode_normalization_form uninorm_nfkc =
   {

--- a/lib/uninorm/nfkd.c	Mon Jan 28 00:10:21 2019 +0100
+++ b/lib/uninorm/nfkd.c	Mon Jan 28 01:20:11 2019 +0100
@@ -21,7 +21,7 @@
 #include "uninorm.h"
 
 #include "normalize-internal.h"
-#include "decompose-internal.h"
+#include "uninorm/decompose-internal.h"
 
 const struct unicode_normalization_form uninorm_nfkd =
   {

--- a/lib/uninorm/u16-normalize.c	Mon Jan 28 00:10:21 2019 +0100
+++ b/lib/uninorm/u16-normalize.c	Mon Jan 28 01:20:11 2019 +0100
@@ -28,7 +28,7 @@
 #include "unistr.h"
 #include "unictype.h"
 #include "normalize-internal.h"
-#include "decompose-internal.h"
+#include "uninorm/decompose-internal.h"
 
 #define FUNC u16_normalize
 #define UNIT uint16_t

--- a/lib/uninorm/u32-normalize.c	Mon Jan 28 00:10:21 2019 +0100
+++ b/lib/uninorm/u32-normalize.c	Mon Jan 28 01:20:11 2019 +0100
@@ -28,7 +28,7 @@
 #include "unistr.h"
 #include "unictype.h"
 #include "normalize-internal.h"
-#include "decompose-internal.h"
+#include "uninorm/decompose-internal.h"
 
 #define FUNC u32_normalize
 #define UNIT uint32_t

--- a/lib/uninorm/u8-normalize.c	Mon Jan 28 00:10:21 2019 +0100
+++ b/lib/uninorm/u8-normalize.c	Mon Jan 28 01:20:11 2019 +0100
@@ -28,7 +28,7 @@
 #include "unistr.h"
 #include "unictype.h"
 #include "normalize-internal.h"
-#include "decompose-internal.h"
+#include "uninorm/decompose-internal.h"
 
 #define FUNC u8_normalize
 #define UNIT uint8_t

--- a/lib/uninorm/uninorm-filter.c	Mon Jan 28 00:10:21 2019 +0100
+++ b/lib/uninorm/uninorm-filter.c	Mon Jan 28 01:20:11 2019 +0100
@@ -27,7 +27,7 @@
 
 #include "unictype.h"
 #include "normalize-internal.h"
-#include "decompose-internal.h"
+#include "uninorm/decompose-internal.h"
 
 
 struct uninorm_filter