diff -r 99a34860c105 -r d938228c382e src/server/plugins/postgresql/config.h
--- a/src/server/plugins/postgresql/config.h	Wed Nov 02 19:19:01 2022 +0100
+++ b/src/server/plugins/postgresql/config.h	Sun Nov 06 15:53:32 2022 +0100
@@ -40,7 +40,10 @@
 
 #include <libpq-fe.h>
 
-#include <ucx/string.h>
+#include <cx/string.h>
+#include <cx/linked_list.h>
+#include <cx/hash_map.h>
+#include <cx/compare.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -53,10 +56,10 @@
     
 typedef struct PgRepository {
     int64_t root_resource_id;
-    sstr_t resourcepool;
+    cxmutstr resourcepool;
     PgExtTable *tables;
     size_t ntables;
-    UcxMap *prop_ext;
+    CxMap *prop_ext;
 } PgRepository;
 
 typedef struct {
@@ -67,8 +70,8 @@
 } PgPropertyStoreExt;
 
 typedef struct {
-    UcxMap *table_lookup;
-    UcxList *tables;
+    CxMap *table_lookup;
+    CxList *tables;
 } PgExtParser;
 
 int pg_lookup_root(ResourceData *res, const char *rootnode, int64_t *rootid);