6 files changed, 5 insertions, 94 deletions
diff --git a/lib/libc/include/bits/types.h b/lib/libc/include/bits/types.h
deleted file mode 100644
index 7b0c2f4..0000000
--- a/lib/libc/include/bits/types.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (c) 2023-2025 Ian Marco Moffett and the Osmora Team.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of Hyra nor the names of its
- *    contributors may be used to endorse or promote products derived from
- *    this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef _BITS_TYPES_H
-#define _BITS_TYPES_H
-
-/* Fixed width integer types */
-typedef unsigned long       __size_t;
-typedef long                __ssize_t;
-typedef long                __ptrdiff_t;
-
-typedef unsigned char       __uint8_t;
-typedef unsigned short      __uint16_t;
-typedef unsigned int        __uint32_t;
-typedef unsigned long long  __uint64_t;
-
-typedef signed char         __int8_t;
-typedef short               __int16_t;
-typedef int                 __int32_t;
-typedef long long           __int64_t;
-
-/* Fixed width integer type limits */
-#define __INT8_MIN        (-0x7F - 1)
-#define __INT16_MIN       (-0x7FFF - 1)
-#define __INT32_MIN       (-0x7FFFFFFF - 1)
-#define __INT64_MIN       (-0x7FFFFFFFFFFFFFFFLL - 1)
-
-#define __INT8_MAX        0x7F
-#define __INT16_MAX       0x7FFF
-#define __INT32_MAX       0x7FFFFFFF
-#define __INT64_MAX       0x7FFFFFFFFFFFFFFFLL
-
-#define __UINT8_MAX       0xFF
-#define __UINT16_MAX      0xFFFF
-#define __UINT32_MAX      0xFFFFFFFFU
-#define __UINT64_MAX      0xFFFFFFFFFFFFFFFFULL
-
-#endif  /* !_BITS_TYPES_H */
diff --git a/lib/libc/include/fcntl.h b/lib/libc/include/fcntl.h
index 8b439d2..5f5ed8a 100644
--- a/lib/libc/include/fcntl.h
+++ b/lib/libc/include/fcntl.h
@@ -30,9 +30,8 @@
 #ifndef _FCNTL_H
 #define _FCNTL_H
 
-#include <sys/types.h>
-#include <sys/fcntl.h>
 #include <sys/cdefs.h>
+#include <sys/fcntl.h>
 
 __BEGIN_DECLS
 
diff --git a/lib/libc/include/stddef.h b/lib/libc/include/stddef.h
index 8b81c5b..557f69b 100644
--- a/lib/libc/include/stddef.h
+++ b/lib/libc/include/stddef.h
@@ -30,7 +30,7 @@
 #ifndef _STDDEF_H
 #define _STDDEF_H
 
-#include <bits/types.h>
+#include <sys/types.h>
 
 #if __cplusplus >= 201103L
 #define NULL nullptr
diff --git a/lib/libc/include/stdint.h b/lib/libc/include/stdint.h
index 9351933..7ea872d 100644
--- a/lib/libc/include/stdint.h
+++ b/lib/libc/include/stdint.h
@@ -30,32 +30,6 @@
 #ifndef _STDINT_H
 #define _STDINT_H
 
-#include <bits/types.h>
-
-typedef __uint8_t uint8_t;
-typedef __uint16_t uint16_t;
-typedef __uint32_t uint32_t;
-typedef __uint64_t uint64_t;
-typedef __size_t uintptr_t;
-
-typedef __int8_t int8_t;
-typedef __int16_t int16_t;
-typedef __int32_t int32_t;
-typedef __int64_t int64_t;
-
-#define INT8_MIN    __INT8_MIN
-#define INT16_MIN   __INT16_MIN
-#define INT32_MIN   __INT32_MIN
-#define INT64_MIN   __INT64_MIN
-
-#define INT8_MAX    __INT8_MAX
-#define INT16_MAX   __INT16_MAX
-#define INT32_MAX   __INT32_MAX
-#define INT64_MAX   __INT64_MAX
-
-#define UINT8_MAX    __UINT8_MAX
-#define UINT16_MAX   __UINT16_MAX
-#define UINT32_MAX   __UINT32_MAX
-#define UINT64_MAX   __UINT64_MAX
+#include <sys/types.h>
 
 #endif  /* !_STDINT_H */
diff --git a/lib/libc/include/unistd.h b/lib/libc/include/unistd.h
index c487d38..0a8c429 100644
--- a/lib/libc/include/unistd.h
+++ b/lib/libc/include/unistd.h
@@ -32,6 +32,7 @@
 
 #include <sys/types.h>
 #include <sys/cdefs.h>
+#include <stddef.h>
 
 __BEGIN_DECLS
 
diff --git a/lib/libc/src/unistd/open.c b/lib/libc/src/unistd/open.c
index 0131785..85b9710 100644
--- a/lib/libc/src/unistd/open.c
+++ b/lib/libc/src/unistd/open.c
@@ -28,6 +28,7 @@
  */
 
 #include <sys/syscall.h>
+#include <sys/types.h>
 #include <fcntl.h>
 
 int