diff --git a/include/nuttx/math32.h b/include/nuttx/lib/math32.h
similarity index 98%
rename from include/nuttx/math32.h
rename to include/nuttx/lib/math32.h
index 64e993d7905..ba70f3184d1 100644
--- a/include/nuttx/math32.h
+++ b/include/nuttx/lib/math32.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * include/nuttx/math32.h
+ * include/nuttx/lib/math32.h
  *
  *   Copyright (C) 2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ****************************************************************************/
 
-#ifndef __INCLUDE_NUTTX_MATH32_H
-#define __INCLUDE_NUTTX_MATH32_H
+#ifndef __INCLUDE_NUTTX_LIB_MATH32_H
+#define __INCLUDE_NUTTX_LIB_MATH32_H
 
 /****************************************************************************
  * Included Files
@@ -238,4 +238,4 @@ void umul64(FAR const struct uint64_s *factor1,
 }
 #endif
 
-#endif /* __INCLUDE_NUTTX_MATH32_H */
+#endif /* __INCLUDE_NUTTX_LIB_MATH32_H */
diff --git a/libc/misc/lib_uadd32x64.c b/libc/misc/lib_uadd32x64.c
index 68800e55295..291a282d7c7 100644
--- a/libc/misc/lib_uadd32x64.c
+++ b/libc/misc/lib_uadd32x64.c
@@ -37,7 +37,7 @@
  * Included Files
  ****************************************************************************/
 
-#include <nuttx/math32.h>
+#include <nuttx/lib/math32.h>
 
 /****************************************************************************
  * Public Functions
diff --git a/libc/misc/lib_uadd64.c b/libc/misc/lib_uadd64.c
index c9e634d1eef..8d071687915 100644
--- a/libc/misc/lib_uadd64.c
+++ b/libc/misc/lib_uadd64.c
@@ -37,7 +37,7 @@
  * Included Files
  ****************************************************************************/
 
-#include <nuttx/math32.h>
+#include <nuttx/lib/math32.h>
 
 /****************************************************************************
  * Public Functions
diff --git a/libc/misc/lib_umul32.c b/libc/misc/lib_umul32.c
index b245e10ee05..27540c08efa 100644
--- a/libc/misc/lib_umul32.c
+++ b/libc/misc/lib_umul32.c
@@ -37,7 +37,7 @@
  * Included Files
  ****************************************************************************/
 
-#include <nuttx/math32.h>
+#include <nuttx/lib/math32.h>
 
 /****************************************************************************
  * Public Functions
diff --git a/libc/misc/lib_umul32x64.c b/libc/misc/lib_umul32x64.c
index ca37fa2ea8d..b7c4510f013 100644
--- a/libc/misc/lib_umul32x64.c
+++ b/libc/misc/lib_umul32x64.c
@@ -37,7 +37,7 @@
  * Included Files
  ****************************************************************************/
 
-#include <nuttx/math32.h>
+#include <nuttx/lib/math32.h>
 
 /****************************************************************************
  * Public Functions
diff --git a/libc/misc/lib_umul64.c b/libc/misc/lib_umul64.c
index d20612638ef..29cbd37a9e2 100644
--- a/libc/misc/lib_umul64.c
+++ b/libc/misc/lib_umul64.c
@@ -37,7 +37,7 @@
  * Included Files
  ****************************************************************************/
 
-#include <nuttx/math32.h>
+#include <nuttx/lib/math32.h>
 
 /****************************************************************************
  * Public Functions
diff --git a/libc/misc/lib_usub64.c b/libc/misc/lib_usub64.c
index 2a327245ece..49742ac27d8 100644
--- a/libc/misc/lib_usub64.c
+++ b/libc/misc/lib_usub64.c
@@ -37,7 +37,7 @@
  * Included Files
  ****************************************************************************/
 
-#include <nuttx/math32.h>
+#include <nuttx/lib/math32.h>
 
 /****************************************************************************
  * Public Functions
diff --git a/libc/misc/lib_usub64x32.c b/libc/misc/lib_usub64x32.c
index b691e5105fb..7bda326e2a2 100644
--- a/libc/misc/lib_usub64x32.c
+++ b/libc/misc/lib_usub64x32.c
@@ -37,7 +37,7 @@
  * Included Files
  ****************************************************************************/
 
-#include <nuttx/math32.h>
+#include <nuttx/lib/math32.h>
 
 /****************************************************************************
  * Public Functions