7 files changed, 41 insertions, 8 deletions
diff --git a/test/test_env.c b/test/test_env.c
index 2db28f2d..8ef95f1a 100644
--- a/test/test_env.c
+++ b/test/test_env.c
@@ -3,7 +3,10 @@
 
 #undef NDEBUG
 
-#include "serd/serd.h"
+#include "serd/env.h"
+#include "serd/node.h"
+#include "serd/status.h"
+#include "serd/string_view.h"
 
 #include <assert.h>
 #include <string.h>
diff --git a/test/test_free_null.c b/test/test_free_null.c
index 96153c8d..10ff4d10 100644
--- a/test/test_free_null.c
+++ b/test/test_free_null.c
@@ -3,7 +3,11 @@
 
 #undef NDEBUG
 
-#include "serd/serd.h"
+#include "serd/env.h"
+#include "serd/memory.h"
+#include "serd/node.h"
+#include "serd/reader.h"
+#include "serd/writer.h"
 
 #include <stddef.h>
 
diff --git a/test/test_node.c b/test/test_node.c
index 6343be5b..a1473e7a 100644
--- a/test/test_node.c
+++ b/test/test_node.c
@@ -3,7 +3,9 @@
 
 #undef NDEBUG
 
-#include "serd/serd.h"
+#include "serd/memory.h"
+#include "serd/node.h"
+#include "serd/string.h"
 
 #include <assert.h>
 #include <float.h>
diff --git a/test/test_reader_writer.c b/test/test_reader_writer.c
index 4acfb976..0fcc5ba3 100644
--- a/test/test_reader_writer.c
+++ b/test/test_reader_writer.c
@@ -3,7 +3,18 @@
 
 #undef NDEBUG
 
-#include "serd/serd.h"
+#include "serd/buffer.h"
+#include "serd/env.h"
+#include "serd/error.h"
+#include "serd/memory.h"
+#include "serd/node.h"
+#include "serd/reader.h"
+#include "serd/sink.h"
+#include "serd/statement.h"
+#include "serd/status.h"
+#include "serd/stream.h"
+#include "serd/syntax.h"
+#include "serd/writer.h"
 
 #ifdef _WIN32
 #  include <windows.h>
diff --git a/test/test_string.c b/test/test_string.c
index 99db03f4..3e6e77e5 100644
--- a/test/test_string.c
+++ b/test/test_string.c
@@ -3,7 +3,10 @@
 
 #undef NDEBUG
 
-#include "serd/serd.h"
+#include "serd/attributes.h"
+#include "serd/node.h"
+#include "serd/status.h"
+#include "serd/string.h"
 
 #include <assert.h>
 #include <stdint.h>
@@ -35,7 +38,7 @@ test_strerror(void)
   assert(!strcmp(msg, "Unknown error"));
 }
 
-int
+SERD_PURE_FUNC int
 main(void)
 {
   test_strlen();
diff --git a/test/test_uri.c b/test/test_uri.c
index 5f1a7f16..61f432fd 100644
--- a/test/test_uri.c
+++ b/test/test_uri.c
@@ -3,7 +3,10 @@
 
 #undef NDEBUG
 
-#include "serd/serd.h"
+#include "serd/memory.h"
+#include "serd/node.h"
+#include "serd/string_view.h"
+#include "serd/uri.h"
 
 #include <assert.h>
 #include <stdbool.h>
diff --git a/test/test_writer.c b/test/test_writer.c
index 783bf3b0..0a823d2b 100644
--- a/test/test_writer.c
+++ b/test/test_writer.c
@@ -3,7 +3,14 @@
 
 #undef NDEBUG
 
-#include "serd/serd.h"
+#include "serd/buffer.h"
+#include "serd/env.h"
+#include "serd/memory.h"
+#include "serd/node.h"
+#include "serd/statement.h"
+#include "serd/status.h"
+#include "serd/syntax.h"
+#include "serd/writer.h"
 
 #include <assert.h>
 #include <stdint.h>