Clean up includes and improve source file separation

19 files changed, 86 insertions, 66 deletions

diff --git a/src/byte_sink.h b/src/byte_sink.h
index 0d825020..4425f91f 100644
--- a/src/byte_sink.h
+++ b/src/byte_sink.h
@@ -17,12 +17,14 @@
 #ifndef SERD_BYTE_SINK_H
 #define SERD_BYTE_SINK_H
 
-#include <stddef.h>
-#include <string.h>
+#include "serd_internal.h"
+#include "system.h"
 
 #include "serd/serd.h"
 
-#include "system.h"
+#include <stddef.h>
+#include <stdlib.h>
+#include <string.h>
 
 typedef struct SerdByteSinkImpl {
 	SerdWriteFunc sink;
diff --git a/src/byte_source.c b/src/byte_source.c
index 84067752..ae891a35 100644
--- a/src/byte_source.c
+++ b/src/byte_source.c
@@ -15,9 +15,13 @@
 */
 
 #include "byte_source.h"
+
 #include "system.h"
+#include "serd/serd.h"
 
-#include "serd_internal.h"
+#include <stdbool.h>
+#include <stdlib.h>
+#include <string.h>
 
 SerdStatus
 serd_byte_source_page(SerdByteSource* source)
diff --git a/src/byte_source.h b/src/byte_source.h
index 51ea346b..b895aac1 100644
--- a/src/byte_source.h
+++ b/src/byte_source.h
@@ -17,10 +17,12 @@
 #ifndef SERD_BYTE_SOURCE_H
 #define SERD_BYTE_SOURCE_H
 
-#include "serd_internal.h"
+#include "serd/serd.h"
 
 #include <assert.h>
+#include <stdbool.h>
 #include <stddef.h>
+#include <stdint.h>
 #include <stdio.h>
 
 typedef int (*SerdStreamCloseFunc)(void*);
diff --git a/src/env.c b/src/env.c
index a184b4a1..22165060 100644
--- a/src/env.c
+++ b/src/env.c
@@ -14,13 +14,15 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#include "serd_internal.h"
+#include "node.h"
+
+#include "serd/serd.h"
 
+#include <stdbool.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include "node.h"
-
 typedef struct {
 	SerdNode* name;
 	SerdNode* uri;
diff --git a/src/n3.c b/src/n3.c
index 6e4bee2d..594cf8b8 100644
--- a/src/n3.c
+++ b/src/n3.c
@@ -14,19 +14,18 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
+#include "node.h"
+#include "reader.h"
 #include "serd_internal.h"
+#include "string_utils.h"
+#include "uri_utils.h"
+
+#include "serd/serd.h"
 
 #include <assert.h>
 #include <ctype.h>
-#include <errno.h>
-#include <stdint.h>
+#include <stdbool.h>
 #include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "reader.h"
-#include "string_utils.h"
-#include "uri_utils.h"
 
 #define TRY_THROW(exp) if (!(exp)) goto except;
 #define TRY_RET(exp)   if (!(exp)) return 0;
diff --git a/src/node.c b/src/node.c
index 5264458a..51759292 100644
--- a/src/node.c
+++ b/src/node.c
@@ -14,17 +14,19 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
+#include "node.h"
+
 #include "serd_internal.h"
+#include "string_utils.h"
 
 #include <assert.h>
 #include <float.h>
 #include <math.h>
+#include <stdint.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include "node.h"
-#include "string_utils.h"
-
 #ifdef _WIN32
 #    ifndef isnan
 #        define isnan(x) _isnan(x)
diff --git a/src/node.h b/src/node.h
index 090faf0c..4df906ba 100644
--- a/src/node.h
+++ b/src/node.h
@@ -17,7 +17,10 @@
 #ifndef SERD_NODE_H
 #define SERD_NODE_H
 
-#include "serd_internal.h"
+#include "serd/serd.h"
+
+#include <stdbool.h>
+#include <stddef.h>
 
 struct SerdNodeImpl {
 	size_t        n_bytes;  /**< Size in bytes (not including null) */
diff --git a/src/reader.c b/src/reader.c
index dbfa17c4..c9213820 100644
--- a/src/reader.c
+++ b/src/reader.c
@@ -14,19 +14,20 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
+#include "reader.h"
+
 #include "serd_internal.h"
+#include "system.h"
+#include "world.h"
+
+#include "serd/serd.h"
 
-#include <ctype.h>
 #include <errno.h>
 #include <stdarg.h>
-#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include "reader.h"
-#include "system.h"
-
 static SerdStatus serd_reader_prepare(SerdReader* reader);
 
 int
diff --git a/src/reader.h b/src/reader.h
index 52807126..523df533 100644
--- a/src/reader.h
+++ b/src/reader.h
@@ -17,12 +17,17 @@
 #ifndef SERD_READER_H
 #define SERD_READER_H
 
-#include "serd_internal.h"
-
 #include "byte_source.h"
 #include "node.h"
 #include "stack.h"
 
+#include "serd/serd.h"
+
+#include <assert.h>
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
+
 #ifdef SERD_STACK_CHECK
 #    define SERD_STACK_ASSERT_TOP(reader, ref) \
             assert(ref == reader->allocs[reader->n_allocs - 1]);
diff --git a/src/serd_internal.h b/src/serd_internal.h
index c7260101..fda651ae 100644
--- a/src/serd_internal.h
+++ b/src/serd_internal.h
@@ -17,22 +17,6 @@
 #ifndef SERD_INTERNAL_H
 #define SERD_INTERNAL_H
 
-#define _POSIX_C_SOURCE 200809L /* for posix_memalign and posix_fadvise */
-
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "serd/serd.h"
-#include "serd_config.h"
-
-#include "world.h"
-
-#if defined(HAVE_FILENO)
-#   include <fcntl.h>
-#endif
-
 #define NS_XSD "http://www.w3.org/2001/XMLSchema#"
 #define NS_RDF "http://www.w3.org/1999/02/22-rdf-syntax-ns#"
 
diff --git a/src/serdi.c b/src/serdi.c
index 3dc934f8..be511b32 100644
--- a/src/serdi.c
+++ b/src/serdi.c
@@ -14,16 +14,15 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#include "serd_internal.h"
-
-#include <assert.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-
+#include "serd_config.h"
 #include "string_utils.h"
 #include "system.h"
-#include "world.h"
+
+#include "serd/serd.h"
+
+#include <stdbool.h>
+#include <stdio.h>
+#include <string.h>
 
 #define SERDI_ERROR(msg)       fprintf(stderr, "serdi: " msg);
 #define SERDI_ERRORF(fmt, ...) fprintf(stderr, "serdi: " fmt, __VA_ARGS__);
diff --git a/src/stack.h b/src/stack.h
index a8298c0d..122b3b14 100644
--- a/src/stack.h
+++ b/src/stack.h
@@ -17,8 +17,6 @@
 #ifndef SERD_STACK_H
 #define SERD_STACK_H
 
-#include "serd_internal.h"
-
 #include <assert.h>
 #include <stddef.h>
 #include <stdlib.h>
diff --git a/src/string.c b/src/string.c
index 6e0edcd8..b00be2fa 100644
--- a/src/string.c
+++ b/src/string.c
@@ -14,10 +14,14 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
+#include "string.h"
+
 #include "serd_internal.h"
 #include "string_utils.h"
 
 #include <math.h>
+#include <stdlib.h>
+#include <string.h>
 
 void
 serd_free(void* ptr)
diff --git a/src/string_utils.h b/src/string_utils.h
index 939ddde0..ab6ece0e 100644
--- a/src/string_utils.h
+++ b/src/string_utils.h
@@ -17,7 +17,13 @@
 #ifndef SERD_STRING_UTILS_H
 #define SERD_STRING_UTILS_H
 
+#include "serd/serd.h"
+
 #include <ctype.h>
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <string.h>
 
 /** Unicode replacement character in UTF-8 */
 static const uint8_t replacement_char[] = { 0xEF, 0xBF, 0xBD };
diff --git a/src/uri.c b/src/uri.c
index 69b9a742..fdd561a6 100644
--- a/src/uri.c
+++ b/src/uri.c
@@ -14,13 +14,13 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#include "serd_internal.h"
+#include "uri_utils.h"
+
+#include "serd/serd.h"
 
 #include <stdlib.h>
 #include <string.h>
 
-#include "uri_utils.h"
-
 // #define URI_DEBUG 1
 
 char*
diff --git a/src/uri_utils.h b/src/uri_utils.h
index 5c24afcb..31ca6cc4 100644
--- a/src/uri_utils.h
+++ b/src/uri_utils.h
@@ -19,6 +19,8 @@
 
 #include "string_utils.h"
 
+#include <string.h>
+
 static inline bool
 slice_equals(const SerdSlice* a, const SerdSlice* b)
 {
diff --git a/src/world.c b/src/world.c
index 7ec483e8..c35cdd55 100644
--- a/src/world.c
+++ b/src/world.c
@@ -16,17 +16,19 @@
 
 #define _POSIX_C_SOURCE 200809L /* for posix_fadvise */
 
-#include "serd_internal.h"
+#include "world.h"
+
 #include "serd_config.h"
 
+#include <errno.h>
 #include <stdarg.h>
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #if defined(HAVE_POSIX_FADVISE)
 #   include <fcntl.h>
 #endif
 
-#include "world.h"
-
 FILE*
 serd_world_fopen(SerdWorld* world, const char* path, const char* mode)
 {
diff --git a/src/world.h b/src/world.h
index aeea70c2..85b676ee 100644
--- a/src/world.h
+++ b/src/world.h
@@ -17,7 +17,9 @@
 #ifndef SERD_WORLD_H
 #define SERD_WORLD_H
 
-#include "serd_internal.h"
+#include "serd/serd.h"
+
+#include <stdio.h>
 
 struct SerdWorldImpl {
 	SerdErrorSink error_sink;
diff --git a/src/writer.c b/src/writer.c
index fdc2fd3d..f371e530 100644
--- a/src/writer.c
+++ b/src/writer.c
@@ -14,19 +14,22 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
+#include "byte_sink.h"
+#include "node.h"
 #include "serd_internal.h"
+#include "stack.h"
+#include "string_utils.h"
+#include "system.h"
+#include "uri_utils.h"
+#include "world.h"
+
+#include "serd/serd.h"
 
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include "byte_sink.h"
-#include "node.h"
-#include "stack.h"
-#include "string_utils.h"
-#include "uri_utils.h"
-
 typedef struct {
 	SerdNode* graph;
 	SerdNode* subject;