diff --git a/include/inttypes.h b/include/inttypes.h
new file mode 100644
index 0000000000000000000000000000000000000000..77dfaa4e607161f87fa8393d44caa80f48c2e732
--- /dev/null
+++ b/include/inttypes.h
@@ -0,0 +1,190 @@
+/****************************************************************************
+ * include/inttypes.h
+ *
+ *   Copyright (C) 2010 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *
+ * 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 NuttX 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 __INCLUDE_INTTYPES_H
+#define __INCLUDE_INTTYPES_H
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+ 
+/* Notes from www.opengroup.org:
+ *
+ * "The <inttypes.h> header shall include the <stdint.h> header."
+ */
+
+#include <stdint.h>
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+ 
+/* "The following macros shall be defined. Each expands to a character string
+ *  literal containing a conversion specifier, possibly modified by a lengt
+ *  modifier, suitable for use within the format argument of a formatted
+ *  input/output function when converting the corresponding integer type.
+ *  These macros have the general form of PRI (character string literals for
+ *  the fprintf() and fwprintf() family of functions) or SCN (character string
+ *  literals for the fscanf() and fwscanf() family of functions), followed by
+ *  the conversion specifier, followed by a name corresponding to a similar
+ *  type name in <stdint.h>. In these names, N represents the width of the
+ *  type as described in <stdint.h>. For example, PRIdFAST32 can be used in a
+ *  format string to print the value of an integer of type int_fast32_t.
+ *
+ * "The fprintf() macros for signed integers are:
+ * 
+ * PRIdN
+ *  PRIdLEASTN
+ *  PRIdFASTN
+ *  PRIdMAX
+ *  PRIdPTR
+ * 
+ * PRIiN
+ *  PRIiLEASTN
+ *  PRIiFASTN
+ *  PRIiMAX
+ *  PRIiPTR
+ * 
+ * "The fprintf() macros for unsigned integers are:
+ * 
+ * PRIoN
+ *  PRIoLEASTN
+ *  PRIoFASTN
+ *  PRIoMAX
+ *  PRIoPTR
+ *  
+ * PRIuN
+ *  PRIuLEASTN
+ *  PRIuFASTN
+ *  PRIuMAX
+ *  PRIuPTR
+ *  
+ * PRIxN
+ *  PRIxLEASTN
+ *  PRIxFASTN
+ *  PRIxMAX
+ *  PRIxPTR
+ *  
+ * PRIXN
+ *  PRIXLEASTN
+ *  PRIXFASTN
+ *  PRIXMAX
+ *  PRIXPTR
+ *  
+ * "The fscanf() macros for signed integers are:
+ * 
+ * SCNdN
+ *  SCNdLEASTN
+ *  SCNdFASTN
+ *  SCNdMAX
+ *  SCNdPTR
+ * 
+ * SCNiN
+ *  SCNiLEASTN
+ *  SCNiFASTN
+ *  SCNiMAX
+ *  SCNiPTR
+ *  
+ * "The fscanf() macros for unsigned integers are:
+ * 
+ * SCNoN
+ *  SCNoLEASTN
+ *  SCNoFASTN
+ *  SCNoMAX
+ *  SCNoPTR
+ *  
+ * SCNuN
+ *  SCNuLEASTN
+ *  SCNuFASTN
+ *  SCNuMAX
+ *  SCNuPTR
+ *  
+ * SCNxN
+ *  SCNxLEASTN
+ *  SCNxFASTN
+ *  SCNxMAX
+ *  SCNxPTR
+ * 
+ * "For each type that the implementation provides in <stdint.h>, the
+ * corresponding fprintf() and fwprintf() macros shall be defined and the
+ * corresponding fscanf() and fwscanf() macros shall be defined unless the
+ * implementation does not have a suitable modifier for the type.
+ */
+
+/****************************************************************************
+ * Type Definitions
+ ****************************************************************************/
+
+/* "The <inttypes.h> header shall include a definition of at least the
+ * following type:
+ *
+ * imaxdiv_t 
+ *   Structure type that is the type of the value returned by the imaxdiv()
+ *   function.
+ */
+
+typedef void *imaxdiv_t; /* Dummy type since imaxdiv is not yet supported */
+
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
+
+#ifdef __cplusplus
+#define EXTERN extern "C"
+extern "C" {
+#else
+#define EXTERN extern
+#endif
+
+/* "The following shall be declared as functions and may also be defined as
+ *  macros. Function prototypes shall be provided."
+ */
+
+EXTERN intmax_t  imaxabs(intmax_t);
+EXTERN imaxdiv_t imaxdiv(intmax_t, intmax_t);
+EXTERN intmax_t  strtoimax(const char *, char **, int);
+EXTERN uintmax_t strtoumax(const char *, char **, int);
+
+#if 0 /* No wchar_t */
+EXTERN intmax_t  wcstoimax(const wchar_t *, wchar_t **, int);
+EXTERN uintmax_t wcstoumax(const wchar_t *, wchar_t **, int);
+#endif
+
+#undef EXTERN
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __INCLUDE_INTTYPES_H */
diff --git a/include/stdlib.h b/include/stdlib.h
index 7509768a19f7c3a23cb95646673db3c7bea6148a..ff28d8093b4742a609c7f9549b7e75d4701c8688 100644
--- a/include/stdlib.h
+++ b/include/stdlib.h
@@ -153,7 +153,6 @@ EXTERN long int   labs(long int j);
 #ifdef CONFIG_HAVE_LONG_LONG
 EXTERN long long int llabs(long long int j);
 #endif
-EXTERN intmax_t   imaxabs(intmax_t j);
 
 /* Sorting */
 
diff --git a/lib/lib_imaxabs.c b/lib/lib_imaxabs.c
index f37f39c57e829faad714304bef4d4a7226cab693..7b474cd0fa9c4f332ced1ed622f532c38b475326 100644
--- a/lib/lib_imaxabs.c
+++ b/lib/lib_imaxabs.c
@@ -38,8 +38,7 @@
  ************************************************************************/
 
 #include <nuttx/config.h>
-#include <stdint.h>
-#include <stdlib.h>
+#include <inttypes.h>
 
 /************************************************************************
  * Global Functions