diff --git a/fx.collections/array.c b/fx.collections/array.c
index c7f5ff2..b2fa269 100644
--- a/fx.collections/array.c
+++ b/fx.collections/array.c
@@ -1,7 +1,7 @@
 #include <fx/collections/array.h>
-#include <fx/collections/string.h>
 #include <fx/iterator.h>
 #include <fx/stream.h>
+#include <fx/string.h>
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/fx.collections/datetime.c b/fx.collections/datetime.c
index 6393090..006581b 100644
--- a/fx.collections/datetime.c
+++ b/fx.collections/datetime.c
@@ -1,6 +1,6 @@
 #include <fx/collections/datetime.h>
-#include <fx/collections/string.h>
 #include <fx/stream.h>
+#include <fx/string.h>
 
 /*** PRIVATE DATA *************************************************************/
 
diff --git a/fx.collections/dict.c b/fx.collections/dict.c
index cc948a4..632cd49 100644
--- a/fx.collections/dict.c
+++ b/fx.collections/dict.c
@@ -1,7 +1,7 @@
 #include <fx/collections/dict.h>
-#include <fx/collections/string.h>
 #include <fx/status.h>
 #include <fx/stream.h>
+#include <fx/string.h>
 #include <stdbool.h>
 #include <stdlib.h>
 
diff --git a/fx.collections/hashmap.c b/fx.collections/hashmap.c
index c932964..43fc2da 100644
--- a/fx.collections/hashmap.c
+++ b/fx.collections/hashmap.c
@@ -1,7 +1,7 @@
 #include <fx/collections/hashmap.h>
-#include <fx/collections/string.h>
 #include <fx/misc.h>
 #include <fx/status.h>
+#include <fx/string.h>
 #include <stdbool.h>
 #include <stdlib.h>
 
diff --git a/fx.collections/include/fx/collections/dict.h b/fx.collections/include/fx/collections/dict.h
index b5d5d35..8c14eeb 100644
--- a/fx.collections/include/fx/collections/dict.h
+++ b/fx.collections/include/fx/collections/dict.h
@@ -2,11 +2,11 @@
 #define FX_DS_DICT_H_
 
 #include <fx/bst.h>
-#include <fx/collections/string.h>
 #include <fx/macros.h>
 #include <fx/misc.h>
 #include <fx/queue.h>
 #include <fx/status.h>
+#include <fx/string.h>
 
 FX_DECLS_BEGIN;
 
diff --git a/fx.collections/include/fx/collections/tree.h b/fx.collections/include/fx/collections/tree.h
index be8846f..7f5a707 100644
--- a/fx.collections/include/fx/collections/tree.h
+++ b/fx.collections/include/fx/collections/tree.h
@@ -1,10 +1,10 @@
 #ifndef FX_DS_TREE_H_
 #define FX_DS_TREE_H_
 
-#include <fx/collections/string.h>
 #include <fx/macros.h>
 #include <fx/misc.h>
 #include <fx/queue.h>
+#include <fx/string.h>
 
 FX_DECLS_BEGIN;
 
diff --git a/fx.collections/include/fx/collections/uuid.h b/fx.collections/include/fx/collections/uuid.h
index 0662bca..62ce0ec 100644
--- a/fx.collections/include/fx/collections/uuid.h
+++ b/fx.collections/include/fx/collections/uuid.h
@@ -1,9 +1,9 @@
 #ifndef FX_DS_UUID_H_
 #define FX_DS_UUID_H_
 
-#include <fx/collections/string.h>
 #include <fx/macros.h>
 #include <fx/status.h>
+#include <fx/string.h>
 
 #define FX_UUID_NBYTES     16
 #define FX_UUID_STRING_MAX 37
diff --git a/fx.collections/uuid.c b/fx.collections/uuid.c
index 86c62a9..48b6d90 100644
--- a/fx.collections/uuid.c
+++ b/fx.collections/uuid.c
@@ -1,6 +1,6 @@
 #include <ctype.h>
-#include <fx/collections/string.h>
 #include <fx/collections/uuid.h>
+#include <fx/string.h>
 #include <fx/stringstream.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/fx.collections/include/fx/collections/string.h b/fx/include/fx/string.h
similarity index 99%
rename from fx.collections/include/fx/collections/string.h
rename to fx/include/fx/string.h
index 1ad75f0..c12cd95 100644
--- a/fx.collections/include/fx/collections/string.h
+++ b/fx/include/fx/string.h
@@ -1,5 +1,5 @@
-#ifndef FX_DS_STRING_H_
-#define FX_DS_STRING_H_
+#ifndef FX_STRING_H_
+#define FX_STRING_H_
 
 #include <ctype.h>
 #include <fx/encoding.h>
diff --git a/fx.collections/string.c b/fx/string.c
similarity index 99%
rename from fx.collections/string.c
rename to fx/string.c
index c8c2714..bd3d4e4 100644
--- a/fx.collections/string.c
+++ b/fx/string.c
@@ -1,6 +1,6 @@
 #include <ctype.h>
-#include <fx/collections/string.h>
 #include <fx/stream.h>
+#include <fx/string.h>
 #include <fx/stringstream.h>
 #include <stdarg.h>
 #include <stdbool.h>