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.

35 files changed, 38 insertions, 38 deletions

diff --git a/lib/unicase/u16-casemap.c b/lib/unicase/u16-casemap.c
index dd0e3f3815..e9d1011ab9 100644
--- a/lib/unicase/u16-casemap.c
+++ b/lib/unicase/u16-casemap.c
@@ -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"
 
diff --git a/lib/unicase/u16-ct-casefold.c b/lib/unicase/u16-ct-casefold.c
index 47de317c59..9b26f73aa9 100644
--- a/lib/unicase/u16-ct-casefold.c
+++ b/lib/unicase/u16-ct-casefold.c
@@ -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
diff --git a/lib/unicase/u16-ct-tolower.c b/lib/unicase/u16-ct-tolower.c
index f7e58251b5..7c9f4f45fb 100644
--- a/lib/unicase/u16-ct-tolower.c
+++ b/lib/unicase/u16-ct-tolower.c
@@ -22,7 +22,7 @@
 
 #include <stddef.h>
 
-#include "unicasemap.h"
+#include "unicase/unicasemap.h"
 #include "unicase/special-casing.h"
 
 uint16_t *
diff --git a/lib/unicase/u16-ct-totitle.c b/lib/unicase/u16-ct-totitle.c
index 39bacb616d..935cc7ca23 100644
--- a/lib/unicase/u16-ct-totitle.c
+++ b/lib/unicase/u16-ct-totitle.c
@@ -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"
 
diff --git a/lib/unicase/u16-ct-toupper.c b/lib/unicase/u16-ct-toupper.c
index 3dec1a0e8f..d46b4b8820 100644
--- a/lib/unicase/u16-ct-toupper.c
+++ b/lib/unicase/u16-ct-toupper.c
@@ -22,7 +22,7 @@
 
 #include <stddef.h>
 
-#include "unicasemap.h"
+#include "unicase/unicasemap.h"
 #include "unicase/special-casing.h"
 
 uint16_t *
diff --git a/lib/unicase/u16-prefix-context.c b/lib/unicase/u16-prefix-context.c
index eaa8454073..59634a8b38 100644
--- a/lib/unicase/u16-prefix-context.c
+++ b/lib/unicase/u16-prefix-context.c
@@ -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
diff --git a/lib/unicase/u16-suffix-context.c b/lib/unicase/u16-suffix-context.c
index d5776ae8a2..bb388bd79a 100644
--- a/lib/unicase/u16-suffix-context.c
+++ b/lib/unicase/u16-suffix-context.c
@@ -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
diff --git a/lib/unicase/u16-tolower.c b/lib/unicase/u16-tolower.c
index e111a20a55..89f62bdd01 100644
--- a/lib/unicase/u16-tolower.c
+++ b/lib/unicase/u16-tolower.c
@@ -22,7 +22,7 @@
 
 #include <stddef.h>
 
-#include "unicasemap.h"
+#include "unicase/unicasemap.h"
 #include "unicase/special-casing.h"
 
 uint16_t *
diff --git a/lib/unicase/u16-toupper.c b/lib/unicase/u16-toupper.c
index 558a7c1f07..62bb3e2369 100644
--- a/lib/unicase/u16-toupper.c
+++ b/lib/unicase/u16-toupper.c
@@ -22,7 +22,7 @@
 
 #include <stddef.h>
 
-#include "unicasemap.h"
+#include "unicase/unicasemap.h"
 #include "unicase/special-casing.h"
 
 uint16_t *
diff --git a/lib/unicase/u32-casemap.c b/lib/unicase/u32-casemap.c
index 8c96895308..3d965f40bf 100644
--- a/lib/unicase/u32-casemap.c
+++ b/lib/unicase/u32-casemap.c
@@ -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"
 
diff --git a/lib/unicase/u32-ct-casefold.c b/lib/unicase/u32-ct-casefold.c
index 4bd9b4bc7f..5c077e83f8 100644
--- a/lib/unicase/u32-ct-casefold.c
+++ b/lib/unicase/u32-ct-casefold.c
@@ -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
diff --git a/lib/unicase/u32-ct-tolower.c b/lib/unicase/u32-ct-tolower.c
index 3d3578cf79..998472dbf1 100644
--- a/lib/unicase/u32-ct-tolower.c
+++ b/lib/unicase/u32-ct-tolower.c
@@ -22,7 +22,7 @@
 
 #include <stddef.h>
 
-#include "unicasemap.h"
+#include "unicase/unicasemap.h"
 #include "unicase/special-casing.h"
 
 uint32_t *
diff --git a/lib/unicase/u32-ct-totitle.c b/lib/unicase/u32-ct-totitle.c
index 91563b04d1..3bc7ab15a9 100644
--- a/lib/unicase/u32-ct-totitle.c
+++ b/lib/unicase/u32-ct-totitle.c
@@ -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"
 
diff --git a/lib/unicase/u32-ct-toupper.c b/lib/unicase/u32-ct-toupper.c
index c2a1e3fac1..9cbd3848c0 100644
--- a/lib/unicase/u32-ct-toupper.c
+++ b/lib/unicase/u32-ct-toupper.c
@@ -22,7 +22,7 @@
 
 #include <stddef.h>
 
-#include "unicasemap.h"
+#include "unicase/unicasemap.h"
 #include "unicase/special-casing.h"
 
 uint32_t *
diff --git a/lib/unicase/u32-prefix-context.c b/lib/unicase/u32-prefix-context.c
index 2e2212eb62..5049cd0d91 100644
--- a/lib/unicase/u32-prefix-context.c
+++ b/lib/unicase/u32-prefix-context.c
@@ -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
diff --git a/lib/unicase/u32-suffix-context.c b/lib/unicase/u32-suffix-context.c
index d4d2e1d9af..c239de8489 100644
--- a/lib/unicase/u32-suffix-context.c
+++ b/lib/unicase/u32-suffix-context.c
@@ -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
diff --git a/lib/unicase/u32-tolower.c b/lib/unicase/u32-tolower.c
index a8f76f2fd9..b983aed236 100644
--- a/lib/unicase/u32-tolower.c
+++ b/lib/unicase/u32-tolower.c
@@ -22,7 +22,7 @@
 
 #include <stddef.h>
 
-#include "unicasemap.h"
+#include "unicase/unicasemap.h"
 #include "unicase/special-casing.h"
 
 uint32_t *
diff --git a/lib/unicase/u32-toupper.c b/lib/unicase/u32-toupper.c
index bf7bdd6e1d..7c751c6a93 100644
--- a/lib/unicase/u32-toupper.c
+++ b/lib/unicase/u32-toupper.c
@@ -22,7 +22,7 @@
 
 #include <stddef.h>
 
-#include "unicasemap.h"
+#include "unicase/unicasemap.h"
 #include "unicase/special-casing.h"
 
 uint32_t *
diff --git a/lib/unicase/u8-casemap.c b/lib/unicase/u8-casemap.c
index 2ef0386e42..341d2cdebb 100644
--- a/lib/unicase/u8-casemap.c
+++ b/lib/unicase/u8-casemap.c
@@ -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"
 
diff --git a/lib/unicase/u8-ct-casefold.c b/lib/unicase/u8-ct-casefold.c
index 054a504bab..436da52618 100644
--- a/lib/unicase/u8-ct-casefold.c
+++ b/lib/unicase/u8-ct-casefold.c
@@ -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
diff --git a/lib/unicase/u8-ct-tolower.c b/lib/unicase/u8-ct-tolower.c
index 00314c22da..63fa1ffdb1 100644
--- a/lib/unicase/u8-ct-tolower.c
+++ b/lib/unicase/u8-ct-tolower.c
@@ -22,7 +22,7 @@
 
 #include <stddef.h>
 
-#include "unicasemap.h"
+#include "unicase/unicasemap.h"
 #include "unicase/special-casing.h"
 
 uint8_t *
diff --git a/lib/unicase/u8-ct-totitle.c b/lib/unicase/u8-ct-totitle.c
index d220395a6f..74de537140 100644
--- a/lib/unicase/u8-ct-totitle.c
+++ b/lib/unicase/u8-ct-totitle.c
@@ -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"
 
diff --git a/lib/unicase/u8-ct-toupper.c b/lib/unicase/u8-ct-toupper.c
index 414760fe7b..8603a3ce3a 100644
--- a/lib/unicase/u8-ct-toupper.c
+++ b/lib/unicase/u8-ct-toupper.c
@@ -22,7 +22,7 @@
 
 #include <stddef.h>
 
-#include "unicasemap.h"
+#include "unicase/unicasemap.h"
 #include "unicase/special-casing.h"
 
 uint8_t *
diff --git a/lib/unicase/u8-prefix-context.c b/lib/unicase/u8-prefix-context.c
index 4e7c2be9f3..0f32d9c1fc 100644
--- a/lib/unicase/u8-prefix-context.c
+++ b/lib/unicase/u8-prefix-context.c
@@ -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
diff --git a/lib/unicase/u8-suffix-context.c b/lib/unicase/u8-suffix-context.c
index f891db25e0..b5a46ed7a2 100644
--- a/lib/unicase/u8-suffix-context.c
+++ b/lib/unicase/u8-suffix-context.c
@@ -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
diff --git a/lib/unicase/u8-tolower.c b/lib/unicase/u8-tolower.c
index 087c078fe6..b2f00853e0 100644
--- a/lib/unicase/u8-tolower.c
+++ b/lib/unicase/u8-tolower.c
@@ -22,7 +22,7 @@
 
 #include <stddef.h>
 
-#include "unicasemap.h"
+#include "unicase/unicasemap.h"
 #include "unicase/special-casing.h"
 
 uint8_t *
diff --git a/lib/unicase/u8-toupper.c b/lib/unicase/u8-toupper.c
index f2fd6a7495..99d6ef2939 100644
--- a/lib/unicase/u8-toupper.c
+++ b/lib/unicase/u8-toupper.c
@@ -22,7 +22,7 @@
 
 #include <stddef.h>
 
-#include "unicasemap.h"
+#include "unicase/unicasemap.h"
 #include "unicase/special-casing.h"
 
 uint8_t *
diff --git a/lib/uninorm/canonical-decomposition.c b/lib/uninorm/canonical-decomposition.c
index b20ca02c40..ecd3bb9f03 100644
--- a/lib/uninorm/canonical-decomposition.c
+++ b/lib/uninorm/canonical-decomposition.c
@@ -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)
diff --git a/lib/uninorm/decomposition.c b/lib/uninorm/decomposition.c
index 5d622a99a3..a0e6cfc738 100644
--- a/lib/uninorm/decomposition.c
+++ b/lib/uninorm/decomposition.c
@@ -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)
diff --git a/lib/uninorm/nfkc.c b/lib/uninorm/nfkc.c
index 35f43d9090..b41e26655f 100644
--- a/lib/uninorm/nfkc.c
+++ b/lib/uninorm/nfkc.c
@@ -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 =
   {
diff --git a/lib/uninorm/nfkd.c b/lib/uninorm/nfkd.c
index d34ff6f8cb..c98492c5ad 100644
--- a/lib/uninorm/nfkd.c
+++ b/lib/uninorm/nfkd.c
@@ -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 =
   {
diff --git a/lib/uninorm/u16-normalize.c b/lib/uninorm/u16-normalize.c
index 5f634edd07..4319f641a3 100644
--- a/lib/uninorm/u16-normalize.c
+++ b/lib/uninorm/u16-normalize.c
@@ -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
diff --git a/lib/uninorm/u32-normalize.c b/lib/uninorm/u32-normalize.c
index b7ee8c0262..20d1479720 100644
--- a/lib/uninorm/u32-normalize.c
+++ b/lib/uninorm/u32-normalize.c
@@ -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
diff --git a/lib/uninorm/u8-normalize.c b/lib/uninorm/u8-normalize.c
index a5ee06a3dd..fe530ac8c6 100644
--- a/lib/uninorm/u8-normalize.c
+++ b/lib/uninorm/u8-normalize.c
@@ -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
diff --git a/lib/uninorm/uninorm-filter.c b/lib/uninorm/uninorm-filter.c
index 73145da71b..e1933c7ba4 100644
--- a/lib/uninorm/uninorm-filter.c
+++ b/lib/uninorm/uninorm-filter.c
@@ -27,7 +27,7 @@
 
 #include "unictype.h"
 #include "normalize-internal.h"
-#include "decompose-internal.h"
+#include "uninorm/decompose-internal.h"
 
 
 struct uninorm_filter