util: move ptr_wrapper_t to util

7 files changed, 6 insertions, 12 deletions

diff --git a/include/list.h b/include/list.h
index b6342d1..9f486b0 100644
--- a/include/list.h
+++ b/include/list.h
@@ -14,10 +14,6 @@ typedef struct {
   uint8_t *elements;
 } list_t;
 
-typedef struct {
-  void *ptr;
-} ptr_wrapper_t;
-
 list_t *list_create(size_t element_size);
 void list_add(list_t *list, void *element);
 void *list_get(list_t *list, size_t i);
diff --git a/include/util.h b/include/util.h
index ff81cbb..ebfe862 100644
--- a/include/util.h
+++ b/include/util.h
@@ -1,6 +1,10 @@
 #ifndef __UTIL_H
 #define __UTIL_H
 
+typedef struct {
+  void *ptr;
+} ptr_wrapper_t;
+
 char *ltrim(char *s);
 char *rtrim(char *s);
 char *trim(char *s);
diff --git a/src/copy.c b/src/copy.c
index f63d4f2..ddada6a 100644
--- a/src/copy.c
+++ b/src/copy.c
@@ -9,8 +9,6 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include "../config.h"
-
 int
 copy_recursively(const char *fpath,
                  const struct stat *sb,
diff --git a/src/engine.c b/src/engine.c
index 61f20ff..50cfd56 100644
--- a/src/engine.c
+++ b/src/engine.c
@@ -9,8 +9,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "../config.h"
-
 void
 handle_include(char **buffer, key_match_t *match, directive_t *directive)
 {
diff --git a/src/list.c b/src/list.c
index eb53ad8..69b3208 100644
--- a/src/list.c
+++ b/src/list.c
@@ -4,6 +4,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <util.h>
 
 list_t *
 list_create(size_t element_size)
diff --git a/src/main.c b/src/main.c
index 3ed84a1..d783f1a 100644
--- a/src/main.c
+++ b/src/main.c
@@ -15,8 +15,7 @@
 #include <string.h>
 #include <sys/stat.h>
 #include <template.h>
-
-#include "../config.h"
+#include <util.h>
 
 #define ASSETS "assets"
 
diff --git a/src/template.c b/src/template.c
index 7a43218..26e492e 100644
--- a/src/template.c
+++ b/src/template.c
@@ -10,8 +10,6 @@
 #include <string.h>
 #include <template.h>
 
-#include "../config.h"
-
 template_t *
 template_create(void)
 {