diff --git a/Kconfig b/Kconfig
index c174c16e4cb..b030aee96e3 100644
--- a/Kconfig
+++ b/Kconfig
@@ -371,7 +371,7 @@ config ARCH_STDARG_H
 	default n
 	---help---
 		There is also a redirecting version of stdarg.h in the source tree
-		as well. It also resides out-of-the-way at include/nuttx/stdarg.h.
+		as well. It also resides out-of-the-way at include/nuttx/lib/stdarg.h.
 		This is because you should normally use your toolchain's stdarg.h
 		file. But sometimes, your toolchain's stdarg.h file may have other
 		header file dependencies and so may not be usable in the NuttX build
@@ -379,7 +379,7 @@ config ARCH_STDARG_H
 		specific stdarg.h header file at nuttx/arch/<architecture>/include/stdarg.h
 
 		If ARCH_STDARG_H=y is defined, the top-level makefile will copy the
-		re-directing stdarg.h header file from include/nuttx/stdarg.h to
+		re-directing stdarg.h header file from include/nuttx/lib/stdarg.h to
 		include/stdarg.h. So for the architectures that cannot use their
 		toolchain's stdarg.h file, they can use this alternative by defining
 		ARCH_STDARG_H=y and providing. If ARCH_STDARG_H, is not defined, then
diff --git a/Makefile.unix b/Makefile.unix
index a117f171fc1..6d509018b81 100644
--- a/Makefile.unix
+++ b/Makefile.unix
@@ -227,14 +227,14 @@ else
 include/float.h:
 endif
 
-# Target used to copy include/nuttx/stdarg.h.  If CONFIG_ARCH_STDARG_H is
+# Target used to copy include/nuttx/lib/stdarg.h.  If CONFIG_ARCH_STDARG_H is
 # defined, then there is an architecture specific stdarg.h header file
-# that will be included indirectly from include/stdarg.h.  But first, we
+# that will be included indirectly from include/lib/stdarg.h.  But first, we
 # have to copy stdarg.h from include/nuttx/. to include/.
 
 ifeq ($(CONFIG_ARCH_STDARG_H),y)
-include/stdarg.h: include/nuttx/stdarg.h
-	$(Q) cp -f include/nuttx/stdarg.h include/stdarg.h
+include/stdarg.h: include/nuttx/lib/stdarg.h
+	$(Q) cp -f include/nuttx/lib/stdarg.h include/stdarg.h
 else
 include/stdarg.h:
 endif
diff --git a/include/nuttx/stdarg.h b/include/nuttx/lib/stdarg.h
similarity index 92%
rename from include/nuttx/stdarg.h
rename to include/nuttx/lib/stdarg.h
index 2bda8cbd617..6d0ef173daf 100644
--- a/include/nuttx/stdarg.h
+++ b/include/nuttx/lib/stdarg.h
@@ -1,7 +1,7 @@
 /****************************************************************************
- * include/nuttx/stdarg.h
+ * include/nuttx/lib/stdarg.h
  *
- *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2012, 2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -33,8 +33,8 @@
  *
  ****************************************************************************/
 
-#ifndef __INCLUDE_NUTTX_STDARG_H
-#define __INCLUDE_NUTTX_STDARG_H
+#ifndef __INCLUDE_NUTTX_LIB_STDARG_H
+#define __INCLUDE_NUTTX_LIB_STDARG_H
 
 /****************************************************************************
  * Included Files
@@ -61,4 +61,4 @@
  * Public Function Prototypes
  ****************************************************************************/
 
-#endif /* __INCLUDE_NUTTX_STDARG_H */
+#endif /* __INCLUDE_NUTTX_LIB_STDARG_H */