diff --git a/sched/init/nx_start.c b/sched/init/nx_start.c
index 13dba99bb4c..26fd5400e06 100644
--- a/sched/init/nx_start.c
+++ b/sched/init/nx_start.c
@@ -684,12 +684,6 @@ void nx_start(void)
   nxmq_initialize();
 #endif
 
-#ifndef CONFIG_DISABLE_MQUEUE_SYSV
-  /* Initialize the System V message queue facility (if in link) */
-
-  nxmsg_initialize();
-#endif
-
 #ifdef CONFIG_NET
   /* Initialize the networking system */
 
diff --git a/sched/mqueue/CMakeLists.txt b/sched/mqueue/CMakeLists.txt
index 75d51e76d27..4373aff376b 100644
--- a/sched/mqueue/CMakeLists.txt
+++ b/sched/mqueue/CMakeLists.txt
@@ -19,6 +19,11 @@
 # ##############################################################################
 
 set(SRCS)
+
+if(NOT CONFIG_DISABLE_MQUEUE OR NOT CONFIG_DISABLE_MQUEUE)
+  list(APPEND SRCS mq_initialize.c mq_waitirq.c mq_recover.c)
+endif()
+
 if(NOT CONFIG_DISABLE_MQUEUE)
 
   list(
@@ -30,13 +35,10 @@ if(NOT CONFIG_DISABLE_MQUEUE)
     mq_receive.c
     mq_timedreceive.c
     mq_rcvinternal.c
-    mq_initialize.c
     mq_msgfree.c
     mq_msgqalloc.c
     mq_msgqfree.c
-    mq_recover.c
     mq_setattr.c
-    mq_waitirq.c
     mq_notify.c
     mq_getattr.c)
 
diff --git a/sched/mqueue/Make.defs b/sched/mqueue/Make.defs
index 2772ed17186..0608bf73398 100644
--- a/sched/mqueue/Make.defs
+++ b/sched/mqueue/Make.defs
@@ -18,12 +18,16 @@
 #
 ############################################################################
 
+ifneq ($(CONFIG_DISABLE_MQUEUE)$(CONFIG_DISABLE_MQUEUE_SYSV),yy)
+  CSRCS += mq_initialize.c mq_waitirq.c mq_recover.c
+endif
+
 ifneq ($(CONFIG_DISABLE_MQUEUE),y)
 
 CSRCS += mq_send.c mq_timedsend.c mq_sndinternal.c mq_receive.c
-CSRCS += mq_timedreceive.c mq_rcvinternal.c mq_initialize.c
-CSRCS += mq_msgfree.c mq_msgqalloc.c mq_msgqfree.c mq_recover.c
-CSRCS += mq_setattr.c mq_waitirq.c mq_notify.c mq_getattr.c
+CSRCS += mq_timedreceive.c mq_rcvinternal.c mq_getattr.c
+CSRCS += mq_msgfree.c mq_msgqalloc.c mq_msgqfree.c
+CSRCS += mq_setattr.c mq_notify.c
 
 endif
 
diff --git a/sched/mqueue/mq_initialize.c b/sched/mqueue/mq_initialize.c
index 44a137f35f2..d5646e07c59 100644
--- a/sched/mqueue/mq_initialize.c
+++ b/sched/mqueue/mq_initialize.c
@@ -29,11 +29,14 @@
 #include <nuttx/trace.h>
 
 #include "mqueue/mqueue.h"
+#include "mqueue/msg.h"
 
 /****************************************************************************
  * Public Data
  ****************************************************************************/
 
+#ifndef CONFIG_DISABLE_MQUEUE
+
 /* The g_msgfree is a list of messages that are available for general
  * use.  The number of messages in this list is a system configuration
  * item.
@@ -47,45 +50,58 @@ struct list_node g_msgfree = LIST_INITIAL_VALUE(g_msgfree);
 
 struct list_node g_msgfreeirq = LIST_INITIAL_VALUE(g_msgfreeirq);
 
+#endif
+
 /****************************************************************************
  * Private Functions
  ****************************************************************************/
 
 /****************************************************************************
- * Name: mq_msgblockalloc
+ * Name: mq_msgblockinit
  *
  * Description:
- *   Allocate a block of messages and place them on the free list.
+ *   Initialize a block of messages and place them on the free list.
  *
  * Input Parameters:
  *  queue
  *
  ****************************************************************************/
 
-static void
-mq_msgblockalloc(FAR struct list_node *list, uint16_t nmsgs,
-                 uint8_t alloc_type)
+#ifndef CONFIG_DISABLE_MQUEUE
+static FAR void * mq_msgblockinit(FAR struct list_node *list,
+                                   FAR struct mqueue_msg_s *mqmsgblock,
+                                   uint16_t nmsgs, uint8_t alloc_type)
 {
-  FAR struct mqueue_msg_s *mqmsgblock;
-
-  /* The list must be loaded at initialization time to hold the
-   * configured number of messages.
-   */
-
-  mqmsgblock = (FAR struct mqueue_msg_s *)
-    kmm_malloc(sizeof(struct mqueue_msg_s) * nmsgs);
-
-  if (mqmsgblock)
+  int i;
+  for (i = 0; i < nmsgs; i++)
     {
-      int i;
-      for (i = 0; i < nmsgs; i++)
-        {
-          mqmsgblock->type = alloc_type;
-          list_add_tail(list, &mqmsgblock->node);
-          mqmsgblock++;
-        }
+      mqmsgblock->type = alloc_type;
+      list_add_tail(list, &mqmsgblock->node);
+      mqmsgblock++;
     }
+
+  return mqmsgblock;
 }
+#endif
+
+/****************************************************************************
+ * Name: sysv_msgblockinit
+ ****************************************************************************/
+
+#ifndef CONFIG_DISABLE_MQUEUE_SYSV
+static FAR void *sysv_msgblockinit(FAR struct list_node *list,
+                                   FAR struct msgbuf_s *msg, uint16_t nmsgs)
+{
+  int i;
+  for (i = 0; i < nmsgs; i++)
+    {
+      list_add_tail(&g_msgfreelist, &msg->node);
+      msg++;
+    }
+
+  return msg;
+}
+#endif
 
 /****************************************************************************
  * Public Functions
@@ -109,19 +125,39 @@ mq_msgblockalloc(FAR struct list_node *list, uint16_t nmsgs,
 
 void nxmq_initialize(void)
 {
+  FAR void *msg;
+
   sched_trace_begin();
 
-  /* Allocate a block of messages for general use */
+  msg = kmm_malloc(
+#ifndef CONFIG_DISABLE_MQUEUE
+                   sizeof(struct mqueue_msg_s) *
+                   (CONFIG_PREALLOC_MQ_MSGS + CONFIG_PREALLOC_MQ_IRQ_MSGS)
+#endif
+#ifndef CONFIG_DISABLE_MQUEUE_SYSV
+                   + sizeof(struct msgbuf_s) * CONFIG_PREALLOC_MQ_MSGS
+#endif
+                   );
 
-  mq_msgblockalloc(&g_msgfree, CONFIG_PREALLOC_MQ_MSGS,
-                   MQ_ALLOC_FIXED);
+  DEBUGASSERT(msg != NULL);
 
-  /* Allocate a block of messages for use exclusively by
+  /* Initialize a block of messages for general use */
+
+#ifndef CONFIG_DISABLE_MQUEUE
+  msg = mq_msgblockinit(&g_msgfree, msg, CONFIG_PREALLOC_MQ_MSGS,
+                         MQ_ALLOC_FIXED);
+
+  /* Initialize a block of messages for use exclusively by
    * interrupt handlers
    */
 
-  mq_msgblockalloc(&g_msgfreeirq, CONFIG_PREALLOC_MQ_IRQ_MSGS,
-                   MQ_ALLOC_IRQ);
+  msg = mq_msgblockinit(&g_msgfreeirq, msg, CONFIG_PREALLOC_MQ_IRQ_MSGS,
+                         MQ_ALLOC_IRQ);
+#endif
+
+#ifndef CONFIG_DISABLE_MQUEUE_SYSV
+  msg = sysv_msgblockinit(&g_msgfreelist, msg, CONFIG_PREALLOC_MQ_MSGS);
+#endif
 
   sched_trace_end();
 }
diff --git a/sched/mqueue/msg.h b/sched/mqueue/msg.h
index 273b9be1f02..7a1c52c1a01 100644
--- a/sched/mqueue/msg.h
+++ b/sched/mqueue/msg.h
@@ -83,16 +83,6 @@ EXTERN struct list_node g_msgfreelist;
  * Public Function Prototypes
  ****************************************************************************/
 
-/****************************************************************************
- * Name: nxmsg_initialize
- *
- * Description:
- *   Initialize the message queue
- *
- ****************************************************************************/
-
-void nxmsg_initialize(void);
-
 /****************************************************************************
  * Name: nxmsg_alloc
  *
diff --git a/sched/mqueue/msginternal.c b/sched/mqueue/msginternal.c
index 96e22cc2ee0..4d7f30af07d 100644
--- a/sched/mqueue/msginternal.c
+++ b/sched/mqueue/msginternal.c
@@ -99,26 +99,6 @@ static FAR struct msgq_s *nxmsg_alloc_internal(void)
  * Public Functions
  ****************************************************************************/
 
-/****************************************************************************
- * Name: nxmsg_initialize
- ****************************************************************************/
-
-void nxmsg_initialize(void)
-{
-  FAR struct msgbuf_s *msg;
-
-  msg = kmm_malloc(sizeof(*msg) * CONFIG_PREALLOC_MQ_MSGS);
-  if (msg)
-    {
-      int i;
-      for (i = 0; i < CONFIG_PREALLOC_MQ_MSGS; i++)
-        {
-          list_add_tail(&g_msgfreelist, &msg->node);
-          msg++;
-        }
-    }
-}
-
 /****************************************************************************
  * Name: nxmsg_alloc
  ****************************************************************************/