3 files changed, 10 insertions, 10 deletions
diff --git a/include/rune/list.h b/include/rune/util/list.h
index 1107491..ed6db5e 100644
--- a/include/rune/list.h
+++ b/include/rune/util/list.h
@@ -19,17 +19,17 @@
  * 3. This notice may not be removed or altered from any source distribution.
  */
 
-#ifndef RUNE_LIST_H
-#define RUNE_LIST_H
+#ifndef RUNE_UTIL_LIST_H
+#define RUNE_UTIL_LIST_H
 
 #include <stddef.h>
 
-struct list_head {
+RAPI struct list_head {
         struct list_head *next;
         struct list_head *prev;
 };
 
-static inline void list_add(struct list_head *new, struct list_head *head) {
+RAPI static inline void list_add(struct list_head *new, struct list_head *head) {
         struct list_head *temp = head;
         while (temp->next != NULL)
                 temp = temp->next;
@@ -39,7 +39,7 @@ static inline void list_add(struct list_head *new, struct list_head *head) {
         new->next = NULL;
 }
 
-static inline void list_del(struct list_head *item) {
+RAPI static inline void list_del(struct list_head *item) {
         struct list_head *next = item->next;
         struct list_head *prev = item->prev;
         if (next != NULL)
diff --git a/include/rune/types.h b/include/rune/util/types.h
index 03e3edb..ac92ecb 100644
--- a/include/rune/types.h
+++ b/include/rune/util/types.h
@@ -19,10 +19,10 @@
  * 3. This notice may not be removed or altered from any source distribution.
  */
 
-#ifndef RUNE_TYPES_H
-#define RUNE_TYPES_H
+#ifndef RUNE_UTIL_TYPES_H
+#define RUNE_UTIL_TYPES_H
 
-#include <rune/util.h>
+#include <rune/util/util.h>
 
 STATIC_ASSERT(sizeof(uint8_t) == 1, "Expected uint8_t to be 1 byte");
 STATIC_ASSERT(sizeof(uint16_t) == 2, "Expected uint16_t to be 2 bytes");
diff --git a/include/rune/util.h b/include/rune/util/util.h
index 04429c4..dcf45e4 100644
--- a/include/rune/util.h
+++ b/include/rune/util/util.h
@@ -19,8 +19,8 @@
  * 3. This notice may not be removed or altered from any source distribution.
  */
 
-#ifndef RUNE_UTIL_H
-#define RUNE_UTIL_H
+#ifndef RUNE_UTIL_UTIL_H
+#define RUNE_UTIL_UTIL_H
 
 #include <assert.h>
 #include <stdint.h>