diff -r 99a34860c105 -r d938228c382e src/server/daemon/httprequest.h
--- a/src/server/daemon/httprequest.h	Wed Nov 02 19:19:01 2022 +0100
+++ b/src/server/daemon/httprequest.h	Sun Nov 06 15:53:32 2022 +0100
@@ -29,7 +29,7 @@
 #ifndef HTTPREQUEST_H
 #define	HTTPREQUEST_H
 
-#include <ucx/string.h>
+#include <cx/string.h>
 
 #include "sessionhandler.h"
 #include "../public/nsapi.h"
@@ -47,18 +47,18 @@
 
 struct _http_request {
     Connection     *connection;
-    sstr_t         request_line;
-    sstr_t         method;
-    sstr_t         uri;
-    sstr_t         httpv;
+    cxmutstr         request_line;
+    cxmutstr         method;
+    cxmutstr         uri;
+    cxmutstr         httpv;
     HeaderArray    *headers;
     netbuf         *netbuf;
     time_t         req_start;
 };
 
 struct _header {
-    sstr_t name;
-    sstr_t value;
+    cxmutstr name;
+    cxmutstr value;
 };
 
 struct _header_array {
@@ -71,7 +71,7 @@
 void http_request_init(HTTPRequest *req);
 void http_request_cleanup(HTTPRequest *req);
 
-sstr_t http_request_get_abspath(HTTPRequest *req);
+cxmutstr http_request_get_abspath(HTTPRequest *req);
 
 
 NSAPISession* nsapisession_create(pool_handle_t *pool);
@@ -87,7 +87,7 @@
 
 
 
-void header_add(HeaderArray *hd, sstr_t name, sstr_t value);
+void header_add(HeaderArray *hd, cxmutstr name, cxmutstr value);
 void header_array_free(HeaderArray *hd);
 
 int nsapi_handle_request(NSAPISession *sn, NSAPIRequest *rq);
@@ -132,7 +132,7 @@
         char *path);
 
 int method_match(char *cmp, char *method);
-int contenttype_match(sstr_t cmp, sstr_t ctype);
+int contenttype_match(cxstring cmp, cxstring ctype);
 
 /* request.h functions */
 int request_initialize(