diff --git a/src/gint/cpumem.c b/src/gint/cpumem.c
index 47ec439..1440d2c 100644
--- a/src/gint/cpumem.c
+++ b/src/gint/cpumem.c
@@ -2,11 +2,12 @@
 #include <gint/keyboard.h>
 #include <gint/display.h>
 #include <gint/mmu.h>
-#include <gint/std/stdio.h>
 
 #include <gintctl/gint.h>
 #include <gintctl/util.h>
 
+#include <stdio.h>
+
 /* TODO: Include <gint/cpu.h> */
 extern uint32_t cpu_getVBR(void);
 
diff --git a/src/gint/dma.c b/src/gint/dma.c
index 15ac3d8..3cf9348 100644
--- a/src/gint/dma.c
+++ b/src/gint/dma.c
@@ -1,4 +1,3 @@
-#include <gint/std/stdio.h>
 #include <gint/dma.h>
 #include <gint/mpu/dma.h>
 #include <gint/display.h>
@@ -8,6 +7,8 @@
 #include <gintctl/util.h>
 #include <gintctl/gint.h>
 
+#include <stdio.h>
+
 #define DMA SH7305_DMA
 #define dprint(x, y, ...) dprint(x, y, C_BLACK, __VA_ARGS__)
 
diff --git a/src/gint/drivers.c b/src/gint/drivers.c
index d5ed77d..fea8e55 100644
--- a/src/gint/drivers.c
+++ b/src/gint/drivers.c
@@ -7,12 +7,13 @@
 #include <gint/hardware.h>
 #include <gint/mpu/tmu.h>
 #include <gint/mpu/dma.h>
-#include <gint/std/string.h>
 
 #include <gintctl/gint.h>
 #include <gintctl/util.h>
 #include <gintctl/assets.h>
 
+#include <string.h>
+
 //---
 // Driver list and information
 //---
diff --git a/src/gint/dump.c b/src/gint/dump.c
index 188bc6e..2184663 100644
--- a/src/gint/dump.c
+++ b/src/gint/dump.c
@@ -2,12 +2,13 @@
 #include <gint/keyboard.h>
 #include <gint/bfile.h>
 #include <gint/gint.h>
-#include <gint/std/stdio.h>
 #include <gint/hardware.h>
 
 #include <gintctl/util.h>
 #include <gintctl/gint.h>
 
+#include <stdio.h>
+
 struct region {
 	char const *name;
 	uint32_t start;
diff --git a/src/gint/gray.c b/src/gint/gray.c
index c87ce39..55bfe8b 100644
--- a/src/gint/gray.c
+++ b/src/gint/gray.c
@@ -3,10 +3,11 @@
 #include <gint/gray.h>
 #include <gint/keyboard.h>
 #include <gint/hardware.h>
-#include <gint/std/string.h>
-#include <gint/std/stdio.h>
 #include <gintctl/gint.h>
 
+#include <string.h>
+#include <stdio.h>
+
 /* gintctl_gint_gray(): Gray engine tuning */
 void gintctl_gint_gray(void)
 {
diff --git a/src/gint/kmalloc.c b/src/gint/kmalloc.c
index 4d3e6d1..c675bd3 100644
--- a/src/gint/kmalloc.c
+++ b/src/gint/kmalloc.c
@@ -1,8 +1,6 @@
 #include <gint/kmalloc.h>
 #include <gint/display.h>
 #include <gint/keyboard.h>
-#include <gint/std/string.h>
-#include <gint/std/stdlib.h>
 #include <gint/hardware.h>
 #include <gint/rtc.h>
 #include <gint/defs/util.h>
@@ -11,6 +9,9 @@
 #include <gintctl/util.h>
 #include <gintctl/assets.h>
 
+#include <string.h>
+#include <stdlib.h>
+
 //---
 // Arena information
 //---
diff --git a/src/gint/ram.c b/src/gint/ram.c
index d9105b3..87307b9 100644
--- a/src/gint/ram.c
+++ b/src/gint/ram.c
@@ -1,10 +1,10 @@
-#include <gint/std/stdio.h>
 #include <gint/display.h>
 #include <gint/keyboard.h>
 
 #include <gintctl/util.h>
 #include <gintctl/gint.h>
 
+#include <stdio.h>
 #include <stdbool.h>
 
 /* Byte-based memory detection functions */
diff --git a/src/gint/rtc.c b/src/gint/rtc.c
index ab9ac91..55b22fe 100644
--- a/src/gint/rtc.c
+++ b/src/gint/rtc.c
@@ -4,13 +4,14 @@
 #include <gint/timer.h>
 #include <gint/clock.h>
 #include <gint/gint.h>
-#include <gint/std/stdio.h>
 
 #include <gintctl/gint.h>
 #include <gintctl/util.h>
 
 #include <libprof.h>
 
+#include <stdio.h>
+
 //---
 //	Date and time display
 //---
diff --git a/src/gint/timer.c b/src/gint/timer.c
index 0710e21..e47489c 100644
--- a/src/gint/timer.c
+++ b/src/gint/timer.c
@@ -1,5 +1,4 @@
 #include <gint/mpu/tmu.h>
-#include <gint/std/stdio.h>
 #include <gint/timer.h>
 #include <gint/display.h>
 #include <gint/keyboard.h>
@@ -8,6 +7,8 @@
 #include <gintctl/util.h>
 #include <gintctl/gint.h>
 
+#include <stdio.h>
+
 /* timer_print(): Print a timer's details */
 void timer_print(int x, int y, char const *name, uint32_t TCOR, uint32_t TCNT,
 	int UNIE, int UNF, int STR)
diff --git a/src/gint/usb.c b/src/gint/usb.c
index cd9b213..ebe38c1 100644
--- a/src/gint/usb.c
+++ b/src/gint/usb.c
@@ -10,8 +10,6 @@
 #include <gint/mpu/power.h>
 #include <gint/mpu/cpg.h>
 #include <gint/defs/util.h>
-#include <gint/std/stdio.h>
-#include <gint/std/string.h>
 #include <gint/bfile.h>
 #include <gint/gint.h>
 
@@ -21,6 +19,9 @@
 
 #include <libprof.h>
 
+#include <stdio.h>
+#include <string.h>
+
 #define USB SH7305_USB
 
 /* USB log buffer */
diff --git a/src/libs/bfile.c b/src/libs/bfile.c
index 3f9fa04..57693a6 100644
--- a/src/libs/bfile.c
+++ b/src/libs/bfile.c
@@ -2,7 +2,6 @@
 #include <gint/bfile.h>
 #include <gint/display.h>
 #include <gint/keyboard.h>
-#include <gint/std/stdio.h>
 
 #include <gintctl/libs.h>
 #include <gintctl/util.h>
@@ -11,6 +10,8 @@
 #include <gintctl/widgets/gscreen.h>
 #include <gintctl/widgets/gtable.h>
 
+#include <stdio.h>
+
 /* Names and file informations (allocated on the stack) */
 static uint16_t (*test_names)[32][32];
 static struct BFile_FileInfo *test_infos;
diff --git a/src/libs/justui.c b/src/libs/justui.c
index 3a043a2..e2df242 100644
--- a/src/libs/justui.c
+++ b/src/libs/justui.c
@@ -1,6 +1,5 @@
 #include <gint/keyboard.h>
 #include <gint/display.h>
-#include <gint/std/stdio.h>
 
 #include <gintctl/libs.h>
 #include <gintctl/widgets/gscreen.h>
@@ -15,6 +14,8 @@
 #include <justui/jpainted.h>
 #include <justui/jfkeys.h>
 
+#include <stdio.h>
+
 static int recursive_widget_count(void *w0)
 {
 	J_CAST(w)
diff --git a/src/libs/memory.c b/src/libs/memory.c
index 7c61445..b3f3144 100644
--- a/src/libs/memory.c
+++ b/src/libs/memory.c
@@ -13,7 +13,6 @@
 //---
 
 #include <gint/defs/types.h>
-#include <gint/std/string.h>
 #include <gint/display.h>
 #include <gint/keyboard.h>
 #include <gint/exc.h>
@@ -21,6 +20,8 @@
 #include <gintctl/libs.h>
 #include <gintctl/util.h>
 
+#include <string.h>
+
 /* Source buffer, used as a data source when copying */
 GALIGNED(4) static uint8_t *src;
 /* Destination buffer, used as destination when copying or clearing */
diff --git a/src/libs/printf.c b/src/libs/printf.c
index 3cded69..90133c0 100644
--- a/src/libs/printf.c
+++ b/src/libs/printf.c
@@ -1,14 +1,13 @@
-#include <gint/std/stdio.h>
-#include <gint/std/string.h>
 #include <gint/display.h>
 #include <gint/keyboard.h>
 
-#include <stdarg.h>
-#include <stdint.h>
-
 #include <gintctl/gint.h>
 #include <gintctl/util.h>
 
+#include <stdio.h>
+#include <string.h>
+#include <stdint.h>
+
 #define NAN __builtin_nan("")
 #define INFINITY __builtin_inf()
 
diff --git a/src/libs/tinymt.c b/src/libs/tinymt.c
index 5ab0ecb..6dbdd94 100644
--- a/src/libs/tinymt.c
+++ b/src/libs/tinymt.c
@@ -1,10 +1,11 @@
 #include <gint/display.h>
 #include <gint/keyboard.h>
-#include <gint/std/stdlib.h>
 
 #include <gintctl/libs.h>
 #include <gintctl/util.h>
 
+#include <stdlib.h>
+
 void gintctl_libs_tinymt(void)
 {
 	int key = 0;
diff --git a/src/mem/mem.c b/src/mem/mem.c
index 0ae44af..c49c592 100644
--- a/src/mem/mem.c
+++ b/src/mem/mem.c
@@ -1,6 +1,5 @@
 #include <gint/display.h>
 #include <gint/keyboard.h>
-#include <gint/std/stdio.h>
 #include <gint/exc.h>
 
 #include <gintctl/mem.h>
@@ -11,6 +10,8 @@
 #include <justui/jpainted.h>
 #include <justui/jinput.h>
 
+#include <stdio.h>
+
 struct view {
 	uint32_t base;
 	bool ascii;
diff --git a/src/perf/cpucache.c b/src/perf/cpucache.c
index 13060c0..0eb7889 100644
--- a/src/perf/cpucache.c
+++ b/src/perf/cpucache.c
@@ -1,7 +1,6 @@
 #include <gint/display.h>
 #include <gint/keyboard.h>
 #include <gint/clock.h>
-#include <gint/std/stdio.h>
 
 #include <gintctl/perf.h>
 #include <gintctl/util.h>
@@ -9,6 +8,8 @@
 
 #include <libprof.h>
 
+#include <stdio.h>
+
 #define CACHE_MAX 4096
 #define SAMPLES 129
 
diff --git a/src/perf/memory.c b/src/perf/memory.c
index a8af278..dce9e6b 100644
--- a/src/perf/memory.c
+++ b/src/perf/memory.c
@@ -2,7 +2,6 @@
 #include <gint/keyboard.h>
 #include <gint/hardware.h>
 #include <gint/dma.h>
-#include <gint/std/string.h>
 #include <gint/mmu.h>
 
 #include <gintctl/perf.h>
@@ -11,6 +10,8 @@
 
 #include <libprof.h>
 
+#include <string.h>
+
 extern void memory_read(volatile uint8_t *area, uint32_t size);
 extern void memory_write(volatile uint8_t *area, uint32_t size);
 extern void memory_dsp_xram_memset(volatile uint8_t *area, uint32_t size);
diff --git a/src/perf/render.c b/src/perf/render.c
index 2ac9f37..fac600c 100644
--- a/src/perf/render.c
+++ b/src/perf/render.c
@@ -1,12 +1,13 @@
 #include <gint/keyboard.h>
 #include <gint/display.h>
-#include <gint/std/stdio.h>
 
 #include <gintctl/util.h>
 #include <gintctl/perf.h>
 
 #include <libprof.h>
 
+#include <stdio.h>
+
 struct elapsed {
 	uint32_t clear;
 	uint32_t update;
diff --git a/src/plot.c b/src/plot.c
index b076d03..7ff6d5e 100644
--- a/src/plot.c
+++ b/src/plot.c
@@ -1,9 +1,10 @@
 #include <gint/display.h>
-#include <gint/std/stdio.h>
 
 #include <gintctl/plot.h>
 #include <gintctl/util.h>
 
+#include <stdio.h>
+
 struct tick_info
 {
 	int count;
diff --git a/src/util.c b/src/util.c
index d86ac0c..84f6bb4 100644
--- a/src/util.c
+++ b/src/util.c
@@ -1,10 +1,11 @@
 #include <gint/display.h>
-#include <gint/std/stdio.h>
 #include <gint/gint.h>
 #include <gint/bfile.h>
 
 #include <gintctl/util.h>
 
+#include <stdio.h>
+
 /* Short-shorthand for calling out vsprintf() */
 #define shortprint(str, format) {	\
 	va_list _args;			\
diff --git a/src/widgets/gscreen.c b/src/widgets/gscreen.c
index 2f7a34b..9d60069 100644
--- a/src/widgets/gscreen.c
+++ b/src/widgets/gscreen.c
@@ -1,12 +1,13 @@
 #include <gintctl/widgets/gscreen.h>
 #include <gintctl/assets.h>
 #include <gintctl/util.h>
-#include <gint/std/stdlib.h>
 
 #include <justui/jscene.h>
 #include <justui/jlabel.h>
 #include <justui/jfkeys.h>
 
+#include <stdlib.h>
+
 #ifdef FX9860G
 gscreen *gscreen_create(char const *name, bopti_image_t const *img)
 #endif
diff --git a/src/widgets/gtable.c b/src/widgets/gtable.c
index 443e0fd..d83a516 100644
--- a/src/widgets/gtable.c
+++ b/src/widgets/gtable.c
@@ -1,7 +1,8 @@
 #include <gintctl/widgets/gtable.h>
 #include <justui/jwidget-api.h>
-#include <gint/std/stdlib.h>
 #include <gintctl/util.h>
+
+#include <stdlib.h>
 #include <stdarg.h>
 
 struct gtable_column {