diff -r 99a34860c105 -r d938228c382e src/server/util/util.h
--- a/src/server/util/util.h	Wed Nov 02 19:19:01 2022 +0100
+++ b/src/server/util/util.h	Sun Nov 06 15:53:32 2022 +0100
@@ -35,7 +35,7 @@
 #define BASE_UTIL_H
 
 #include "../daemon/netsite.h"
-#include <ucx/string.h>
+#include <cx/string.h>
 #include "pool.h"
 
 #ifdef XP_UNIX
@@ -202,7 +202,7 @@
 NSAPI_PUBLIC PRBool INTutil_format_http_version(const char *v, int *protv_num, char *buffer, int size);
 
 NSAPI_PUBLIC int INTutil_getboolean(const char *v, int def);
-int util_getboolean_s(scstr_t s, int def);
+int util_getboolean_s(cxstring s, int def);
 
 // new
 NSAPI_PUBLIC int util_strtoint(const char *str, int64_t *value);
@@ -241,16 +241,14 @@
 
 /* path utils */
 NSAPI_PUBLIC
-sstr_t util_path_append(pool_handle_t *pool, char *path, char *child);
+cxmutstr util_path_append(pool_handle_t *pool, char *path, char *child);
 NSAPI_PUBLIC
-sstr_t util_path_remove_last(sstr_t path);
+cxmutstr util_path_remove_last(cxmutstr path);
 NSAPI_PUBLIC
-void util_add_ppath(sstr_t root, sstr_t path, pblock *vars);
+void util_add_ppath(cxmutstr root, cxmutstr path, pblock *vars);
 
-/* ucx utils */
-UcxAllocator util_pool_allocator(pool_handle_t *pool);
 
-int util_isdate(char *str);
+int util_isdate(const char *str);
 
 /* --- End common function prototypes --- */