diff -r 99a34860c105 -r d938228c382e src/server/util/strbuf.c
--- a/src/server/util/strbuf.c	Wed Nov 02 19:19:01 2022 +0100
+++ b/src/server/util/strbuf.c	Sun Nov 06 15:53:32 2022 +0100
@@ -30,7 +30,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <ucx/string.h>
+#include <cx/string.h>
 
 #include "strbuf.h"
 
@@ -47,14 +47,14 @@
 }
 
 void sbuf_puts(sbuf_t *buf, char *str) {
-    sbuf_append(buf, sstr(str));
+    sbuf_append(buf, cx_str(str));
 }
 
 void sbuf_put(sbuf_t *buf, char chr) {
-    sbuf_append(buf, sstrn(&chr, 1));
+    sbuf_append(buf, (cxstring){&chr, 1});
 }
 
-void sbuf_append(sbuf_t *buf, sstr_t str) {
+void sbuf_append(sbuf_t *buf, cxstring str) {
     if (buf->length + str.length >= buf->size) {
         buf->size *= 2;
         buf->ptr = realloc(buf->ptr, buf->size);