diff --git a/drivers/usbhost/usbhost_composite.c b/drivers/usbhost/usbhost_composite.c
index cdebdec4d43..56657dc4ea7 100644
--- a/drivers/usbhost/usbhost_composite.c
+++ b/drivers/usbhost/usbhost_composite.c
@@ -458,13 +458,13 @@ static int usbhost_createconfig(FAR struct usbhost_member_s *member,
     }
 
   memcpy(buffer, configdesc, USB_SIZEOF_CFGDESC);
+  cfgdesc = (FAR struct usb_cfgdesc_s *)buffer;
   cfgsize = USB_SIZEOF_CFGDESC;
   buffer += USB_SIZEOF_CFGDESC;
   buflen -= USB_SIZEOF_CFGDESC;
 
   /* Modify the copied configuration descriptor */
 
-  cfgdesc              = (FAR struct usb_cfgdesc_s *)buffer;
   cfgdesc->len         = USB_SIZEOF_CFGDESC;
   cfgdesc->ninterfaces = member->nifs;
 
diff --git a/libs/libc/stdlib/lib_abort.c b/libs/libc/stdlib/lib_abort.c
index 89db287f77f..493e174bab3 100644
--- a/libs/libc/stdlib/lib_abort.c
+++ b/libs/libc/stdlib/lib_abort.c
@@ -42,30 +42,6 @@
 #include <stdlib.h>
 #include <pthread.h>
 
-/****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
-/****************************************************************************
- * Private Type Declarations
- ****************************************************************************/
-
-/****************************************************************************
- * Public Data
- ****************************************************************************/
-
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
-/****************************************************************************
- * Private Function Prototypes
- ****************************************************************************/
-
-/****************************************************************************
- * Private Functions
- ****************************************************************************/
-
 /****************************************************************************
  * Public Functions
  ****************************************************************************/