diff --git a/firmware/libc/include/inttypes.h b/firmware/libc/include/inttypes.h
index ddcaa988b1..ed6fd6d47c 100644
--- a/firmware/libc/include/inttypes.h
+++ b/firmware/libc/include/inttypes.h
@@ -18,11 +18,11 @@
  * KIND, either express or implied.
  *
  ****************************************************************************/
- 
 #ifndef __INTTYPES_H__
 #define __INTTYPES_H__
 
 #include <stdint.h>
+#include <limits.h>
 
 /* could possibly have (f)scanf format specifiers here */
 
diff --git a/firmware/libc/include/stdint.h b/firmware/libc/include/stdint.h
deleted file mode 100644
index a36dcf59b7..0000000000
--- a/firmware/libc/include/stdint.h
+++ /dev/null
@@ -1,112 +0,0 @@
-/***************************************************************************
- *             __________               __   ___.
- *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
- *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
- *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
- *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
- *                     \/            \/     \/    \/            \/
- * $Id$
- *
- * Copyright (C) 2005 by Dave Chapman
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
- * KIND, either express or implied.
- *
- ****************************************************************************/
-
-#ifndef __STDINT_H__
-#define __STDINT_H__
-
-#include <limits.h>
-
-/* 8 bit */
-#define INT8_MIN    SCHAR_MIN
-#define INT8_MAX    SCHAR_MAX
-#define UINT8_MAX   UCHAR_MAX
-#define int8_t      signed char
-#define uint8_t     unsigned char
-
-/* 16 bit */
-#if USHRT_MAX == 0xffff
-
-#define INT16_MIN   SHRT_MIN
-#define INT16_MAX   SHRT_MAX
-#define UINT16_MAX  USHRT_MAX
-#define int16_t     short
-#define uint16_t    unsigned short
-
-#endif
-
-/* 32 bit */
-#if ULONG_MAX == 0xfffffffful
-
-#define SIZE_MAX    ULONG_MAX
-#define INT32_MIN   LONG_MIN
-#define INT32_MAX   LONG_MAX
-#define UINT32_MAX  ULONG_MAX
-#define int32_t     long
-#define uint32_t    unsigned long
-
-#define INTPTR_MIN  LONG_MIN
-#define INTPTR_MAX  LONG_MAX
-#define UINTPTR_MAX ULONG_MAX
-#define intptr_t    long
-#define uintptr_t   unsigned long
-
-#elif UINT_MAX == 0xffffffffu
-
-#define SIZE_MAX    UINT_MAX
-#define INT32_MIN   INT_MIN
-#define INT32_MAX   INT_MAX
-#define UINT32_MAX  UINT_MAX
-#define int32_t     int
-#define uint32_t    unsigned int
-
-#endif
-
-/* 64 bit */
-#ifndef LLONG_MIN
-#define LLONG_MIN   ((long long)9223372036854775808ull)
-#endif
-
-#ifndef LLONG_MAX
-#define LLONG_MAX   9223372036854775807ll
-#endif
-
-#ifndef ULLONG_MAX
-#define ULLONG_MAX  18446744073709551615ull
-#endif
-
-#if ULONG_MAX == 0xffffffffffffffffull
-
-#define SIZE_MAX    ULONG_MAX
-#define INT64_MIN   LONG_MIN
-#define INT64_MAX   LONG_MAX
-#define UINT64_MAX  ULONG_MAX
-#define int64_t     long
-#define uint64_t    unsigned long
-
-#define INTPTR_MIN  LONG_MIN
-#define INTPTR_MAX  LONG_MAX
-#define UINTPTR_MAX ULONG_MAX
-#define intptr_t    long
-#define uintptr_t   unsigned long
-
-#else
-
-#define INT64_MIN   LLONG_MIN
-#define INT64_MAX   LLONG_MAX
-#define UINT64_MAX  ULLONG_MAX
-#define int64_t     long long
-#define uint64_t    unsigned long long
-
-#endif
-
-#define uintmax_t   unsigned long long
-#define intmax_t    long long
-#endif /* __STDINT_H__ */