4 files changed, 3 insertions, 65 deletions
diff --git a/lib/libc/include/__locale.h b/lib/libc/include/__locale.h
deleted file mode 100644
index 0a709c78..00000000
--- a/lib/libc/include/__locale.h
+++ /dev/null
@@ -1,41 +0,0 @@
-#ifndef __LIBC_LOCALE_H
-#define __LIBC_LOCALE_H
-
-#include <locale.h>
-#include <stdint.h>
-
-typedef __SIZE_TYPE__ size_t;
-
-struct __locale_t {
-	struct __locale_map {
-		const void *map;
-		size_t map_size;
-		char name[24];
-	} maps[6];
-};
-
-typedef struct __locale_t *locale_t;
-
-static const struct __locale_t __c_locale = { 0 };
-
-static const struct __locale_t __utf8_locale = {
-	.maps[LC_CTYPE] = { .map = &((const uint32_t[]){ 0x950412de, 0, -1, -1,
-							 -1 }),
-			    .map_size = sizeof(uint32_t) * 5,
-			    .name = "C.UTF-8" },
-};
-
-#undef MB_CUR_MAX
-#define MB_CUR_MAX (((locale_t) & __utf8_locale) ? 4 : 1)
-
-static inline int __mb_cur_max(void)
-{
-	return MB_CUR_MAX;
-}
-
-static inline int __locale_allocated(locale_t loc)
-{
-	return loc != (locale_t)&__c_locale && loc != (locale_t)&__utf8_locale;
-}
-
-#endif
diff --git a/lib/libc/include/features.h b/lib/libc/include/features.h
index 62472259..8f7fa940 100644
--- a/lib/libc/include/features.h
+++ b/lib/libc/include/features.h
@@ -1,6 +1,6 @@
 #ifndef __LIBC_FEATURES_H
 #define __LIBC_FEATURES_H
 
-#define weak extern __attribute__((weak))
+#define __weak extern __attribute__((weak))
 
 #endif
diff --git a/lib/libc/include/io.h b/lib/libc/include/io.h
index 675a3cc3..ebda4b22 100644
--- a/lib/libc/include/io.h
+++ b/lib/libc/include/io.h
@@ -14,25 +14,6 @@ typedef __SIZE_TYPE__ size_t;
 #define _IO_EOF	 0x8
 #define _IO_WIDE 0x10
 
-/* Buffering modes */
-#define _IOFBF 0 /* Full buffering */
-#define _IOLBF 1 /* Line buffering */
-#define _IONBF 2 /* No buffering */
-
-/* File access modes */
-#ifndef O_RDONLY
-#define O_RDONLY  0
-#define O_WRONLY  1
-#define O_RDWR	  2
-#define O_ACCMODE 3
-#endif
-
-/* Atomic operations for threading */
-#define LIBC_LOCK(x)                             \
-	while (atomic_flag_test_and_set(&(x))) { \
-	}
-#define LIBC_UNLOCK(x) atomic_flag_clear(&(x))
-
 struct __FILE {
 	int fd;
 	uint32_t flags;
diff --git a/lib/libc/include/libc.h b/lib/libc/include/libc.h
index 3f5f2644..d59c2b3c 100644
--- a/lib/libc/include/libc.h
+++ b/lib/libc/include/libc.h
@@ -1,14 +1,13 @@
 #ifndef __LIBC_LIBC_H
 #define __LIBC_LIBC_H
 
-#include <__locale.h>
 #include <stdatomic.h>
 
 #define likely(x)     __builtin_expect(!!(x), 1)
 #define unlikely(x)   __builtin_expect(!!(x), 0)
-#define unused	      __attribute__((unused))
+#define __unused      __attribute__((unused))
 #define aligned(type) __attribute__((aligned(__alignof__(type))))
-#define weak	      __attribute__((__weak__))
+#define __weak	      __attribute__((__weak__))
 #define weak_reference(old, new) \
 	extern __typeof(old) new __attribute__((__weak__, __alias__(#old)))
 
@@ -21,7 +20,6 @@ static struct {
 		volatile atomic_flag malloc;
 		volatile atomic_flag environ;
 	} lock;
-	struct __locale_t locale;
 } libc = { .lock = { ATOMIC_FLAG_INIT, ATOMIC_FLAG_INIT, ATOMIC_FLAG_INIT } };
 
 #endif