diff --git a/sched/mqueue/mqueue.h b/sched/mqueue/mqueue.h
index eee47960d8..0d9aef1d07 100644
--- a/sched/mqueue/mqueue.h
+++ b/sched/mqueue/mqueue.h
@@ -37,7 +37,7 @@
 
 #include <nuttx/mqueue.h>
 
-#if CONFIG_MQ_MAXMSGSIZE > 0
+#if defined(CONFIG_MQ_MAXMSGSIZE) && CONFIG_MQ_MAXMSGSIZE > 0
 
 /********************************************************************************
  * Pre-processor Definitions
@@ -142,5 +142,5 @@ void nxmq_recover(FAR struct tcb_s *tcb);
 }
 #endif
 
-#endif /* CONFIG_MQ_MAXMSGSIZE > 0 */
+#endif /* defined(CONFIG_MQ_MAXMSGSIZE) && CONFIG_MQ_MAXMSGSIZE > 0 */
 #endif /* __SCHED_MQUEUE_MQUEUE_H */
diff --git a/tools/mkconfig.c b/tools/mkconfig.c
index 0d9820faa8..aa95f5bf9d 100644
--- a/tools/mkconfig.c
+++ b/tools/mkconfig.c
@@ -84,64 +84,15 @@ int main(int argc, char **argv, char **envp)
     "/* config.h -- Autogenerated! Do not edit. */\n\n"
     "#ifndef __INCLUDE_NUTTX_CONFIG_H\n"
     "#define __INCLUDE_NUTTX_CONFIG_H\n\n"
-    "/* General Definitions ***********************************/\n"
     "/* Used to represent the values of tristate options */\n\n"
     "#define CONFIG_y 1\n"
     "#define CONFIG_m 2\n\n"
-    "/* Architecture-specific options *************************/\n\n");
+    "/* General Definitions ***********************************/\n");
 
   generate_definitions(stream);
 
   printf(
     "\n/* Sanity Checks *****************************************/\n\n"
-    "/* If this is an NXFLAT, external build, then make sure that\n"
-    " * NXFLAT support is enabled in the base code.\n"
-    " */\n\n"
-    "#if defined(__NXFLAT__) && !defined(CONFIG_NXFLAT)\n"
-    "# error \"NXFLAT support not enabled in this configuration\"\n"
-    "#endif\n\n"
-    "/* NXFLAT requires PIC support in the TCBs. */\n\n"
-    "#if defined(CONFIG_NXFLAT)\n"
-    "#  undef  CONFIG_PIC\n"
-    "#  define CONFIG_PIC 1\n"
-    "#endif\n\n"
-    "/* Binary format support is disabled if no binary formats are\n"
-    " * configured (at present, NXFLAT is the only supported binary.\n"
-    " * format).\n"
-    " */\n\n"
-    "#if !defined(CONFIG_NXFLAT) && !defined(CONFIG_ELF) \\\n"
-    "    && !defined(CONFIG_BUILTIN)\n"
-    "#  undef CONFIG_BINFMT_DISABLE\n"
-    "#  define CONFIG_BINFMT_DISABLE 1\n"
-    "#endif\n\n"
-    "/* The correct way to disable RR scheduling is to set the\n"
-    " * timeslice to zero.\n"
-    " */\n\n"
-    "#ifndef CONFIG_RR_INTERVAL\n"
-    "#  define CONFIG_RR_INTERVAL 0\n"
-    "#endif\n\n"
-    "/* If no file streams are configured, then make certain that\n"
-    " * buffered I/O support is disabled\n"
-    " */\n\n"
-    "#ifndef CONFIG_FILE_STREAM\n"
-    "#  undef  CONFIG_STDIO_BUFFER_SIZE\n"
-    "#  undef  CONFIG_STDIO_LINEBUFFER\n"
-    "#  undef  CONFIG_STDIO_DISABLE_BUFFERING\n"
-    "#  define CONFIG_STDIO_DISABLE_BUFFERING 1\n"
-    "#endif\n\n"
-    "/* If priority inheritance is disabled, then do not allocate any\n"
-    " * associated resources.\n"
-    " */\n\n"
-    "#if !defined(CONFIG_PRIORITY_INHERITANCE) \\\n"
-    "    || !defined(CONFIG_SEM_PREALLOCHOLDERS)\n"
-    "#  undef CONFIG_SEM_PREALLOCHOLDERS\n"
-    "#  define CONFIG_SEM_PREALLOCHOLDERS 0\n"
-    "#endif\n\n"
-    "#if !defined(CONFIG_PRIORITY_INHERITANCE) \\\n"
-    "    || !defined(CONFIG_SEM_NNESTPRIO)\n"
-    "#  undef  CONFIG_SEM_NNESTPRIO\n"
-    "#  define CONFIG_SEM_NNESTPRIO 0\n"
-    "#endif\n\n"
     "/* If the end of RAM is not specified then it is assumed to be\n"
     " * the beginning of RAM plus the RAM size.\n"
     " */\n\n"
@@ -157,16 +108,6 @@ int main(int argc, char **argv, char **envp)
     "#ifndef CONFIG_FLASH_END\n"
     "#  define CONFIG_FLASH_END (CONFIG_FLASH_START+CONFIG_FLASH_SIZE)\n"
     "#endif\n\n"
-    "/* If the maximum message size is zero, then we assume that\n"
-    " * message queues support should be disabled\n"
-    " */\n\n"
-    "#if !defined(CONFIG_MQ_MAXMSGSIZE) || defined(CONFIG_DISABLE_MQUEUE)\n"
-    "#  undef CONFIG_MQ_MAXMSGSIZE\n"
-    "#  define CONFIG_MQ_MAXMSGSIZE 0\n"
-    "#endif\n\n"
-    "#if CONFIG_MQ_MAXMSGSIZE <= 0 && !defined(CONFIG_DISABLE_MQUEUE)\n"
-    "#  define CONFIG_DISABLE_MQUEUE 1\n"
-    "#endif\n\n"
     "#endif /* __INCLUDE_NUTTX_CONFIG_H */\n");
 
   fclose(stream);