diff --git a/src/portable/raspberrypi/rp2040/dcd_rp2040.c b/src/portable/raspberrypi/rp2040/dcd_rp2040.c
index 80e5d3c4..8ad1729e 100644
--- a/src/portable/raspberrypi/rp2040/dcd_rp2040.c
+++ b/src/portable/raspberrypi/rp2040/dcd_rp2040.c
@@ -38,8 +38,6 @@
 
 #include "device/dcd.h"
 
-#include "pico/stdlib.h"
-
 /*------------------------------------------------------------------*/
 /* Low level controller
  *------------------------------------------------------------------*/
@@ -67,11 +65,7 @@ static struct hw_endpoint *hw_endpoint_get_by_addr(uint8_t ep_addr)
 }
 static void _hw_endpoint_alloc(struct hw_endpoint *ep)
 {
-    uint size = 64;
-    if (ep->wMaxPacketSize > 64)
-    {
-        size = ep->wMaxPacketSize;
-    }
+    uint size = TU_MIN(64, ep->wMaxPacketSize);
 
     // Assumes single buffered for now
     ep->hw_data_buf = next_buffer_ptr;
@@ -244,7 +238,7 @@ static void reset_ep0(void)
     // If we have finished this transfer on EP0 set pid back to 1 for next
     // setup transfer. Also clear a stall in case
     uint8_t addrs[] = {0x0, 0x80};
-    for (uint i = 0 ; i < count_of(addrs); i++)
+    for (uint i = 0 ; i < TU_ARRAY_SIZE(addrs); i++)
     {
         struct hw_endpoint *ep = hw_endpoint_get_by_addr(addrs[i]);
         ep->next_pid = 1u;
@@ -479,4 +473,10 @@ void dcd_edpt_close (uint8_t rhport, uint8_t ep_addr)
 
 }
 
+void dcd_int_handler(uint8_t rhport)
+{
+    (void) rhport;
+    dcd_rp2040_irq();
+}
+
 #endif
diff --git a/src/portable/raspberrypi/rp2040/hcd_rp2040.c b/src/portable/raspberrypi/rp2040/hcd_rp2040.c
index 5ea9c7d5..efb2bd43 100644
--- a/src/portable/raspberrypi/rp2040/hcd_rp2040.c
+++ b/src/portable/raspberrypi/rp2040/hcd_rp2040.c
@@ -86,7 +86,7 @@ static void set_dev_ep(uint8_t dev_addr, uint8_t ep_addr, struct hw_endpoint *ep
     uint8_t num = tu_edpt_number(ep_addr);
     uint8_t in = (ep_addr & TUSB_DIR_IN_MASK) ? 1 : 0;
     uint32_t index = ep - eps;
-    hard_assert(index < count_of(eps));
+    hard_assert(index < TU_ARRAY_SIZE(eps));
     // todo revisit why dev_addr can be 0 here
     if (dev_addr) {
         dev_ep_map[dev_addr-1][num][in] = 128u | index;
@@ -245,7 +245,7 @@ static void hcd_rp2040_irq(void)
 static struct hw_endpoint *_next_free_interrupt_ep(void)
 {
     struct hw_endpoint *ep = NULL;
-    for (uint i = 1; i < count_of(eps); i++)
+    for (uint i = 1; i < TU_ARRAY_SIZE(eps); i++)
     {
         ep = &eps[i];
         if (!ep->configured)