From 8e730c2f7863cf97e1029c428ee69fda72c91c9b Mon Sep 17 00:00:00 2001
From: Lephe <sebastien.michelland@protonmail.com>
Date: Tue, 8 Jun 2021 11:01:13 +0200
Subject: [PATCH] replace gint/std headers with standard ones

---
 src/gray/engine.c         | 4 ++--
 src/intc/intc.c           | 3 ++-
 src/kernel/hardware.c     | 3 ++-
 src/kernel/kernel.c       | 5 +++--
 src/kernel/osmenu.c       | 3 ++-
 src/kernel/world.c        | 3 ++-
 src/keysc/keydev.c        | 3 ++-
 src/kmalloc/arena_gint.c  | 3 ++-
 src/kmalloc/kmalloc.c     | 3 ++-
 src/render-cg/topti.c     | 3 ++-
 src/render/dprint.c       | 2 +-
 src/usb/classes/ff-bulk.c | 3 ++-
 src/usb/pipes.c           | 4 +++-
 src/usb/setup.c           | 6 ++++--
 src/usb/string.c          | 5 +++--
 15 files changed, 34 insertions(+), 19 deletions(-)

diff --git a/src/gray/engine.c b/src/gray/engine.c
index 764105c..08aa9bf 100644
--- a/src/gray/engine.c
+++ b/src/gray/engine.c
@@ -3,13 +3,13 @@
 //---
 
 #include <gint/defs/types.h>
-#include <gint/std/stdlib.h>
-
 #include <gint/drivers/t6k11.h>
 #include <gint/gray.h>
 #include <gint/display.h>
 #include <gint/timer.h>
 
+#include <stdlib.h>
+
 #include "../render-fx/render-fx.h"
 
 /* Three additional video RAMS, allocated statically if --static-gray was set
diff --git a/src/intc/intc.c b/src/intc/intc.c
index fe3bccf..677a173 100644
--- a/src/intc/intc.c
+++ b/src/intc/intc.c
@@ -5,7 +5,8 @@
 #include <gint/hardware.h>
 #include <gint/cpu.h>
 #include <gint/mpu/intc.h>
-#include <gint/std/string.h>
+
+#include <string.h>
 
 //---
 // Interrupt controllers
diff --git a/src/kernel/hardware.c b/src/kernel/hardware.c
index 129abd0..4fc8491 100644
--- a/src/kernel/hardware.c
+++ b/src/kernel/hardware.c
@@ -8,7 +8,8 @@
 #include <gint/defs/types.h>
 #include <gint/defs/util.h>
 #include <gint/mpu/pfc.h>
-#include <gint/std/string.h>
+
+#include <string.h>
 
 /* Holds information about the current platform */
 GBSS uint32_t gint[HW_KEYS];
diff --git a/src/kernel/kernel.c b/src/kernel/kernel.c
index bf23881..168c70d 100644
--- a/src/kernel/kernel.c
+++ b/src/kernel/kernel.c
@@ -4,14 +4,15 @@
 
 #include <gint/gint.h>
 #include <gint/drivers.h>
-#include <gint/std/string.h>
-#include <gint/std/stdlib.h>
 #include <gint/hardware.h>
 #include <gint/mmu.h>
 #include <gint/mpu/intc.h>
 #include <gint/kmalloc.h>
 #include <gint/cpu.h>
 
+#include <string.h>
+#include <stdlib.h>
+
 #include "vbr.h"
 #include "kernel.h"
 
diff --git a/src/kernel/osmenu.c b/src/kernel/osmenu.c
index e5cdaaa..8e726bb 100644
--- a/src/kernel/osmenu.c
+++ b/src/kernel/osmenu.c
@@ -1,6 +1,7 @@
 #include <gint/gint.h>
 #include <gint/display.h>
-#include <gint/std/string.h>
+
+#include <string.h>
 
 int   __Timer_Install(int id, void (*handler)(void), int delay);
 int   __Timer_Start(int id);
diff --git a/src/kernel/world.c b/src/kernel/world.c
index 0d5f2d1..1f71403 100644
--- a/src/kernel/world.c
+++ b/src/kernel/world.c
@@ -2,7 +2,8 @@
 #include <gint/cpu.h>
 #include <gint/gint.h>
 #include <gint/defs/call.h>
-#include <gint/std/stdlib.h>
+
+#include <stdlib.h>
 
 //---
 // World buffer
diff --git a/src/keysc/keydev.c b/src/keysc/keydev.c
index 3e5ab28..54bff15 100644
--- a/src/keysc/keydev.c
+++ b/src/keysc/keydev.c
@@ -6,7 +6,8 @@
 #include <gint/drivers/keydev.h>
 #include <gint/defs/types.h>
 #include <gint/defs/util.h>
-#include <gint/std/string.h>
+
+#include <string.h>
 #include <stdarg.h>
 
 void keydev_init(keydev_t *d)
diff --git a/src/kmalloc/arena_gint.c b/src/kmalloc/arena_gint.c
index 7cbdbc2..1888bc5 100644
--- a/src/kmalloc/arena_gint.c
+++ b/src/kmalloc/arena_gint.c
@@ -3,10 +3,11 @@
 //---
 
 #include <gint/kmalloc.h>
-#include <gint/std/string.h>
 #include <gint/defs/attributes.h>
 #include <gint/defs/util.h>
 
+#include <string.h>
+
 /* block_t: A memory block managed by the heap.
 
    The heap is a sequence of blocks made of a block_t header (4 bytes) and raw
diff --git a/src/kmalloc/kmalloc.c b/src/kmalloc/kmalloc.c
index 8e6d408..9d8e179 100644
--- a/src/kmalloc/kmalloc.c
+++ b/src/kmalloc/kmalloc.c
@@ -4,9 +4,10 @@
 
 #include <gint/kmalloc.h>
 #include <gint/defs/util.h>
-#include <gint/std/string.h>
 #include <gint/config.h>
 
+#include <string.h>
+
 /* Maximum number of arenas */
 #define KMALLOC_ARENA_MAX 8
 
diff --git a/src/render-cg/topti.c b/src/render-cg/topti.c
index 17f2e89..87bb873 100644
--- a/src/render-cg/topti.c
+++ b/src/render-cg/topti.c
@@ -1,7 +1,8 @@
 #include <gint/defs/types.h>
 #include <gint/defs/attributes.h>
 #include <gint/display.h>
-#include <gint/std/string.h>
+
+#include <string.h>
 
 #include "../render/render.h"
 #include "topti-asm.h"
diff --git a/src/render/dprint.c b/src/render/dprint.c
index eac0160..2ddc082 100644
--- a/src/render/dprint.c
+++ b/src/render/dprint.c
@@ -1,5 +1,5 @@
 #include <gint/display.h>
-#include <gint/std/stdio.h>
+#include <stdio.h>
 
 /* dprint(): Display a formatted string */
 void dprint_opt(int x, int y, int fg, int bg, int halign, int valign,
diff --git a/src/usb/classes/ff-bulk.c b/src/usb/classes/ff-bulk.c
index 07a8243..cf6deda 100644
--- a/src/usb/classes/ff-bulk.c
+++ b/src/usb/classes/ff-bulk.c
@@ -1,7 +1,8 @@
 #include <gint/usb.h>
 #include <gint/usb-ff-bulk.h>
 #include <gint/display.h>
-#include <gint/std/string.h>
+
+#include <string.h>
 
 static usb_dc_interface_t dc_interface = {
 	.bLength              = sizeof(usb_dc_interface_t),
diff --git a/src/usb/pipes.c b/src/usb/pipes.c
index 26e32fe..492646c 100644
--- a/src/usb/pipes.c
+++ b/src/usb/pipes.c
@@ -3,7 +3,9 @@
 #include <gint/clock.h>
 #include <gint/dma.h>
 #include <gint/defs/util.h>
-#include <gint/std/string.h>
+
+#include <string.h>
+
 #include "usb_private.h"
 
 #define USB SH7305_USB
diff --git a/src/usb/setup.c b/src/usb/setup.c
index 7a0ce15..710e283 100644
--- a/src/usb/setup.c
+++ b/src/usb/setup.c
@@ -1,8 +1,10 @@
 #include <gint/usb.h>
 #include <gint/mpu/usb.h>
-#include <gint/std/endian.h>
-#include "usb_private.h"
+
 #include <stdarg.h>
+#include <endian.h>
+
+#include "usb_private.h"
 
 #define USB SH7305_USB
 
diff --git a/src/usb/string.c b/src/usb/string.c
index 83d0940..d7e97a9 100644
--- a/src/usb/string.c
+++ b/src/usb/string.c
@@ -3,8 +3,9 @@
 //---
 
 #include <gint/usb.h>
-#include <gint/std/stdlib.h>
-#include <gint/std/string.h>
+
+#include <stdlib.h>
+#include <string.h>
 
 /* String descriptor array */
 static usb_dc_string_t **array = NULL;