diff --git a/src/string/memarray.c b/src/string/memarray.c
index 2deb3c1..b8911e2 100644
--- a/src/string/memarray.c
+++ b/src/string/memarray.c
@@ -1,5 +1,4 @@
 #include <gint/defs/types.h>
-#include <gint/std/string.h>
 #include <gint/display.h>
 #include <gint/keyboard.h>
 #include <gint/exc.h>
@@ -9,6 +8,8 @@
 #include <ft/util.h>
 #include "memarray.h"
 
+#include <string.h>
+
 //---
 // Utilities
 //---
diff --git a/src/test.c b/src/test.c
index a4c0d49..6613a93 100644
--- a/src/test.c
+++ b/src/test.c
@@ -1,6 +1,6 @@
 #include <ft/test.h>
-#include <gint/std/stdio.h>
-#include <gint/std/stdlib.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include <stdarg.h>
 #undef ft_assert
 
diff --git a/src/widgets/fbar.c b/src/widgets/fbar.c
index 4233e35..7ab2d6c 100644
--- a/src/widgets/fbar.c
+++ b/src/widgets/fbar.c
@@ -1,8 +1,8 @@
 #include <ft/widgets/fbar.h>
 #include <justui/jwidget-api.h>
-#include <gint/std/stdlib.h>
-#include <gint/std/string.h>
-#include <gint/std/stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
 
 /* Type identifier for fbar */
 static int fbar_type_id = -1;
diff --git a/src/widgets/fbrowser.c b/src/widgets/fbrowser.c
index 301117e..3b25224 100644
--- a/src/widgets/fbrowser.c
+++ b/src/widgets/fbrowser.c
@@ -2,7 +2,7 @@
 #include <justui/jwidget-api.h>
 #include <justui/jscene.h>
 #include <justui/jlabel.h>
-#include <gint/std/stdlib.h>
+#include <stdlib.h>
 
 /* Type identifier for fbrowser */
 static int fbrowser_type_id = -1;
diff --git a/src/widgets/flist.c b/src/widgets/flist.c
index 1abafd3..4bae050 100644
--- a/src/widgets/flist.c
+++ b/src/widgets/flist.c
@@ -1,7 +1,7 @@
 #include <ft/widgets/flist.h>
 #include <ft/util.h>
 #include <justui/jwidget-api.h>
-#include <gint/std/stdlib.h>
+#include <stdlib.h>
 
 /* Type identifier for flist */
 static int flist_type_id = -1;
diff --git a/src/widgets/flog.c b/src/widgets/flog.c
index 676c972..a29d19f 100644
--- a/src/widgets/flog.c
+++ b/src/widgets/flog.c
@@ -1,8 +1,8 @@
 #include <ft/widgets/flog.h>
-#include <justui/jwidget-api.h>
-#include <gint/std/stdlib.h>
-#include <gint/std/string.h>
 #include <ft/util.h>
+#include <justui/jwidget-api.h>
+#include <stdlib.h>
+#include <string.h>
 
 /* Type identifier for flog */
 static int flog_type_id = -1;
diff --git a/src/widgets/gscreen.c b/src/widgets/gscreen.c
index 2b6b62b..887fd91 100644
--- a/src/widgets/gscreen.c
+++ b/src/widgets/gscreen.c
@@ -1,6 +1,6 @@
 #include <ft/widgets/gscreen.h>
 #include <ft/util.h>
-#include <gint/std/stdlib.h>
+#include <stdlib.h>
 #include <stdarg.h>
 
 #include <justui/jscene.h>
diff --git a/src/widgets/gtable.c b/src/widgets/gtable.c
index 4c85dc2..6fd655c 100644
--- a/src/widgets/gtable.c
+++ b/src/widgets/gtable.c
@@ -1,6 +1,6 @@
 #include <ft/widgets/gtable.h>
 #include <justui/jwidget-api.h>
-#include <gint/std/stdlib.h>
+#include <stdlib.h>
 #include <stdarg.h>
 
 struct gtable_column {