diff --git a/arch/mips/src/mips32/up_dumpstate.c b/arch/mips/src/mips32/up_dumpstate.c
index efcf44103d..e31035f159 100644
--- a/arch/mips/src/mips32/up_dumpstate.c
+++ b/arch/mips/src/mips32/up_dumpstate.c
@@ -42,8 +42,12 @@
 /* Output debug info -- even if debug is not selected. */
 
 #undef  CONFIG_DEBUG_FEATURES
+#undef  CONFIG_DEBUG_ERROR
+#undef  CONFIG_DEBUG_WARN
 #undef  CONFIG_DEBUG_INFO
 #define CONFIG_DEBUG_FEATURES 1
+#define CONFIG_DEBUG_ERROR 1
+#define CONFIG_DEBUG_WARN 1
 #define CONFIG_DEBUG_INFO 1
 
 #include <stdint.h>
@@ -61,14 +65,6 @@
 
 #ifdef CONFIG_ARCH_STACKDUMP
 
-/****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
 /****************************************************************************
  * Private Functions
  ****************************************************************************/
diff --git a/fs/nxffs/nxffs_open.c b/fs/nxffs/nxffs_open.c
index 8807e53bc5..6a03207e91 100644
--- a/fs/nxffs/nxffs_open.c
+++ b/fs/nxffs/nxffs_open.c
@@ -1064,7 +1064,7 @@ int nxffs_open(FAR struct file *filep, FAR const char *relpath,
 
 int nxffs_dup(FAR const struct file *oldp, FAR struct file *newp)
 {
-#ifdef CONFIG_DEBUG_FEATURES
+#ifdef CONFIG_DEBUG_ASSERTIONS
   FAR struct nxffs_volume_s *volume;
 #endif
   FAR struct nxffs_ofile_s *ofile;
@@ -1073,7 +1073,7 @@ int nxffs_dup(FAR const struct file *oldp, FAR struct file *newp)
 
   /* Sanity checks */
 
-#ifdef CONFIG_DEBUG_FEATURES
+#ifdef CONFIG_DEBUG_ASSERTIONS
   DEBUGASSERT(oldp->f_priv == NULL && oldp->f_inode != NULL);
 
   /* Get the mountpoint private data from the NuttX inode reference in the