9 files changed, 9 insertions, 39 deletions
diff --git a/tests/check_content_parser.c b/tests/check_content_parser.c
index ca5a58d..79b31c3 100644
--- a/tests/check_content_parser.c
+++ b/tests/check_content_parser.c
@@ -6,17 +6,12 @@
  * See the file LICENSE.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif /* HAVE_CONFIG_H */
-
 #include <stdarg.h>
 #include <stddef.h>
 #include <setjmp.h>
 #include <cmocka.h>
-#include <string.h>
+#include <stdlib.h>
 #include "../src/content-parser.h"
-#include "../src/utils.h"
 
 
 static void
diff --git a/tests/check_datetime_parser.c b/tests/check_datetime_parser.c
index ba5a79d..03f5a9a 100644
--- a/tests/check_datetime_parser.c
+++ b/tests/check_datetime_parser.c
@@ -6,16 +6,11 @@
  * See the file LICENSE.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif /* HAVE_CONFIG_H */
-
 #include <stdarg.h>
 #include <stddef.h>
 #include <setjmp.h>
 #include <cmocka.h>
-#include <string.h>
-#include <stdio.h>
+#include <stdlib.h>
 #include <locale.h>
 #include "../src/error.h"
 #include "../src/datetime-parser.h"
diff --git a/tests/check_error.c b/tests/check_error.c
index 8818b00..e844998 100644
--- a/tests/check_error.c
+++ b/tests/check_error.c
@@ -6,17 +6,12 @@
  * See the file LICENSE.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif /* HAVE_CONFIG_H */
-
 #include <stdarg.h>
 #include <stddef.h>
 #include <setjmp.h>
 #include <cmocka.h>
 #include <string.h>
 #include "../src/error.h"
-#include "../src/utils.h"
 
 
 static void
diff --git a/tests/check_loader.c b/tests/check_loader.c
index 4a5dc32..44468c8 100644
--- a/tests/check_loader.c
+++ b/tests/check_loader.c
@@ -6,16 +6,14 @@
  * See the file LICENSE.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif /* HAVE_CONFIG_H */
-
 #include <stdarg.h>
 #include <stddef.h>
 #include <setjmp.h>
 #include <cmocka.h>
+#include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
+#include "../src/error.h"
 #include "../src/template-parser.h"
 #include "../src/loader.h"
 #include "../src/utils.h"
diff --git a/tests/check_renderer.c b/tests/check_renderer.c
index cbd4a8e..c2c5618 100644
--- a/tests/check_renderer.c
+++ b/tests/check_renderer.c
@@ -6,14 +6,12 @@
  * See the file LICENSE.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif /* HAVE_CONFIG_H */
-
 #include <stdarg.h>
 #include <stddef.h>
 #include <setjmp.h>
 #include <cmocka.h>
+#include <stdbool.h>
+#include <stdlib.h>
 #include <string.h>
 #include "../src/error.h"
 #include "../src/renderer.h"
diff --git a/tests/check_source_parser.c b/tests/check_source_parser.c
index d94dc70..bbd9ec6 100644
--- a/tests/check_source_parser.c
+++ b/tests/check_source_parser.c
@@ -6,10 +6,6 @@
  * See the file LICENSE.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif /* HAVE_CONFIG_H */
-
 #include <stdarg.h>
 #include <stddef.h>
 #include <setjmp.h>
diff --git a/tests/check_template_parser.c b/tests/check_template_parser.c
index 2b34c6f..da6a184 100644
--- a/tests/check_template_parser.c
+++ b/tests/check_template_parser.c
@@ -6,10 +6,6 @@
  * See the file LICENSE.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif /* HAVE_CONFIG_H */
-
 #include <stdarg.h>
 #include <stddef.h>
 #include <setjmp.h>
diff --git a/tests/check_utf8.c b/tests/check_utf8.c
index d9b6cd4..e7be61e 100644
--- a/tests/check_utf8.c
+++ b/tests/check_utf8.c
@@ -6,14 +6,12 @@
  * See the file LICENSE.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif /* HAVE_CONFIG_H */
-
 #include <stdarg.h>
 #include <stddef.h>
 #include <setjmp.h>
 #include <cmocka.h>
+#include <stdbool.h>
+#include <stdint.h>
 #include <string.h>
 #include "../src/utf8.h"
 #include "../src/utils.h"
diff --git a/tests/check_utils.c b/tests/check_utils.c
index b76d171..1750aa2 100644
--- a/tests/check_utils.c
+++ b/tests/check_utils.c
@@ -10,9 +10,8 @@
 #include <stddef.h>
 #include <setjmp.h>
 #include <cmocka.h>
-
+#include <stdbool.h>
 #include <stdlib.h>
-
 #include "../src/utils.h"
 
 #define SB_STRING_CHUNK_SIZE 128