#undef LOCAL_DEBUG
-#include "sherlock/sherlock.h"
-#include "sherlock/xml/xml.h"
-#include "sherlock/xml/dtd.h"
-#include "sherlock/xml/internals.h"
-#include "ucw/fastbuf.h"
-#include "ucw/ff-unicode.h"
-#include "ucw/unicode.h"
+#include <ucw/lib.h>
+#include <shxml/xml.h>
+#include <shxml/dtd.h>
+#include <shxml/internals.h>
+#include <ucw/fastbuf.h>
+#include <ucw/ff-unicode.h>
+#include <ucw/unicode.h>
/* Notations */
#define HASH_GIVE_ALLOC
#define HASH_TABLE_ALLOC
XML_HASH_GIVE_ALLOC
-#include "ucw/hashtable.h"
+#include <ucw/hashtable.h>
struct xml_dtd_notn *
xml_dtd_find_notn(struct xml_context *ctx, char *name)
#define HASH_GIVE_ALLOC
#define HASH_TABLE_ALLOC
XML_HASH_GIVE_ALLOC
-#include "ucw/hashtable.h"
+#include <ucw/hashtable.h>
static struct xml_dtd_entity *
xml_dtd_declare_trivial_entity(struct xml_context *ctx, char *name, char *text)
#define HASH_GIVE_INIT_DATA
#define HASH_TABLE_ALLOC
XML_HASH_GIVE_ALLOC
-#include "ucw/hashtable.h"
+#include <ucw/hashtable.h>
struct xml_dtd_elem *
xml_dtd_find_elem(struct xml_context *ctx, char *name)
#define HASH_GIVE_ALLOC
#define HASH_TABLE_ALLOC
XML_HASH_GIVE_ALLOC
-#include "ucw/hashtable.h"
+#include <ucw/hashtable.h>
/* Element attributes */
#define HASH_GIVE_ALLOC
#define HASH_TABLE_ALLOC
XML_HASH_GIVE_ALLOC
-#include "ucw/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)
#define HASH_GIVE_ALLOC
#define HASH_TABLE_ALLOC
XML_HASH_GIVE_ALLOC
-#include "ucw/hashtable.h"
+#include <ucw/hashtable.h>
/* Enumerated attribute notations */
#define HASH_GIVE_ALLOC
#define HASH_TABLE_ALLOC
XML_HASH_GIVE_ALLOC
-#include "ucw/hashtable.h"
+#include <ucw/hashtable.h>
/* DTD initialization/cleanup */