25 files changed, 19 insertions, 19 deletions
diff --git a/src/blogc-git-receiver.c b/src/blogc-git-receiver/main.c
index 820fce5..554ec0c 100644
--- a/src/blogc-git-receiver.c
+++ b/src/blogc-git-receiver/main.c
@@ -18,7 +18,7 @@
 #include <dirent.h>
 #include <time.h>
 
-#include "utils.h"
+#include "../common/utils.h"
 
 #ifndef BUFFER_SIZE
 #define BUFFER_SIZE 4096
diff --git a/src/blogc-runserver.c b/src/blogc-runserver/main.c
index 2fbbbc7..2a756f1 100644
--- a/src/blogc-runserver.c
+++ b/src/blogc-runserver/main.c
@@ -23,7 +23,7 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <unistd.h>
-#include "utils.h"
+#include "../common/utils.h"
 
 
 /**
diff --git a/src/content-parser.c b/src/blogc/content-parser.c
index ca0597b..e751548 100644
--- a/src/content-parser.c
+++ b/src/blogc/content-parser.c
@@ -11,7 +11,7 @@
 #include <string.h>
 
 #include "content-parser.h"
-#include "utils.h"
+#include "../common/utils.h"
 
 // this is a half ass implementation of a markdown-like syntax. bugs are
 // expected. feel free to improve the parser and add new features.
diff --git a/src/content-parser.h b/src/blogc/content-parser.h
index 37e38d7..37e38d7 100644
--- a/src/content-parser.h
+++ b/src/blogc/content-parser.h
diff --git a/src/datetime-parser.c b/src/blogc/datetime-parser.c
index ad65ff7..28efb74 100644
--- a/src/datetime-parser.c
+++ b/src/blogc/datetime-parser.c
@@ -18,7 +18,7 @@
 
 #include "error.h"
 #include "datetime-parser.h"
-#include "utils.h"
+#include "../common/utils.h"
 
 
 typedef enum {
diff --git a/src/datetime-parser.h b/src/blogc/datetime-parser.h
index a5087b3..a5087b3 100644
--- a/src/datetime-parser.h
+++ b/src/blogc/datetime-parser.h
diff --git a/src/debug.c b/src/blogc/debug.c
index 9689028..2840f60 100644
--- a/src/debug.c
+++ b/src/blogc/debug.c
@@ -9,7 +9,7 @@
 #include <stdio.h>
 
 #include "template-parser.h"
-#include "utils.h"
+#include "../common/utils.h"
 #include "debug.h"
 
 
diff --git a/src/debug.h b/src/blogc/debug.h
index cd454d4..eb4e2c1 100644
--- a/src/debug.h
+++ b/src/blogc/debug.h
@@ -9,7 +9,7 @@
 #ifndef ___DEBUG_H
 #define ___DEBUG_H
 
-#include "utils.h"
+#include "../common/utils.h"
 
 void blogc_debug_template(sb_slist_t *stmts);
 
diff --git a/src/error.c b/src/blogc/error.c
index c238f51..41f4cd0 100644
--- a/src/error.c
+++ b/src/blogc/error.c
@@ -10,7 +10,7 @@
 #include <stdlib.h>
 #include <stdarg.h>
 #include "error.h"
-#include "utils.h"
+#include "../common/utils.h"
 
 
 blogc_error_t*
diff --git a/src/error.h b/src/blogc/error.h
index 31fbaf2..31fbaf2 100644
--- a/src/error.h
+++ b/src/blogc/error.h
diff --git a/src/file.c b/src/blogc/file.c
index dc43056..b3b0c5b 100644
--- a/src/file.c
+++ b/src/blogc/file.c
@@ -14,8 +14,8 @@
 #include <string.h>
 #include "file.h"
 #include "error.h"
-#include "utf8.h"
-#include "utils.h"
+#include "../common/utf8.h"
+#include "../common/utils.h"
 
 // this would belong to loader.c, but we need it in a separated file to be
 // able to mock it when unit testing the loader functions.
diff --git a/src/file.h b/src/blogc/file.h
index d2c4390..d2c4390 100644
--- a/src/file.h
+++ b/src/blogc/file.h
diff --git a/src/loader.c b/src/blogc/loader.c
index bd3251e..90f2401 100644
--- a/src/loader.c
+++ b/src/blogc/loader.c
@@ -17,7 +17,7 @@
 #include "template-parser.h"
 #include "loader.h"
 #include "error.h"
-#include "utils.h"
+#include "../common/utils.h"
 
 
 char*
diff --git a/src/loader.h b/src/blogc/loader.h
index 32b58be..c54d11a 100644
--- a/src/loader.h
+++ b/src/blogc/loader.h
@@ -10,7 +10,7 @@
 #define _LOADER_H
 
 #include "error.h"
-#include "utils.h"
+#include "../common/utils.h"
 
 char* blogc_get_filename(const char *f);
 sb_slist_t* blogc_template_parse_from_file(const char *f, blogc_error_t **err);
diff --git a/src/blogc.c b/src/blogc/main.c
index c90070d..03f43ae 100644
--- a/src/blogc.c
+++ b/src/blogc/main.c
@@ -27,8 +27,8 @@
 #include "loader.h"
 #include "renderer.h"
 #include "error.h"
-#include "utf8.h"
-#include "utils.h"
+#include "../common/utf8.h"
+#include "../common/utils.h"
 
 #ifndef PACKAGE_VERSION
 #define PACKAGE_VERSION "Unknown"
diff --git a/src/renderer.c b/src/blogc/renderer.c
index 27e92bd..97a226e 100644
--- a/src/renderer.c
+++ b/src/blogc/renderer.c
@@ -16,7 +16,7 @@
 #include "error.h"
 #include "template-parser.h"
 #include "renderer.h"
-#include "utils.h"
+#include "../common/utils.h"
 
 
 const char*
diff --git a/src/renderer.h b/src/blogc/renderer.h
index 2982ee8..f7f5328 100644
--- a/src/renderer.h
+++ b/src/blogc/renderer.h
@@ -10,7 +10,7 @@
 #define _RENDERER_H
 
 #include <stdbool.h>
-#include "utils.h"
+#include "../common/utils.h"
 
 const char* blogc_get_variable(const char *name, sb_trie_t *global, sb_trie_t *local);
 char* blogc_format_date(const char *date, sb_trie_t *global, sb_trie_t *local);
diff --git a/src/source-parser.c b/src/blogc/source-parser.c
index 5d29213..4472096 100644
--- a/src/source-parser.c
+++ b/src/blogc/source-parser.c
@@ -12,7 +12,7 @@
 #include "content-parser.h"
 #include "source-parser.h"
 #include "error.h"
-#include "utils.h"
+#include "../common/utils.h"
 
 
 typedef enum {
diff --git a/src/source-parser.h b/src/blogc/source-parser.h
index 0d54742..895cb1b 100644
--- a/src/source-parser.h
+++ b/src/blogc/source-parser.h
@@ -11,7 +11,7 @@
 
 #include <stddef.h>
 #include "error.h"
-#include "utils.h"
+#include "../common/utils.h"
 
 sb_trie_t* blogc_source_parse(const char *src, size_t src_len,
     blogc_error_t **err);
diff --git a/src/template-parser.c b/src/blogc/template-parser.c
index 6ca6eb7..15750f1 100644
--- a/src/template-parser.c
+++ b/src/blogc/template-parser.c
@@ -12,7 +12,7 @@
 
 #include "template-parser.h"
 #include "error.h"
-#include "utils.h"
+#include "../common/utils.h"
 
 
 typedef enum {
diff --git a/src/template-parser.h b/src/blogc/template-parser.h
index 19df6af..41a2b3a 100644
--- a/src/template-parser.h
+++ b/src/blogc/template-parser.h
@@ -11,7 +11,7 @@
 
 #include <stddef.h>
 #include "error.h"
-#include "utils.h"
+#include "../common/utils.h"
 
 /*
  * note: whitespace cleaners are NOT added to ast. we fix strings right during
diff --git a/src/utf8.c b/src/common/utf8.c
index a2f4fdd..a2f4fdd 100644
--- a/src/utf8.c
+++ b/src/common/utf8.c
diff --git a/src/utf8.h b/src/common/utf8.h
index 06fe07e..06fe07e 100644
--- a/src/utf8.h
+++ b/src/common/utf8.h
diff --git a/src/utils.c b/src/common/utils.c
index b42ae4e..b42ae4e 100644
--- a/src/utils.c
+++ b/src/common/utils.c
diff --git a/src/utils.h b/src/common/utils.h
index aca02c0..aca02c0 100644
--- a/src/utils.h
+++ b/src/common/utils.h