diff --git a/drivers/usbdev/rndis.c b/drivers/usbdev/rndis.c
index 30a4caefa7c..e135c3db255 100644
--- a/drivers/usbdev/rndis.c
+++ b/drivers/usbdev/rndis.c
@@ -64,6 +64,15 @@
  * Pre-processor definitions
  ****************************************************************************/
 
+#define RNDIS_MKEPINTIN(desc)     (USB_DIR_IN | (desc)->epno[RNDIS_EP_INTIN_IDX])
+#define RNDIS_EPINTIN_ATTR        (USB_EP_ATTR_XFER_INT)
+
+#define RNDIS_MKEPBULKIN(desc)    (USB_DIR_IN | (desc)->epno[RNDIS_EP_BULKIN_IDX])
+#define RNDIS_EPOUTBULK_ATTR      (USB_EP_ATTR_XFER_BULK)
+
+#define RNDIS_MKEPBULKOUT(desc)   ((desc)->epno[RNDIS_EP_BULKOUT_IDX])
+#define RNDIS_EPINBULK_ATTR       (USB_EP_ATTR_XFER_BULK)
+
 #define CONFIG_RNDIS_EP0MAXPACKET 64
 
 #ifndef CONFIG_RNDIS_NWRREQS
diff --git a/include/nuttx/usb/rndis.h b/include/nuttx/usb/rndis.h
index 9e92b8dfda4..c8cc469a348 100644
--- a/include/nuttx/usb/rndis.h
+++ b/include/nuttx/usb/rndis.h
@@ -42,15 +42,6 @@
 
 /* Endpoint configuration ***************************************************/
 
-#define RNDIS_MKEPINTIN(desc)     (USB_DIR_IN | (desc)->epno[RNDIS_EP_INTIN_IDX])
-#define RNDIS_EPINTIN_ATTR        (USB_EP_ATTR_XFER_INT)
-
-#define RNDIS_MKEPBULKIN(desc)    (USB_DIR_IN | (desc)->epno[RNDIS_EP_BULKIN_IDX])
-#define RNDIS_EPOUTBULK_ATTR      (USB_EP_ATTR_XFER_BULK)
-
-#define RNDIS_MKEPBULKOUT(desc)   ((desc)->epno[RNDIS_EP_BULKOUT_IDX])
-#define RNDIS_EPINBULK_ATTR       (USB_EP_ATTR_XFER_BULK)
-
 #ifndef CONFIG_RNDIS_EPINTIN_FSSIZE
 #  define CONFIG_RNDIS_EPINTIN_FSSIZE 16
 #endif