Separate filesystem utilities

13 files changed, 17 insertions, 10 deletions

diff --git a/test/bad_syntax.lv2/test_bad_syntax.c b/test/bad_syntax.lv2/test_bad_syntax.c
index 90d789b..e7afcfc 100644
--- a/test/bad_syntax.lv2/test_bad_syntax.c
+++ b/test/bad_syntax.lv2/test_bad_syntax.c
@@ -1,6 +1,6 @@
 #undef NDEBUG
 
-#include "../src/lilv_internal.h"
+#include "../src/filesystem.h"
 
 #include "serd/serd.h"
 #include "lilv/lilv.h"
diff --git a/test/failed_instantiation.lv2/test_failed_instantiation.c b/test/failed_instantiation.lv2/test_failed_instantiation.c
index 3eb5406..7fb2714 100644
--- a/test/failed_instantiation.lv2/test_failed_instantiation.c
+++ b/test/failed_instantiation.lv2/test_failed_instantiation.c
@@ -1,6 +1,6 @@
 #undef NDEBUG
 
-#include "../src/lilv_internal.h"
+#include "../src/filesystem.h"
 
 #include "lilv/lilv.h"
 #include "serd/serd.h"
diff --git a/test/failed_lib_descriptor.lv2/test_failed_lib_descriptor.c b/test/failed_lib_descriptor.lv2/test_failed_lib_descriptor.c
index 1aaa604..5347ade 100644
--- a/test/failed_lib_descriptor.lv2/test_failed_lib_descriptor.c
+++ b/test/failed_lib_descriptor.lv2/test_failed_lib_descriptor.c
@@ -1,6 +1,6 @@
 #undef NDEBUG
 
-#include "../src/lilv_internal.h"
+#include "../src/filesystem.h"
 
 #include "serd/serd.h"
 #include "lilv/lilv.h"
diff --git a/test/lib_descriptor.lv2/test_lib_descriptor.c b/test/lib_descriptor.lv2/test_lib_descriptor.c
index fc38fdc..fdc5107 100644
--- a/test/lib_descriptor.lv2/test_lib_descriptor.c
+++ b/test/lib_descriptor.lv2/test_lib_descriptor.c
@@ -1,6 +1,6 @@
 #undef NDEBUG
 
-#include "../src/lilv_internal.h"
+#include "../src/filesystem.h"
 
 #include "serd/serd.h"
 #include "lilv/lilv.h"
diff --git a/test/lilv_test_utils.c b/test/lilv_test_utils.c
index c8a80bb..8c617b0 100644
--- a/test/lilv_test_utils.c
+++ b/test/lilv_test_utils.c
@@ -18,6 +18,7 @@
 
 #include "lilv_test_utils.h"
 
+#include "../src/filesystem.h"
 #include "../src/lilv_internal.h"
 
 #include "lilv/lilv.h"
diff --git a/test/missing_descriptor.lv2/test_missing_descriptor.c b/test/missing_descriptor.lv2/test_missing_descriptor.c
index c5c157e..023545d 100644
--- a/test/missing_descriptor.lv2/test_missing_descriptor.c
+++ b/test/missing_descriptor.lv2/test_missing_descriptor.c
@@ -1,6 +1,6 @@
 #undef NDEBUG
 
-#include "../src/lilv_internal.h"
+#include "../src/filesystem.h"
 
 #include "serd/serd.h"
 #include "lilv/lilv.h"
diff --git a/test/missing_name.lv2/test_missing_name.c b/test/missing_name.lv2/test_missing_name.c
index d3885f6..416442b 100644
--- a/test/missing_name.lv2/test_missing_name.c
+++ b/test/missing_name.lv2/test_missing_name.c
@@ -1,6 +1,6 @@
 #undef NDEBUG
 
-#include "../src/lilv_internal.h"
+#include "../src/filesystem.h"
 
 #include "serd/serd.h"
 #include "lilv/lilv.h"
diff --git a/test/missing_plugin.lv2/test_missing_plugin.c b/test/missing_plugin.lv2/test_missing_plugin.c
index f4ef13b..04daf31 100644
--- a/test/missing_plugin.lv2/test_missing_plugin.c
+++ b/test/missing_plugin.lv2/test_missing_plugin.c
@@ -1,6 +1,6 @@
 #undef NDEBUG
 
-#include "../src/lilv_internal.h"
+#include "../src/filesystem.h"
 
 #include "serd/serd.h"
 #include "lilv/lilv.h"
diff --git a/test/missing_port.lv2/test_missing_port.c b/test/missing_port.lv2/test_missing_port.c
index 2069b23..36b583e 100644
--- a/test/missing_port.lv2/test_missing_port.c
+++ b/test/missing_port.lv2/test_missing_port.c
@@ -1,6 +1,6 @@
 #undef NDEBUG
 
-#include "../src/lilv_internal.h"
+#include "../src/filesystem.h"
 
 #include "serd/serd.h"
 #include "lilv/lilv.h"
diff --git a/test/missing_port_name.lv2/test_missing_port_name.c b/test/missing_port_name.lv2/test_missing_port_name.c
index 2072549..9a68b00 100644
--- a/test/missing_port_name.lv2/test_missing_port_name.c
+++ b/test/missing_port_name.lv2/test_missing_port_name.c
@@ -1,6 +1,6 @@
 #undef NDEBUG
 
-#include "../src/lilv_internal.h"
+#include "../src/filesystem.h"
 
 #include "serd/serd.h"
 #include "lilv/lilv.h"
diff --git a/test/test_state.c b/test/test_state.c
index 1cb2ce5..178732f 100644
--- a/test/test_state.c
+++ b/test/test_state.c
@@ -18,6 +18,7 @@
 
 #include "lilv_test_utils.h"
 
+#include "../src/filesystem.h"
 #include "../src/lilv_internal.h"
 
 #include "lilv/lilv.h"
diff --git a/test/test_string.c b/test/test_string.c
index 8d79327..0bad915 100644
--- a/test/test_string.c
+++ b/test/test_string.c
@@ -18,6 +18,7 @@
 
 #undef NDEBUG
 
+#include "../src/filesystem.h"
 #include "../src/lilv_internal.h"
 
 #ifdef _WIN32
diff --git a/test/test_util.c b/test/test_util.c
index 982df3e..fb41ca4 100644
--- a/test/test_util.c
+++ b/test/test_util.c
@@ -18,7 +18,11 @@
 
 #undef NDEBUG
 
-#include "../src/lilv_internal.h"
+#ifdef _WIN32
+#	 include "lilv_internal.h"
+#endif
+
+#include "../src/filesystem.h"
 
 #ifdef _WIN32
 #    include <io.h>