From: Martin Mares <mj@ucw.cz>
Date: Mon, 14 Jul 2008 20:23:08 +0000 (+0200)
Subject: The big move. Step #2: Updated all other references to lib/.
X-Git-Tag: holmes-import~395
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=6653d0a752dd937152fa66f1725fab42edc25b8a;p=libucw.git

The big move. Step #2: Updated all other references to lib/.
---

diff --git a/charset/charconv.c b/charset/charconv.c
index 54dac42b..bf431dd1 100644
--- a/charset/charconv.c
+++ b/charset/charconv.c
@@ -8,9 +8,9 @@
  *	of the GNU Lesser General Public License.
  */
 
-#include "lib/lib.h"
-#include "lib/unicode.h"
-#include "lib/unaligned.h"
+#include "ucw/lib.h"
+#include "ucw/unicode.h"
+#include "ucw/unaligned.h"
 #include "charset/charconv.h"
 #include "charset/chartable.h"
 
diff --git a/charset/fb-charconv.c b/charset/fb-charconv.c
index 1d460051..c119a1be 100644
--- a/charset/fb-charconv.c
+++ b/charset/fb-charconv.c
@@ -7,8 +7,8 @@
  *	of the GNU Lesser General Public License.
  */
 
-#include "lib/lib.h"
-#include "lib/fastbuf.h"
+#include "ucw/lib.h"
+#include "ucw/fastbuf.h"
 #include "charset/charconv.h"
 #include "charset/fb-charconv.h"
 
diff --git a/charset/mp-charconv.c b/charset/mp-charconv.c
index 7c18d40f..ac604495 100644
--- a/charset/mp-charconv.c
+++ b/charset/mp-charconv.c
@@ -7,7 +7,7 @@
  *	of the GNU Lesser General Public License.
  */
 
-#include "lib/lib.h"
+#include "ucw/lib.h"
 #include "charset/mp-charconv.h"
 #include <string.h>
 #include <alloca.h>
diff --git a/charset/mp-charconv.h b/charset/mp-charconv.h
index ab6f65d9..97604983 100644
--- a/charset/mp-charconv.h
+++ b/charset/mp-charconv.h
@@ -10,7 +10,7 @@
 #ifndef _CHARSET_MP_CHARCONV_H
 #define _CHARSET_MP_CHARCONV_H
 
-#include "lib/mempool.h"
+#include "ucw/mempool.h"
 #include "charset/charconv.h"
 
 byte *mp_strconv(struct mempool *mp, const byte *s, uns cs_in, uns cs_out);
diff --git a/charset/setnames.c b/charset/setnames.c
index ff723ec2..ac99fbd7 100644
--- a/charset/setnames.c
+++ b/charset/setnames.c
@@ -8,7 +8,7 @@
  *	of the GNU General Public License.
  */
 
-#include "lib/lib.h"
+#include "ucw/lib.h"
 #include "charset/charconv.h"
 
 #include <string.h>
diff --git a/charset/stk-charconv.c b/charset/stk-charconv.c
index a40a7edb..853bd9db 100644
--- a/charset/stk-charconv.c
+++ b/charset/stk-charconv.c
@@ -7,7 +7,7 @@
  *	of the GNU Lesser General Public License.
  */
 
-#include "lib/lib.h"
+#include "ucw/lib.h"
 #include "charset/stk-charconv.h"
 #include <string.h>
 
diff --git a/charset/tocat.c b/charset/tocat.c
index 583c31dd..77f49d15 100644
--- a/charset/tocat.c
+++ b/charset/tocat.c
@@ -7,6 +7,6 @@
  *	of the GNU Lesser General Public License.
  */
 
-#include "lib/lib.h"
+#include "ucw/lib.h"
 #include "charset/unicat.h"
 #include "charset/U-cat.h"
diff --git a/charset/toligatures.c b/charset/toligatures.c
index 5fc9d075..f12c572d 100644
--- a/charset/toligatures.c
+++ b/charset/toligatures.c
@@ -7,7 +7,7 @@
  *	of the GNU Lesser General Public License.
  */
 
-#include "lib/lib.h"
+#include "ucw/lib.h"
 #include "charset/unicat.h"
 #include "charset/U-ligatures.h"
 
diff --git a/charset/tolower.c b/charset/tolower.c
index 189c3151..9c975044 100644
--- a/charset/tolower.c
+++ b/charset/tolower.c
@@ -7,6 +7,6 @@
  *	of the GNU Lesser General Public License.
  */
 
-#include "lib/lib.h"
+#include "ucw/lib.h"
 #include "charset/unicat.h"
 #include "charset/U-lower.h"
diff --git a/charset/toupper.c b/charset/toupper.c
index 61301d90..5691d4e0 100644
--- a/charset/toupper.c
+++ b/charset/toupper.c
@@ -7,6 +7,6 @@
  *	of the GNU Lesser General Public License.
  */
 
-#include "lib/lib.h"
+#include "ucw/lib.h"
 #include "charset/unicat.h"
 #include "charset/U-upper.h"
diff --git a/charset/unaccent.c b/charset/unaccent.c
index a5083e91..9f7f79dc 100644
--- a/charset/unaccent.c
+++ b/charset/unaccent.c
@@ -7,6 +7,6 @@
  *	of the GNU Lesser General Public License.
  */
 
-#include "lib/lib.h"
+#include "ucw/lib.h"
 #include "charset/unicat.h"
 #include "charset/U-unacc.h"
diff --git a/debug/sorter/radix-asio-test.c b/debug/sorter/radix-asio-test.c
index 7858985d..f288c3be 100644
--- a/debug/sorter/radix-asio-test.c
+++ b/debug/sorter/radix-asio-test.c
@@ -4,10 +4,10 @@
  *  (c) 2007 Martin Mares <mj@ucw.cz>
  */
 
-#include "lib/lib.h"
-#include "lib/conf.h"
-#include "lib/lfs.h"
-#include "lib/asio.h"
+#include "ucw/lib.h"
+#include "ucw/conf.h"
+#include "ucw/lfs.h"
+#include "ucw/asio.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/debug/sorter/radix-file-test.c b/debug/sorter/radix-file-test.c
index d2cd386f..6d9de8eb 100644
--- a/debug/sorter/radix-file-test.c
+++ b/debug/sorter/radix-file-test.c
@@ -4,9 +4,9 @@
  *  (c) 2007 Martin Mares <mj@ucw.cz>
  */
 
-#include "lib/lib.h"
-#include "lib/conf.h"
-#include "lib/lfs.h"
+#include "ucw/lib.h"
+#include "ucw/conf.h"
+#include "ucw/lfs.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/debug/sorter/radix-tune-bits.sh b/debug/sorter/radix-tune-bits.sh
index b835a8e7..dbaa49c1 100644
--- a/debug/sorter/radix-tune-bits.sh
+++ b/debug/sorter/radix-tune-bits.sh
@@ -7,7 +7,7 @@ UCW_PROGNAME="$0"
 
 # Path to Sherlock build directory
 [ -n "$BUILD" ] || BUILD=..
-[ -f "$BUILD/lib/sorter/sorter.h" ] || die "BUILD does not point to Sherlock build directory"
+[ -f "$BUILD/ucw/sorter/sorter.h" ] || die "BUILD does not point to Sherlock build directory"
 
 # Find out sort buffer size
 parse-config 'Sorter{##SortBuffer}'
@@ -31,19 +31,19 @@ TESTS="2,5,8,15"
 # Check various bit widths of the radix sorter
 rm -f tmp/radix-*
 for W in $WIDTHS ; do
-	rm -f $BUILD/obj/lib/sorter/sort-test{,.o}
+	rm -f $BUILD/obj/ucw/sorter/sort-test{,.o}
 	if [ $W = 0 ] ; then
 		log "Compiling with no radix splits"
-		( cd $BUILD && make obj/lib/sorter/sort-test )
+		( cd $BUILD && make obj/ucw/sorter/sort-test )
 		OPT="-d32"
 	else
 		log "Compiling with $W-bit radix splits"
-		( cd $BUILD && make CEXTRA="-DFORCE_RADIX_BITS=$W" obj/lib/sorter/sort-test )
+		( cd $BUILD && make CEXTRA="-DFORCE_RADIX_BITS=$W" obj/ucw/sorter/sort-test )
 		OPT=
 	fi
 	for THR in $THRS ; do
 		log "Testing with RadixThreshold=$THR"
-		$BUILD/obj/lib/sorter/sort-test -SThreads.DefaultStackSize=2M -SSorter.RadixThreshold=$THR -s$SIZE -t$TESTS $OPT -v 2>&1 | tee -a tmp/radix-$W
+		$BUILD/obj/ucw/sorter/sort-test -SThreads.DefaultStackSize=2M -SSorter.RadixThreshold=$THR -s$SIZE -t$TESTS $OPT -v 2>&1 | tee -a tmp/radix-$W
 	done
 done
 
diff --git a/debug/sorter/radix-tune-thresh.sh b/debug/sorter/radix-tune-thresh.sh
index 1c75ed58..71d929b3 100644
--- a/debug/sorter/radix-tune-thresh.sh
+++ b/debug/sorter/radix-tune-thresh.sh
@@ -7,7 +7,7 @@ UCW_PROGNAME="$0"
 
 # Path to Sherlock build directory
 [ -n "$BUILD" ] || BUILD=..
-[ -f "$BUILD/lib/sorter/sorter.h" ] || die "BUILD does not point to Sherlock build directory"
+[ -f "$BUILD/ucw/sorter/sorter.h" ] || die "BUILD does not point to Sherlock build directory"
 
 # Find out sort buffer size
 parse-config 'Sorter{##SortBuffer}'
@@ -43,7 +43,7 @@ while [ $SIZE -gt 262144 ] ; do
 	echo $SIZE >>tmp/radix-sizes
 	for T in $THRS ; do
 		log "Trying size $SIZE with threshold $T"
-		$BUILD/obj/lib/sorter/sort-test -SSorter.RadixThreshold=$T -s$SIZE -t$TEST -v 2>&1 | tee -a tmp/radix-$T
+		$BUILD/obj/ucw/sorter/sort-test -SSorter.RadixThreshold=$T -s$SIZE -t$TEST -v 2>&1 | tee -a tmp/radix-$T
 	done
 	SIZE=$(($SIZE/2))
 done
diff --git a/debug/sorter/retros.c b/debug/sorter/retros.c
index e85dfe85..073cd8b0 100644
--- a/debug/sorter/retros.c
+++ b/debug/sorter/retros.c
@@ -5,8 +5,8 @@
  */
 
 #include "sherlock/sherlock.h"
-#include "lib/getopt.h"
-#include "lib/md5.h"
+#include "ucw/getopt.h"
+#include "ucw/md5.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -50,13 +50,13 @@ static int comp_ind(const void *x, const void *y)
 #define ASORT_ELT(i) a[i].key
 #define ASORT_SWAP(i,j) do { struct elt t=a[i]; a[i]=a[j]; a[j]=t; } while (0)
 #define ASORT_EXTRA_ARGS , struct elt *a
-#include "lib/arraysort.h"
+#include "ucw/arraysort.h"
 
 #define ASORT_PREFIX(x) asi_##x
 #define ASORT_KEY_TYPE u32
 #define ASORT_ELT(i) ind[i]->key
 #define ASORT_SWAP(i,j) do { struct elt *t=ind[i]; ind[i]=ind[j]; ind[j]=t; } while (0)
-#include "lib/arraysort.h"
+#include "ucw/arraysort.h"
 
 static void r1_sort(void)
 {
diff --git a/free/libs/Makefile b/free/libs/Makefile
index a9ec173d..4c55eb9b 100644
--- a/free/libs/Makefile
+++ b/free/libs/Makefile
@@ -21,7 +21,7 @@ LIBCHARSET=$(o)/charset/libcharset.pc
 LIBSH=$(o)/sherlock/libsh.pc
 
 # Include makefiles of libraries we wish to use
-include $(s)/lib/Makefile
+include $(s)/ucw/Makefile
 include $(s)/charset/Makefile
 include $(s)/sherlock/Makefile
 
diff --git a/free/libs/configure b/free/libs/configure
index be2aee08..3934fef4 100755
--- a/free/libs/configure
+++ b/free/libs/configure
@@ -7,7 +7,7 @@ use strict;
 
 our $srcdir;
 BEGIN {
-	my $pkgfile = "lib/wildmatch.c";
+	my $pkgfile = "ucw/wildmatch.c";
 	if (!defined ($srcdir = $ENV{"SRCDIR"})) {
 		if (-f $pkgfile) {
 			$srcdir=".";
@@ -17,15 +17,15 @@ BEGIN {
 			die "Don't know how to find myself. Please set SRCDIR manually.";
 		}
 	}
-	require "$srcdir/lib/perl/Configure.pm";
+	require "$srcdir/ucw/perl/Configure.pm";
 	UCW::Configure::import UCW::Configure;
 }
 
 Init($srcdir, "default.cfg");
-Include "lib/default.cfg";
+Include "ucw/default.cfg";
 Log "### Configuring Sherlock Libraries " . Get("SHERLOCK_VERSION") . " with configuration " . Get("CONFIG") . "\n";
 Include Get("CONFIG");
-Include "lib/autoconf.cfg";
+Include "ucw/autoconf.cfg";
 Finish();
 
 Log "\nConfigured, run `make' to build everything.\n";
diff --git a/free/libs/examples/external/test.c b/free/libs/examples/external/test.c
index 2a03b291..5c88e2f1 100644
--- a/free/libs/examples/external/test.c
+++ b/free/libs/examples/external/test.c
@@ -1,4 +1,4 @@
-#include "lib/lib.h"
+#include "ucw/lib.h"
 
 int main(void)
 {
diff --git a/free/libs/examples/internal/Makefile b/free/libs/examples/internal/Makefile
index 628fe148..13286e53 100644
--- a/free/libs/examples/internal/Makefile
+++ b/free/libs/examples/internal/Makefile
@@ -19,7 +19,7 @@ LIBCHARSET=$(o)/charset/libcharset.pc
 LIBIMAGES=$(o)/images/libimages.pc
 
 # Include makefiles of libraries we wish to use
-include $(s)/lib/Makefile
+include $(s)/ucw/Makefile
 include $(s)/charset/Makefile
 include $(s)/lang/Makefile
 include $(s)/images/Makefile
diff --git a/free/libs/examples/internal/configure b/free/libs/examples/internal/configure
index e4b5f100..1e93b7ea 100755
--- a/free/libs/examples/internal/configure
+++ b/free/libs/examples/internal/configure
@@ -7,7 +7,7 @@ use strict;
 
 our $srcdir;
 BEGIN {
-	my $pkgfile = "lib/wildmatch.c";
+	my $pkgfile = "ucw/wildmatch.c";
 	if (!defined ($srcdir = $ENV{"SRCDIR"})) {
 		if (-f $pkgfile) {
 			$srcdir=".";
@@ -17,15 +17,15 @@ BEGIN {
 			die "Don't know how to find myself. Please set SRCDIR manually.";
 		}
 	}
-	require "$srcdir/lib/perl/Configure.pm";
+	require "$srcdir/ucw/perl/Configure.pm";
 	UCW::Configure::import UCW::Configure;
 }
 
 Init($srcdir, "default.cfg");
-Include "lib/default.cfg";
+Include "ucw/default.cfg";
 Log "### Configuring TestApp ###\n\n";
 Include Get("CONFIG");
-Include "lib/autoconf.cfg";
+Include "ucw/autoconf.cfg";
 Finish();
 
 Log "\nConfigured, run `make' to build everything.\n";
diff --git a/free/libs/examples/internal/test.c b/free/libs/examples/internal/test.c
index 2a03b291..5c88e2f1 100644
--- a/free/libs/examples/internal/test.c
+++ b/free/libs/examples/internal/test.c
@@ -1,4 +1,4 @@
-#include "lib/lib.h"
+#include "ucw/lib.h"
 
 int main(void)
 {
diff --git a/images/color-tool.c b/images/color-tool.c
index 112f7386..1a59d2f9 100644
--- a/images/color-tool.c
+++ b/images/color-tool.c
@@ -7,7 +7,7 @@
  *	of the GNU General Public License.
  */
 
-#include "lib/lib.h"
+#include "ucw/lib.h"
 #include "images/images.h"
 #include "images/color.h"
 
diff --git a/images/color.c b/images/color.c
index 041f90b3..0a9da8c4 100644
--- a/images/color.c
+++ b/images/color.c
@@ -9,7 +9,7 @@
 
 #undef LOCAL_DEBUG
 
-#include "lib/lib.h"
+#include "ucw/lib.h"
 #include "images/images.h"
 #include "images/color.h"
 #include "images/error.h"
diff --git a/images/config.c b/images/config.c
index 8ece456d..c3a5855e 100644
--- a/images/config.c
+++ b/images/config.c
@@ -6,8 +6,8 @@
 
 #undef LOCAL_DEBUG
 
-#include "lib/lib.h"
-#include "lib/conf.h"
+#include "ucw/lib.h"
+#include "ucw/conf.h"
 #include "images/images.h"
 #if defined(CONFIG_IMAGES_SIM) || defined(CONFIG_IMAGES_DUP)
 #include "images/signature.h"
diff --git a/images/context.c b/images/context.c
index baebb9b8..13ce4b8c 100644
--- a/images/context.c
+++ b/images/context.c
@@ -9,8 +9,8 @@
 
 #undef LOCAL_DEBUG
 
-#include "lib/lib.h"
-#include "lib/bbuf.h"
+#include "ucw/lib.h"
+#include "ucw/bbuf.h"
 #include "images/images.h"
 #include "images/error.h"
 
diff --git a/images/dup-cmp.c b/images/dup-cmp.c
index b71feaef..e16f0634 100644
--- a/images/dup-cmp.c
+++ b/images/dup-cmp.c
@@ -9,9 +9,9 @@
 
 #undef LOCAL_DEBUG
 
-#include "lib/lib.h"
-#include "lib/mempool.h"
-#include "lib/fastbuf.h"
+#include "ucw/lib.h"
+#include "ucw/mempool.h"
+#include "ucw/fastbuf.h"
 #include "images/images.h"
 #include "images/duplicates.h"
 
diff --git a/images/dup-init.c b/images/dup-init.c
index ea886d09..4900af51 100644
--- a/images/dup-init.c
+++ b/images/dup-init.c
@@ -9,9 +9,9 @@
 
 #undef LOCAL_DEBUG
 
-#include "lib/lib.h"
-#include "lib/mempool.h"
-#include "lib/fastbuf.h"
+#include "ucw/lib.h"
+#include "ucw/mempool.h"
+#include "ucw/fastbuf.h"
 #include "images/images.h"
 #include "images/color.h"
 #include "images/duplicates.h"
diff --git a/images/image-dup-test.c b/images/image-dup-test.c
index 93fde378..7e1916cb 100644
--- a/images/image-dup-test.c
+++ b/images/image-dup-test.c
@@ -7,10 +7,10 @@
  *	of the GNU General Public License.
  */
 
-#include "lib/lib.h"
-#include "lib/getopt.h"
-#include "lib/fastbuf.h"
-#include "lib/mempool.h"
+#include "ucw/lib.h"
+#include "ucw/getopt.h"
+#include "ucw/fastbuf.h"
+#include "ucw/mempool.h"
 #include "images/images.h"
 #include "images/color.h"
 #include "images/duplicates.h"
diff --git a/images/image-sim-test.c b/images/image-sim-test.c
index 52309bdb..ed43e0f2 100644
--- a/images/image-sim-test.c
+++ b/images/image-sim-test.c
@@ -7,11 +7,11 @@
  *	of the GNU General Public License.
  */
 
-#include "lib/lib.h"
-#include "lib/getopt.h"
-#include "lib/fastbuf.h"
-#include "lib/base64.h"
-#include "lib/base224.h"
+#include "ucw/lib.h"
+#include "ucw/getopt.h"
+#include "ucw/fastbuf.h"
+#include "ucw/base64.h"
+#include "ucw/base224.h"
 #include "images/images.h"
 #include "images/color.h"
 #include "images/signature.h"
diff --git a/images/image-test.c b/images/image-test.c
index 889e85e5..4bf02b39 100644
--- a/images/image-test.c
+++ b/images/image-test.c
@@ -9,10 +9,10 @@
 
 #undef LOCAL_DEBUG
 
-#include "lib/lib.h"
-#include "lib/mempool.h"
-#include "lib/fastbuf.h"
-#include "lib/threads.h"
+#include "ucw/lib.h"
+#include "ucw/mempool.h"
+#include "ucw/fastbuf.h"
+#include "ucw/threads.h"
 #include "images/images.h"
 #include "images/color.h"
 
diff --git a/images/image-tool.c b/images/image-tool.c
index b211f196..1984906e 100644
--- a/images/image-tool.c
+++ b/images/image-tool.c
@@ -7,8 +7,8 @@
  *	of the GNU General Public License.
  */
 
-#include "lib/lib.h"
-#include "lib/fastbuf.h"
+#include "ucw/lib.h"
+#include "ucw/fastbuf.h"
 #include "images/images.h"
 #include "images/color.h"
 
diff --git a/images/image.c b/images/image.c
index 058b173e..c741d396 100644
--- a/images/image.c
+++ b/images/image.c
@@ -9,8 +9,8 @@
 
 #undef LOCAL_DEBUG
 
-#include "lib/lib.h"
-#include "lib/mempool.h"
+#include "ucw/lib.h"
+#include "ucw/mempool.h"
 #include "images/images.h"
 #include "images/error.h"
 #include "images/color.h"
diff --git a/images/images.h b/images/images.h
index 34ba1ad9..d555ce52 100644
--- a/images/images.h
+++ b/images/images.h
@@ -10,7 +10,7 @@
 #ifndef _IMAGES_IMAGES_H
 #define _IMAGES_IMAGES_H
 
-#include "lib/bbuf.h"
+#include "ucw/bbuf.h"
 
 struct mempool;
 struct fastbuf;
diff --git a/images/io-libjpeg.c b/images/io-libjpeg.c
index be394c95..16f10b7a 100644
--- a/images/io-libjpeg.c
+++ b/images/io-libjpeg.c
@@ -9,9 +9,9 @@
 
 #undef LOCAL_DEBUG
 
-#include "lib/lib.h"
-#include "lib/mempool.h"
-#include "lib/fastbuf.h"
+#include "ucw/lib.h"
+#include "ucw/mempool.h"
+#include "ucw/fastbuf.h"
 #include "images/images.h"
 #include "images/error.h"
 #include "images/color.h"
diff --git a/images/io-libmagick.c b/images/io-libmagick.c
index 60d36159..1a636b2a 100644
--- a/images/io-libmagick.c
+++ b/images/io-libmagick.c
@@ -9,9 +9,9 @@
 
 #undef LOCAL_DEBUG
 
-#include "lib/lib.h"
-#include "lib/mempool.h"
-#include "lib/fastbuf.h"
+#include "ucw/lib.h"
+#include "ucw/mempool.h"
+#include "ucw/fastbuf.h"
 #include "images/images.h"
 #include "images/error.h"
 #include "images/color.h"
diff --git a/images/io-libpng.c b/images/io-libpng.c
index afec24a0..081ca35f 100644
--- a/images/io-libpng.c
+++ b/images/io-libpng.c
@@ -9,9 +9,9 @@
 
 #undef LOCAL_DEBUG
 
-#include "lib/lib.h"
-#include "lib/mempool.h"
-#include "lib/fastbuf.h"
+#include "ucw/lib.h"
+#include "ucw/mempool.h"
+#include "ucw/fastbuf.h"
 #include "images/images.h"
 #include "images/error.h"
 #include "images/color.h"
diff --git a/images/io-libungif.c b/images/io-libungif.c
index c20c9f58..ac0f51f2 100644
--- a/images/io-libungif.c
+++ b/images/io-libungif.c
@@ -9,9 +9,9 @@
 
 #undef LOCAL_DEBUG
 
-#include "lib/lib.h"
-#include "lib/mempool.h"
-#include "lib/fastbuf.h"
+#include "ucw/lib.h"
+#include "ucw/mempool.h"
+#include "ucw/fastbuf.h"
 #include "images/images.h"
 #include "images/error.h"
 #include "images/color.h"
diff --git a/images/io-main.c b/images/io-main.c
index f69b8b6c..c2975842 100644
--- a/images/io-main.c
+++ b/images/io-main.c
@@ -9,8 +9,8 @@
 
 #undef LOCAL_DEBUG
 
-#include "lib/lib.h"
-#include "lib/mempool.h"
+#include "ucw/lib.h"
+#include "ucw/mempool.h"
 #include "images/images.h"
 #include "images/error.h"
 #include "images/io-main.h"
diff --git a/images/math.c b/images/math.c
index f88daa60..393fed0f 100644
--- a/images/math.c
+++ b/images/math.c
@@ -7,7 +7,7 @@
  *	of the GNU General Public License.
  */
 
-#include "lib/lib.h"
+#include "ucw/lib.h"
 #include "images/math.h"
 
 const u32 fast_div_tab[] = {
diff --git a/images/object.c b/images/object.c
index 7138aa95..9133b7e6 100644
--- a/images/object.c
+++ b/images/object.c
@@ -9,9 +9,9 @@
 #undef LOCAL_DEBUG
 
 #include "sherlock/sherlock.h"
-#include "lib/base224.h"
-#include "lib/mempool.h"
-#include "lib/fastbuf.h"
+#include "ucw/base224.h"
+#include "ucw/mempool.h"
+#include "ucw/fastbuf.h"
 #include "sherlock/object.h"
 #include "images/images.h"
 #include "images/object.h"
diff --git a/images/scale.c b/images/scale.c
index 6be72ca2..41fda01d 100644
--- a/images/scale.c
+++ b/images/scale.c
@@ -9,7 +9,7 @@
 
 #undef LOCAL_DEBUG
 
-#include "lib/lib.h"
+#include "ucw/lib.h"
 #include "images/images.h"
 #include "images/error.h"
 #include "images/math.h"
diff --git a/images/sig-cmp.c b/images/sig-cmp.c
index c663c2b3..028e1b6a 100644
--- a/images/sig-cmp.c
+++ b/images/sig-cmp.c
@@ -9,7 +9,7 @@
 
 #undef LOCAL_DEBUG
 
-#include "lib/lib.h"
+#include "ucw/lib.h"
 #include "images/math.h"
 #include "images/images.h"
 #include "images/signature.h"
@@ -20,7 +20,7 @@
 #define ASORT_KEY_TYPE uns
 #define ASORT_ELT(i) items[i]
 #define ASORT_EXTRA_ARGS , uns *items
-#include "lib/arraysort.h"
+#include "ucw/arraysort.h"
 
 #define EXPLAIN
 #include "images/sig-cmp-gen.h"
diff --git a/images/sig-dump.c b/images/sig-dump.c
index a150f612..4a7bdf2a 100644
--- a/images/sig-dump.c
+++ b/images/sig-dump.c
@@ -7,7 +7,7 @@
  *	of the GNU Lesser General Public License.
  */
 
-#include "lib/lib.h"
+#include "ucw/lib.h"
 #include "images/images.h"
 #include "images/signature.h"
 #include <stdio.h>
diff --git a/images/sig-init.c b/images/sig-init.c
index 60b53350..34089216 100644
--- a/images/sig-init.c
+++ b/images/sig-init.c
@@ -9,9 +9,9 @@
 
 #undef LOCAL_DEBUG
 
-#include "lib/lib.h"
-#include "lib/fastbuf.h"
-#include "lib/conf.h"
+#include "ucw/lib.h"
+#include "ucw/fastbuf.h"
+#include "ucw/conf.h"
 #include "images/images.h"
 #include "images/math.h"
 #include "images/error.h"
diff --git a/images/sig-seg.c b/images/sig-seg.c
index 8deeca91..b82c6ccd 100644
--- a/images/sig-seg.c
+++ b/images/sig-seg.c
@@ -9,9 +9,9 @@
 
 #undef LOCAL_DEBUG
 
-#include "lib/lib.h"
-#include "lib/conf.h"
-#include "lib/heap.h"
+#include "ucw/lib.h"
+#include "ucw/conf.h"
+#include "ucw/heap.h"
 #include "images/images.h"
 #include "images/signature.h"
 #include "images/math.h"
@@ -95,7 +95,7 @@ prequant_heap_cmp(struct image_sig_region *a, struct image_sig_region *b)
 #define ASORT_KEY_TYPE uns
 #define ASORT_ELT(i) val[i]
 #define ASORT_EXTRA_ARGS , uns *val
-#include "lib/arraysort.h"
+#include "ucw/arraysort.h"
 
 static uns
 prequant(struct image_sig_block *blocks, uns blocks_count, struct image_sig_region *regions)
diff --git a/images/sig-txt.c b/images/sig-txt.c
index 1e2a9cd3..2e20f071 100644
--- a/images/sig-txt.c
+++ b/images/sig-txt.c
@@ -9,7 +9,7 @@
 
 #undef LOCAL_DEBUG
 
-#include "lib/lib.h"
+#include "ucw/lib.h"
 #include "images/images.h"
 #include "images/signature.h"
 #include "images/math.h"
diff --git a/sherlock/xml/common.c b/sherlock/xml/common.c
index aca34353..6bb2737f 100644
--- a/sherlock/xml/common.c
+++ b/sherlock/xml/common.c
@@ -13,8 +13,8 @@
 #include "sherlock/xml/xml.h"
 #include "sherlock/xml/dtd.h"
 #include "sherlock/xml/internals.h"
-#include "lib/stkstring.h"
-#include "lib/ff-unicode.h"
+#include "ucw/stkstring.h"
+#include "ucw/ff-unicode.h"
 
 #include <setjmp.h>
 
diff --git a/sherlock/xml/dtd.c b/sherlock/xml/dtd.c
index 8c50a532..67cb7ccc 100644
--- a/sherlock/xml/dtd.c
+++ b/sherlock/xml/dtd.c
@@ -13,9 +13,9 @@
 #include "sherlock/xml/xml.h"
 #include "sherlock/xml/dtd.h"
 #include "sherlock/xml/internals.h"
-#include "lib/fastbuf.h"
-#include "lib/ff-unicode.h"
-#include "lib/unicode.h"
+#include "ucw/fastbuf.h"
+#include "ucw/ff-unicode.h"
+#include "ucw/unicode.h"
 
 /* Notations */
 
@@ -29,7 +29,7 @@
 #define HASH_GIVE_ALLOC
 #define HASH_TABLE_ALLOC
 XML_HASH_GIVE_ALLOC
-#include "lib/hashtable.h"
+#include "ucw/hashtable.h"
 
 struct xml_dtd_notn *
 xml_dtd_find_notn(struct xml_context *ctx, char *name)
@@ -51,7 +51,7 @@ xml_dtd_find_notn(struct xml_context *ctx, char *name)
 #define HASH_GIVE_ALLOC
 #define HASH_TABLE_ALLOC
 XML_HASH_GIVE_ALLOC
-#include "lib/hashtable.h"
+#include "ucw/hashtable.h"
 
 static struct xml_dtd_entity *
 xml_dtd_declare_trivial_entity(struct xml_context *ctx, char *name, char *text)
@@ -155,7 +155,7 @@ xml_dtd_elems_init_data(struct xml_dtd_elems_table *tab UNUSED, struct xml_dtd_e
 #define HASH_GIVE_INIT_DATA
 #define HASH_TABLE_ALLOC
 XML_HASH_GIVE_ALLOC
-#include "lib/hashtable.h"
+#include "ucw/hashtable.h"
 
 struct xml_dtd_elem *
 xml_dtd_find_elem(struct xml_context *ctx, char *name)
@@ -200,7 +200,7 @@ xml_dtd_enodes_init_key(struct xml_dtd_enodes_table *tab UNUSED, struct xml_dtd_
 #define HASH_GIVE_ALLOC
 #define HASH_TABLE_ALLOC
 XML_HASH_GIVE_ALLOC
-#include "lib/hashtable.h"
+#include "ucw/hashtable.h"
 
 /* Element attributes */
 
@@ -240,7 +240,7 @@ xml_dtd_attrs_init_key(struct xml_dtd_attrs_table *tab UNUSED, struct xml_dtd_at
 #define HASH_GIVE_ALLOC
 #define HASH_TABLE_ALLOC
 XML_HASH_GIVE_ALLOC
-#include "lib/hashtable.h"
+#include "ucw/hashtable.h"
 
 struct xml_dtd_attr *
 xml_dtd_find_attr(struct xml_context *ctx, struct xml_dtd_elem *elem, char *name)
@@ -284,7 +284,7 @@ xml_dtd_evals_init_key(struct xml_dtd_evals_table *tab UNUSED, struct xml_dtd_ev
 #define HASH_GIVE_ALLOC
 #define HASH_TABLE_ALLOC
 XML_HASH_GIVE_ALLOC
-#include "lib/hashtable.h"
+#include "ucw/hashtable.h"
 
 /* Enumerated attribute notations */
 
@@ -322,7 +322,7 @@ xml_dtd_enotns_init_key(struct xml_dtd_enotns_table *tab UNUSED, struct xml_dtd_
 #define HASH_GIVE_ALLOC
 #define HASH_TABLE_ALLOC
 XML_HASH_GIVE_ALLOC
-#include "lib/hashtable.h"
+#include "ucw/hashtable.h"
 
 /* DTD initialization/cleanup */
 
diff --git a/sherlock/xml/parse.c b/sherlock/xml/parse.c
index 5581ed59..27141b14 100644
--- a/sherlock/xml/parse.c
+++ b/sherlock/xml/parse.c
@@ -13,11 +13,11 @@
 #include "sherlock/xml/xml.h"
 #include "sherlock/xml/dtd.h"
 #include "sherlock/xml/internals.h"
-#include "lib/fastbuf.h"
-#include "lib/ff-unicode.h"
-#include "lib/unicode.h"
-#include "lib/chartype.h"
-#include "lib/hashfunc.h"
+#include "ucw/fastbuf.h"
+#include "ucw/ff-unicode.h"
+#include "ucw/unicode.h"
+#include "ucw/chartype.h"
+#include "ucw/hashfunc.h"
 
 #include <setjmp.h>
 
@@ -622,7 +622,7 @@ xml_attrs_init_key(struct xml_attrs_table *t UNUSED, struct xml_attr *a, struct
 #define HASH_WANT_FIND
 #define HASH_GIVE_ALLOC
 XML_HASH_GIVE_ALLOC
-#include "lib/hashtable.h"
+#include "ucw/hashtable.h"
 
 static void
 xml_parse_attr(struct xml_context *ctx)
diff --git a/sherlock/xml/source.c b/sherlock/xml/source.c
index 3b06f510..29226f0f 100644
--- a/sherlock/xml/source.c
+++ b/sherlock/xml/source.c
@@ -13,8 +13,8 @@
 #include "sherlock/xml/xml.h"
 #include "sherlock/xml/dtd.h"
 #include "sherlock/xml/internals.h"
-#include "lib/unicode.h"
-#include "lib/ff-unicode.h"
+#include "ucw/unicode.h"
+#include "ucw/ff-unicode.h"
 #include "charset/charconv.h"
 #include "charset/fb-charconv.h"
 
diff --git a/sherlock/xml/xml-test.c b/sherlock/xml/xml-test.c
index 0c685d8f..f6738c56 100644
--- a/sherlock/xml/xml-test.c
+++ b/sherlock/xml/xml-test.c
@@ -10,8 +10,8 @@
 #include "sherlock/sherlock.h"
 #include "sherlock/xml/xml.h"
 #include "sherlock/xml/dtd.h"
-#include "lib/getopt.h"
-#include "lib/fastbuf.h"
+#include "ucw/getopt.h"
+#include "ucw/fastbuf.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/sherlock/xml/xml.h b/sherlock/xml/xml.h
index 350fce9a..e9458883 100644
--- a/sherlock/xml/xml.h
+++ b/sherlock/xml/xml.h
@@ -10,10 +10,10 @@
 #ifndef _SHERLOCK_XML_XML_H
 #define _SHERLOCK_XML_XML_H
 
-#include "lib/clists.h"
-#include "lib/slists.h"
-#include "lib/mempool.h"
-#include "lib/fastbuf.h"
+#include "ucw/clists.h"
+#include "ucw/slists.h"
+#include "ucw/mempool.h"
+#include "ucw/fastbuf.h"
 
 struct xml_context;
 struct xml_dtd_entity;