3 files changed, 21 insertions, 6 deletions
diff --git a/nuttx/include/math.h b/nuttx/include/math.h
index 1aa9ce37e..c14220146 100755
--- a/nuttx/include/math.h
+++ b/nuttx/include/math.h
@@ -40,6 +40,12 @@
  * Included Files
  ****************************************************************************/
 
+#include <nuttx/config.h>
+
+#ifdef CONFIG_ARCH_MATH_H
+#  include <arch/math.h>
+#else
+
 /****************************************************************************
  * Type Definitions
  ****************************************************************************/
@@ -60,4 +66,5 @@ extern "C" {
 }
 #endif
 
+#endif /* CONFIG_ARCH_MATH_H */
 #endif /* __INCLUDE_MATH_H */
diff --git a/nuttx/include/stdbool.h b/nuttx/include/stdbool.h
index d1c06ffe1..ad73870e3 100755
--- a/nuttx/include/stdbool.h
+++ b/nuttx/include/stdbool.h
@@ -1,7 +1,7 @@
 /****************************************************************************
  * include/stdbool.h
  *
- *   Copyright (C) 2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,9 +41,12 @@
  ****************************************************************************/
 
 #include <nuttx/config.h>
-#include <nuttx/compiler.h>
 
-#include <stdint.h>
+#ifdef CONFIG_ARCH_STDBOOL_H
+#  include <arch/stdbool.h>
+#else
+#  include <nuttx/compiler.h>
+#  include <stdint.h>
 
 /****************************************************************************
  * Pre-processor Definitions
@@ -82,4 +85,5 @@
 
 typedef uint8_t _Bool8;
 
+#endif /* CONFIG_ARCH_STDBOOL_H */
 #endif /* __INCLUDE_STDBOOL_H */
diff --git a/nuttx/include/stdint.h b/nuttx/include/stdint.h
index d44b13639..9e814bce5 100755
--- a/nuttx/include/stdint.h
+++ b/nuttx/include/stdint.h
@@ -41,10 +41,13 @@
  ****************************************************************************/
 
 #include <nuttx/config.h>
-#include <nuttx/compiler.h>
 
-#include <arch/types.h>
-#include <limits.h>
+#ifdef CONFIG_ARCH_STDBOOL_H
+#  include <arch/stdbool.h>
+#else
+#  include <nuttx/compiler.h>
+#  include <arch/types.h>
+#  include <limits.h>
 
 /****************************************************************************
  * Pre-processor Definitions
@@ -289,4 +292,5 @@ typedef _int32_t     intmax_t;
 typedef _uint32_t    uintmax_t;
 #endif
 
+#endif /* CONFIG_ARCH_STDBOOL_H */
 #endif /* __INCLUDE_STDINT_H */