From 35e2548835cd9fca003347e092de9f36d545a76a Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Fri, 11 May 2018 11:14:32 +0200
Subject: Clean up includes and improve source file separation

---
 src/byte_source.c   | 4 ++++
 src/byte_source.h   | 2 --
 src/node.c          | 2 --
 src/reader.c        | 5 +++++
 src/serd_internal.h | 2 --
 src/serdi.c         | 3 +--
 src/stack.h         | 4 ++--
 src/string_utils.h  | 3 +++
 src/uri.c           | 1 -
 src/uri_utils.h     | 4 ++++
 10 files changed, 19 insertions(+), 11 deletions(-)

(limited to 'src')

diff --git a/src/byte_source.c b/src/byte_source.c
index 0153c08b..b0199e63 100644
--- a/src/byte_source.c
+++ b/src/byte_source.c
@@ -15,8 +15,12 @@
 */
 
 #include "byte_source.h"
+
 #include "system.h"
 
+#include "serd/serd.h"
+
+#include <stdbool.h>
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/src/byte_source.h b/src/byte_source.h
index 41230c90..680fd1c5 100644
--- a/src/byte_source.h
+++ b/src/byte_source.h
@@ -17,8 +17,6 @@
 #ifndef SERD_BYTE_SOURCE_H
 #define SERD_BYTE_SOURCE_H
 
-#define _POSIX_C_SOURCE 200809L
-
 #include "serd/serd.h"
 
 #include <assert.h>
diff --git a/src/node.c b/src/node.c
index abe9304c..59dfb578 100644
--- a/src/node.c
+++ b/src/node.c
@@ -20,8 +20,6 @@
 
 #include "string_utils.h"
 
-#include "serd/serd.h"
-
 #include <assert.h>
 #include <float.h>
 #include <math.h>
diff --git a/src/reader.c b/src/reader.c
index 44a90912..f863fabe 100644
--- a/src/reader.c
+++ b/src/reader.c
@@ -16,12 +16,17 @@
 
 #include "reader.h"
 
+#include "byte_source.h"
+#include "node.h"
+#include "serd/serd.h"
 #include "serd_internal.h"
+#include "stack.h"
 #include "system.h"
 #include "world.h"
 
 #include <errno.h>
 #include <stdarg.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/serd_internal.h b/src/serd_internal.h
index d2ae23a6..fda651ae 100644
--- a/src/serd_internal.h
+++ b/src/serd_internal.h
@@ -17,8 +17,6 @@
 #ifndef SERD_INTERNAL_H
 #define SERD_INTERNAL_H
 
-#include "serd/serd.h"
-
 #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 9621cc3a..f4363583 100644
--- a/src/serdi.c
+++ b/src/serdi.c
@@ -14,7 +14,6 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#include "serd_config.h"
 #include "string_utils.h"
 #include "system.h"
 
@@ -76,7 +75,7 @@ static int
 print_version(void)
 {
 	printf("serdi " SERD_VERSION " <http://drobilla.net/software/serd>\n");
-	printf("Copyright 2011-2017 David Robillard <http://drobilla.net>.\n"
+	printf("Copyright 2011-2020 David Robillard <http://drobilla.net>.\n"
 	       "License: <http://www.opensource.org/licenses/isc>\n"
 	       "This is free software; you are free to change and redistribute it."
 	       "\nThere is NO WARRANTY, to the extent permitted by law.\n");
diff --git a/src/stack.h b/src/stack.h
index 2f97eb3e..bda34ba7 100644
--- a/src/stack.h
+++ b/src/stack.h
@@ -17,10 +17,10 @@
 #ifndef SERD_STACK_H
 #define SERD_STACK_H
 
-#include "serd_internal.h"
-
 #include <assert.h>
+#include <stdbool.h>
 #include <stddef.h>
+#include <stdint.h>
 #include <stdlib.h>
 
 /** An offset to start the stack at. Note 0 is reserved for NULL. */
diff --git a/src/string_utils.h b/src/string_utils.h
index a6c731bb..d8bb703a 100644
--- a/src/string_utils.h
+++ b/src/string_utils.h
@@ -21,6 +21,9 @@
 
 #include <assert.h>
 #include <ctype.h>
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
 #include <string.h>
 
 /** Unicode replacement character in UTF-8 */
diff --git a/src/uri.c b/src/uri.c
index 7b4b89e4..566690b2 100644
--- a/src/uri.c
+++ b/src/uri.c
@@ -21,7 +21,6 @@
 
 #include <stdbool.h>
 #include <stdint.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/src/uri_utils.h b/src/uri_utils.h
index 28779d41..b62a2ec4 100644
--- a/src/uri_utils.h
+++ b/src/uri_utils.h
@@ -19,6 +19,10 @@
 
 #include "string_utils.h"
 
+#include "serd/serd.h"
+
+#include <stddef.h>
+#include <stdint.h>
 #include <string.h>
 
 static inline bool
-- 
cgit v1.2.1