diff --git a/netutils/ftpc/ftpc_connect.c b/netutils/ftpc/ftpc_connect.c
index ab8b9b479..fa915d015 100644
--- a/netutils/ftpc/ftpc_connect.c
+++ b/netutils/ftpc/ftpc_connect.c
@@ -51,26 +51,6 @@
 
 #include "ftpc_internal.h"
 
-/****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
-/****************************************************************************
- * Private Types
- ****************************************************************************/
-
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
-/****************************************************************************
- * Public Data
- ****************************************************************************/
-
-/****************************************************************************
- * Private Functions
- ****************************************************************************/
-
 /****************************************************************************
  * Public Functions
  ****************************************************************************/
@@ -159,7 +139,7 @@ errout:
 int ftpc_reconnect(FAR struct ftpc_session_s *session)
 {
   struct sockaddr_in addr;
-#ifdef CONFIG_DEBUG_FEATURES
+#ifdef CONFIG_DEBUG_NET_ERROR
   char *tmp;
 #endif
   int ret;
@@ -190,7 +170,7 @@ int ftpc_reconnect(FAR struct ftpc_session_s *session)
 
   /* Connect the socket to the server */
 
-#ifdef CONFIG_DEBUG_FEATURES
+#ifdef CONFIG_DEBUG_NET_ERROR
   tmp = inet_ntoa(session->addr);
   nerr("Connecting to server address %s:%d\n", tmp, ntohs(session->port));
 #endif
@@ -236,7 +216,7 @@ int ftpc_reconnect(FAR struct ftpc_session_s *session)
       goto errout_with_socket;
     }
 
-#ifdef CONFIG_DEBUG_FEATURES
+#ifdef CONFIG_DEBUG_NET_ERROR
   nerr("Connected\n");
   tmp = inet_ntoa(addr.sin_addr);
   nerr("  Remote address: %s:%d\n", tmp, ntohs(addr.sin_port));
diff --git a/system/nxplayer/nxplayer.c b/system/nxplayer/nxplayer.c
index f5b12d8b4..fb16b1fdf 100644
--- a/system/nxplayer/nxplayer.c
+++ b/system/nxplayer/nxplayer.c
@@ -515,7 +515,7 @@ static int nxplayer_readbuffer(FAR struct nxplayer_s *pPlayer,
 
   if (apb->nbytes < apb->nmaxbytes)
     {
-#ifdef CONFIG_DEBUG_FEATURES
+#ifdef CONFIG_DEBUG_AUDIO_INFO
       int errcode   = errno;
       int readerror = ferror(pPlayer->fileFd);
 
@@ -534,7 +534,7 @@ static int nxplayer_readbuffer(FAR struct nxplayer_s *pPlayer,
 
       apb->flags |= AUDIO_APB_FINAL;
 
-#ifdef CONFIG_DEBUG_FEATURES
+#ifdef CONFIG_DEBUG_AUDIO_ERROR
       /* Was this a file read error */
 
       if (apb->nbytes == 0 && readerror)