diff -r 86ebc3745e62 -r 44efaa54d63d src/cx/list.h
--- a/src/cx/list.h	Sun Feb 07 21:26:48 2021 +0100
+++ b/src/cx/list.h	Sun Feb 07 21:29:51 2021 +0100
@@ -43,22 +43,12 @@
     void *listdata;
 } cx_list;
 
-typedef int (*cx_list_add)(cx_list *list, void *elem);
-
-typedef int (*cx_list_insert)(cx_list *list, size_t index, void *elem);
-
-typedef void *(*cx_list_remove)(cx_list *list, size_t index);
-
-typedef size_t (*cx_list_find)(cx_list *list, void *elem);
-
-typedef void *(*cx_list_last)(cx_list *list);
-
 typedef struct {
-    cx_list_add add;
-    cx_list_insert insert;
-    cx_list_remove remove;
-    cx_list_find find;
-    cx_list_last last;
+    int (*add)(cx_list *list, void *elem);
+    int (*insert)(cx_list *list, size_t index, void *elem);
+    void *(*remove)(cx_list *list, size_t index);
+    size_t (*find)(cx_list *list, void *elem);
+    void *(*last)(cx_list *list);
 } cx_list_class;
 
 struct cx_list_s {