From 506df9a17526998c305ae2ffc46e6a5b197548e2 Mon Sep 17 00:00:00 2001
From: auronandace <auronandace@googlemail.com>
Date: Tue, 3 Feb 2026 11:11:41 +0000
Subject: [PATCH 1/2] signal and wchar header cleanup

---
 src/header/signal/linux.rs  | 2 +-
 src/header/wchar/utf8.rs    | 2 +-
 src/header/wchar/wprintf.rs | 3 +--
 src/header/wchar/wscanf.rs  | 2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/header/signal/linux.rs b/src/header/signal/linux.rs
index 77bff6c317..960d53e2f6 100644
--- a/src/header/signal/linux.rs
+++ b/src/header/signal/linux.rs
@@ -1,5 +1,5 @@
 use super::{siginfo_t, sigset_t, stack_t};
-use crate::platform::types::*;
+use crate::platform::types::c_ulong;
 use core::arch::global_asm;
 
 // Needs to be defined in assembly because it can't have a function prologue
diff --git a/src/header/wchar/utf8.rs b/src/header/wchar/utf8.rs
index f56a0b941b..2829eabd36 100644
--- a/src/header/wchar/utf8.rs
+++ b/src/header/wchar/utf8.rs
@@ -5,7 +5,7 @@ use core::{char, slice, str, usize};
 
 use crate::{
     header::errno,
-    platform::{self, types::*},
+    platform::{self, types::{c_char, wchar_t}},
 };
 
 use super::mbstate_t;
diff --git a/src/header/wchar/wprintf.rs b/src/header/wchar/wprintf.rs
index 8e0d46b9c7..067278994a 100644
--- a/src/header/wchar/wprintf.rs
+++ b/src/header/wchar/wprintf.rs
@@ -3,11 +3,10 @@ use crate::{
     c_str::{self, WStr},
     header::stdio::printf::inner_printf,
     io::Write,
+    platform::{self, types::c_int},
 };
 use core::ffi::VaList;
 
-use crate::platform::{self, types::*};
-
 pub unsafe fn wprintf(w: impl Write, format: WStr, ap: VaList) -> c_int {
     unsafe { inner_printf::<c_str::Wide>(w, format, ap).unwrap_or(-1) }
 }
diff --git a/src/header/wchar/wscanf.rs b/src/header/wchar/wscanf.rs
index 8edffd841a..4fd37361b7 100644
--- a/src/header/wchar/wscanf.rs
+++ b/src/header/wchar/wscanf.rs
@@ -1,5 +1,5 @@
 use super::lookaheadreader::LookAheadReader;
-use crate::platform::types::*;
+use crate::platform::types::{c_char, c_double, c_float, c_int, c_long, c_longlong, c_short, c_uchar, c_uint, c_ulong, c_ulonglong, c_ushort, c_void, intmax_t, ptrdiff_t, size_t, ssize_t, uintmax_t, wchar_t, wint_t};
 use alloc::{string::String, vec::Vec};
 use core::ffi::VaList as va_list;
 

From d2d45f0c750c9d8b108737328618b3c2f0a13289 Mon Sep 17 00:00:00 2001
From: auronandace <auronandace@googlemail.com>
Date: Tue, 3 Feb 2026 11:14:01 +0000
Subject: [PATCH 2/2] cargo fmt

---
 src/header/wchar/utf8.rs   | 5 ++++-
 src/header/wchar/wscanf.rs | 6 +++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/header/wchar/utf8.rs b/src/header/wchar/utf8.rs
index 2829eabd36..b26970227c 100644
--- a/src/header/wchar/utf8.rs
+++ b/src/header/wchar/utf8.rs
@@ -5,7 +5,10 @@ use core::{char, slice, str, usize};
 
 use crate::{
     header::errno,
-    platform::{self, types::{c_char, wchar_t}},
+    platform::{
+        self,
+        types::{c_char, wchar_t},
+    },
 };
 
 use super::mbstate_t;
diff --git a/src/header/wchar/wscanf.rs b/src/header/wchar/wscanf.rs
index 4fd37361b7..a0bb786970 100644
--- a/src/header/wchar/wscanf.rs
+++ b/src/header/wchar/wscanf.rs
@@ -1,5 +1,9 @@
 use super::lookaheadreader::LookAheadReader;
-use crate::platform::types::{c_char, c_double, c_float, c_int, c_long, c_longlong, c_short, c_uchar, c_uint, c_ulong, c_ulonglong, c_ushort, c_void, intmax_t, ptrdiff_t, size_t, ssize_t, uintmax_t, wchar_t, wint_t};
+use crate::platform::types::{
+    c_char, c_double, c_float, c_int, c_long, c_longlong, c_short, c_uchar, c_uint, c_ulong,
+    c_ulonglong, c_ushort, c_void, intmax_t, ptrdiff_t, size_t, ssize_t, uintmax_t, wchar_t,
+    wint_t,
+};
 use alloc::{string::String, vec::Vec};
 use core::ffi::VaList as va_list;