diff --git a/sched/module/module.h b/include/nuttx/lib/modlib.h
similarity index 99%
rename from sched/module/module.h
rename to include/nuttx/lib/modlib.h
index ce06b122523..b74a163ba3c 100644
--- a/sched/module/module.h
+++ b/include/nuttx/lib/modlib.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * sched/module/module.h
+ * include/nuttx/lib/modlib.h
  *
  *   Copyright (C) 2015, 2017 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ****************************************************************************/
 
-#ifndef __SCHED_MODULE_MODULE_H
-#define __SCHED_MODULE_MODULE_H
+#ifndef __INCLUDE_NUTTX_LIB_MODLIB_H
+#define __INCLUDE_NUTTX_LIB_MODLIB_H
 
 /****************************************************************************
  * Included Files
@@ -522,4 +522,4 @@ FAR struct module_s *mod_registry_find(FAR const char *modulename);
 
 int mod_registry_verify(FAR struct module_s *modp);
 
-#endif /* __SCHED_MODULE_MODULE_H */
+#endif /* __INCLUDE_NUTTX_LIB_MODLIB_H */
diff --git a/sched/module/mod_bind.c b/sched/module/mod_bind.c
index 905b22a64de..40c5bfe618e 100644
--- a/sched/module/mod_bind.c
+++ b/sched/module/mod_bind.c
@@ -47,10 +47,9 @@
 #include <debug.h>
 
 #include <nuttx/module.h>
+#include <nuttx/lib/modlib.h>
 #include <nuttx/binfmt/symtab.h>
 
-#include "module.h"
-
 /****************************************************************************
  * Private Functions
  ****************************************************************************/
diff --git a/sched/module/mod_depend.c b/sched/module/mod_depend.c
index 3ead6d5d2ea..96d33d9bc1f 100644
--- a/sched/module/mod_depend.c
+++ b/sched/module/mod_depend.c
@@ -45,8 +45,7 @@
 
 #include <nuttx/kmalloc.h>
 #include <nuttx/module.h>
-
-#include "module.h"
+#include <nuttx/lib/modlib.h>
 
 /****************************************************************************
  * Public Functions
diff --git a/sched/module/mod_init.c b/sched/module/mod_init.c
index b46d38912c7..bc088d79d27 100644
--- a/sched/module/mod_init.c
+++ b/sched/module/mod_init.c
@@ -49,8 +49,7 @@
 #include <errno.h>
 
 #include <nuttx/module.h>
-
-#include "module.h"
+#include <nuttx/lib/modlib.h>
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/sched/module/mod_insmod.c b/sched/module/mod_insmod.c
index 8eb60b34e5e..5afb2b59de8 100644
--- a/sched/module/mod_insmod.c
+++ b/sched/module/mod_insmod.c
@@ -50,8 +50,7 @@
 #include <nuttx/arch.h>
 #include <nuttx/kmalloc.h>
 #include <nuttx/module.h>
-
-#include "module/module.h"
+#include <nuttx/lib/modlib.h>
 
 #ifdef CONFIG_MODULE
 
diff --git a/sched/module/mod_iobuffer.c b/sched/module/mod_iobuffer.c
index f2d86c69ce1..36504ee8297 100644
--- a/sched/module/mod_iobuffer.c
+++ b/sched/module/mod_iobuffer.c
@@ -44,8 +44,7 @@
 
 #include <nuttx/kmalloc.h>
 #include <nuttx/module.h>
-
-#include "module.h"
+#include <nuttx/lib/modlib.h>
 
 /****************************************************************************
  * Public Functions
diff --git a/sched/module/mod_load.c b/sched/module/mod_load.c
index 2ce413bd6fb..3c5d735c006 100644
--- a/sched/module/mod_load.c
+++ b/sched/module/mod_load.c
@@ -52,8 +52,7 @@
 
 #include <nuttx/kmalloc.h>
 #include <nuttx/module.h>
-
-#include "module.h"
+#include <nuttx/lib/modlib.h>
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/sched/module/mod_modhandle.c b/sched/module/mod_modhandle.c
index 0fc27ea4b9a..7331a69f094 100644
--- a/sched/module/mod_modhandle.c
+++ b/sched/module/mod_modhandle.c
@@ -44,8 +44,7 @@
 #include <errno.h>
 
 #include <nuttx/module.h>
-
-#include "module/module.h"
+#include <nuttx/lib/modlib.h>
 
 #ifdef CONFIG_MODULE
 
diff --git a/sched/module/mod_modsym.c b/sched/module/mod_modsym.c
index 1f46dc9fd8f..a7eae25357a 100644
--- a/sched/module/mod_modsym.c
+++ b/sched/module/mod_modsym.c
@@ -44,8 +44,7 @@
 #include <debug.h>
 
 #include <nuttx/module.h>
-
-#include "module.h"
+#include <nuttx/lib/modlib.h>
 
 /****************************************************************************
  * Public Functions
diff --git a/sched/module/mod_procfs.c b/sched/module/mod_procfs.c
index 8d42f8cad22..a91c17e23cd 100644
--- a/sched/module/mod_procfs.c
+++ b/sched/module/mod_procfs.c
@@ -52,11 +52,10 @@
 
 #include <nuttx/kmalloc.h>
 #include <nuttx/module.h>
+#include <nuttx/lib/modlib.h>
 #include <nuttx/fs/fs.h>
 #include <nuttx/fs/procfs.h>
 
-#include "module.h"
-
 #if !defined(CONFIG_DISABLE_MOUNTPOINT) && defined(CONFIG_FS_PROCFS) && \
     !defined(CONFIG_FS_PROCFS_EXCLUDE_MODULE)
 
diff --git a/sched/module/mod_read.c b/sched/module/mod_read.c
index 910f48d5398..cd1de81d393 100644
--- a/sched/module/mod_read.c
+++ b/sched/module/mod_read.c
@@ -48,8 +48,7 @@
 #include <errno.h>
 
 #include <nuttx/module.h>
-
-#include "module.h"
+#include <nuttx/lib/modlib.h>
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/sched/module/mod_registry.c b/sched/module/mod_registry.c
index 5d0c1477a98..99fc4c9dcc3 100644
--- a/sched/module/mod_registry.c
+++ b/sched/module/mod_registry.c
@@ -45,8 +45,7 @@
 #include <errno.h>
 
 #include <nuttx/module.h>
-
-#include "module.h"
+#include <nuttx/lib/modlib.h>
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/sched/module/mod_rmmod.c b/sched/module/mod_rmmod.c
index 17408fd7432..4c43d2cb4ba 100644
--- a/sched/module/mod_rmmod.c
+++ b/sched/module/mod_rmmod.c
@@ -45,8 +45,7 @@
 
 #include <nuttx/kmalloc.h>
 #include <nuttx/module.h>
-
-#include "module/module.h"
+#include <nuttx/lib/modlib.h>
 
 #ifdef CONFIG_MODULE
 
diff --git a/sched/module/mod_sections.c b/sched/module/mod_sections.c
index 9aa8cb43fd1..4803a20eace 100644
--- a/sched/module/mod_sections.c
+++ b/sched/module/mod_sections.c
@@ -47,8 +47,7 @@
 
 #include <nuttx/kmalloc.h>
 #include <nuttx/module.h>
-
-#include "module.h"
+#include <nuttx/lib/modlib.h>
 
 /****************************************************************************
  * Private Functions
diff --git a/sched/module/mod_symbols.c b/sched/module/mod_symbols.c
index 684db41238b..02af33731a3 100644
--- a/sched/module/mod_symbols.c
+++ b/sched/module/mod_symbols.c
@@ -46,10 +46,9 @@
 #include <debug.h>
 
 #include <nuttx/module.h>
+#include <nuttx/lib/modlib.h>
 #include <nuttx/binfmt/symtab.h>
 
-#include "module.h"
-
 /****************************************************************************
  * Pre-processor Definitions
  ****************************************************************************/
diff --git a/sched/module/mod_symtab.c b/sched/module/mod_symtab.c
index 00df3dc9670..51860b7fd52 100644
--- a/sched/module/mod_symtab.c
+++ b/sched/module/mod_symtab.c
@@ -43,8 +43,7 @@
 
 #include <nuttx/symtab.h>
 #include <nuttx/module.h>
-
-#include "module.h"
+#include <nuttx/lib/modlib.h>
 
 /****************************************************************************
  * Public Data
diff --git a/sched/module/mod_uninit.c b/sched/module/mod_uninit.c
index dcb4bfa658c..7987425c767 100644
--- a/sched/module/mod_uninit.c
+++ b/sched/module/mod_uninit.c
@@ -45,8 +45,7 @@
 
 #include <nuttx/kmalloc.h>
 #include <nuttx/module.h>
-
-#include "module.h"
+#include <nuttx/lib/modlib.h>
 
 /****************************************************************************
  * Public Functions
diff --git a/sched/module/mod_unload.c b/sched/module/mod_unload.c
index f44e3f4da19..7cb08590c94 100644
--- a/sched/module/mod_unload.c
+++ b/sched/module/mod_unload.c
@@ -44,8 +44,7 @@
 
 #include <nuttx/kmalloc.h>
 #include <nuttx/module.h>
-
-#include "module.h"
+#include <nuttx/lib/modlib.h>
 
 /****************************************************************************
  * Public Functions