Got it to build.

include/list.h

@@ -28,10 +28,41 @@ list_t *list_new(size_t memb_size, size_t capacity);
 void list_free(list_t *list);
 
 /*
- * Adds an element to the end of the list.
+ * Frees a list, calling a function on each element before doing so.
+ * If list is null, no action is taken.
+ * DO NOT pass free as the callback. Use list_elem_free if
+ * you want to do that.
+ */
+void list_free_with(list_t *list, void callback(void *item));
+
+/*
+ * This is a convinience function designed to be used with
+ * list_free_with or list_foreach.
+ * It calls the stdlib free function on each element.
+ * We can't pass in free directly, as each pointer needs to be
+ * dereferenced first.
+ * This should only be used on lists of pointers that were
+ * allocated using malloc (or similar).
+ */
+void list_elem_free(void *item);
+
+/*
+ * Adds an element at the end of the list.
  */
 void list_add(list_t *list, const void *data);
 
+/*
+ * Adds an uninitialized element at the end of the list,
+ * and returns a pointer to it.
+ */
+void *list_alloc(list_t *list);
+
+/*
+ * Deletes the last element of the list.
+ * If the list is empty, no action is taken.
+ */
+void list_remove(list_t *list);
+
 /*
  * Adds an element at an arbitrary position in the list, moving
  * the elements past index to make space.

include/sway/config.h

@@ -344,7 +344,7 @@ char *do_var_replacement(char *str);
 
 struct cmd_results *check_security_config();
 
-int input_identifier_cmp(const void *item, const void *data);
+int input_identifier_cmp(const void *key, const void *item);
 void merge_input_config(struct input_config *dst, struct input_config *src);
 void apply_input_config(struct input_config *ic, struct libinput_device *dev);
 void free_input_config(struct input_config *ic);

include/sway/criteria.h

@@ -22,7 +22,7 @@ struct criteria {
 	char *cmdlist;
 };
 
-int criteria_cmp(const void *item, const void *data);
+int criteria_cmp(const void *key, const void *item);
 void free_criteria(struct criteria *crit);
 
 // Pouplate list with crit_tokens extracted from criteria string, returns error
@@ -39,4 +39,6 @@ list_t *container_for(list_t *tokens);
 // Returns true if any criteria in the given list matches this container
 bool criteria_any(swayc_t *cont, list_t *criteria);
 
+struct crit_token;
+
 #endif

include/sway/layout.h

@@ -24,7 +24,7 @@ void add_child(swayc_t *parent, swayc_t *child);
 
 // Adds child to parent at index, if parent has no focus, it is set to child
 // parent must be of type C_WORKSPACE or C_CONTAINER
-void insert_child(swayc_t *parent, swayc_t *child, int index);
+void insert_child(swayc_t *parent, swayc_t *child, size_t index);
 
 // Adds child as floating window to ws, if there is no focus it is set to child.
 // ws must be of type C_WORKSPACE