#undef LOCAL_DEBUG
-#include "sherlock/sherlock.h"
-#include "sherlock/xml/xml.h"
-#include "sherlock/xml/dtd.h"
-#include "sherlock/xml/internals.h"
-#include "ucw/unicode.h"
-#include "ucw/ff-unicode.h"
-#include "charset/charconv.h"
-#include "charset/fb-charconv.h"
+#include <ucw/lib.h>
+#include <shxml/xml.h>
+#include <shxml/dtd.h>
+#include <shxml/internals.h>
+#include <ucw/unicode.h>
+#include <ucw/ff-unicode.h>
+#include <charset/charconv.h>
+#include <charset/fb-charconv.h>
/*** Charecter categorization ***/
-#include "obj/sherlock/xml/unicat.c"
+#include "obj/shxml/unicat.c"
static void
xml_init_cats(struct xml_context *ctx)