diff --git a/lib/rp2040/libipv4-big.a b/lib/rp2040/libipv4-big.a
index 2b2a6fae0..d4a8ce7f7 100644
Binary files a/lib/rp2040/libipv4-big.a and b/lib/rp2040/libipv4-big.a differ
diff --git a/lib/rp2040/libipv4-bt-big.a b/lib/rp2040/libipv4-bt-big.a
index d05b8b411..206540cb5 100644
Binary files a/lib/rp2040/libipv4-bt-big.a and b/lib/rp2040/libipv4-bt-big.a differ
diff --git a/lib/rp2040/libipv4-bt.a b/lib/rp2040/libipv4-bt.a
index 4991c3ed1..e84632f4a 100644
Binary files a/lib/rp2040/libipv4-bt.a and b/lib/rp2040/libipv4-bt.a differ
diff --git a/lib/rp2040/libipv4-ipv6-big.a b/lib/rp2040/libipv4-ipv6-big.a
index c908ad057..394f78ec5 100644
Binary files a/lib/rp2040/libipv4-ipv6-big.a and b/lib/rp2040/libipv4-ipv6-big.a differ
diff --git a/lib/rp2040/libipv4-ipv6-bt-big.a b/lib/rp2040/libipv4-ipv6-bt-big.a
index e7391a2c2..54b897b11 100644
Binary files a/lib/rp2040/libipv4-ipv6-bt-big.a and b/lib/rp2040/libipv4-ipv6-bt-big.a differ
diff --git a/lib/rp2040/libipv4-ipv6-bt.a b/lib/rp2040/libipv4-ipv6-bt.a
index 531a3c73e..0f462118a 100644
Binary files a/lib/rp2040/libipv4-ipv6-bt.a and b/lib/rp2040/libipv4-ipv6-bt.a differ
diff --git a/lib/rp2040/libipv4-ipv6.a b/lib/rp2040/libipv4-ipv6.a
index aa12209db..3ffae1b3d 100644
Binary files a/lib/rp2040/libipv4-ipv6.a and b/lib/rp2040/libipv4-ipv6.a differ
diff --git a/lib/rp2040/libipv4.a b/lib/rp2040/libipv4.a
index 3823f866c..0f629ad2a 100644
Binary files a/lib/rp2040/libipv4.a and b/lib/rp2040/libipv4.a differ
diff --git a/lib/rp2040/libpico.a b/lib/rp2040/libpico.a
index efccd13fa..daad5904b 100644
Binary files a/lib/rp2040/libpico.a and b/lib/rp2040/libpico.a differ
diff --git a/lib/rp2350-riscv/libipv4-big.a b/lib/rp2350-riscv/libipv4-big.a
index 94d51b363..49360e24b 100644
Binary files a/lib/rp2350-riscv/libipv4-big.a and b/lib/rp2350-riscv/libipv4-big.a differ
diff --git a/lib/rp2350-riscv/libipv4-bt-big.a b/lib/rp2350-riscv/libipv4-bt-big.a
index b28f8e11f..b108e12a4 100644
Binary files a/lib/rp2350-riscv/libipv4-bt-big.a and b/lib/rp2350-riscv/libipv4-bt-big.a differ
diff --git a/lib/rp2350-riscv/libipv4-bt.a b/lib/rp2350-riscv/libipv4-bt.a
index bc75f229c..40506593f 100644
Binary files a/lib/rp2350-riscv/libipv4-bt.a and b/lib/rp2350-riscv/libipv4-bt.a differ
diff --git a/lib/rp2350-riscv/libipv4-ipv6-big.a b/lib/rp2350-riscv/libipv4-ipv6-big.a
index c0a8b3121..aaac02763 100644
Binary files a/lib/rp2350-riscv/libipv4-ipv6-big.a and b/lib/rp2350-riscv/libipv4-ipv6-big.a differ
diff --git a/lib/rp2350-riscv/libipv4-ipv6-bt-big.a b/lib/rp2350-riscv/libipv4-ipv6-bt-big.a
index 0d9b4b531..0c4b5960c 100644
Binary files a/lib/rp2350-riscv/libipv4-ipv6-bt-big.a and b/lib/rp2350-riscv/libipv4-ipv6-bt-big.a differ
diff --git a/lib/rp2350-riscv/libipv4-ipv6-bt.a b/lib/rp2350-riscv/libipv4-ipv6-bt.a
index 6fc02ee23..1e2c5e2bd 100644
Binary files a/lib/rp2350-riscv/libipv4-ipv6-bt.a and b/lib/rp2350-riscv/libipv4-ipv6-bt.a differ
diff --git a/lib/rp2350-riscv/libipv4-ipv6.a b/lib/rp2350-riscv/libipv4-ipv6.a
index c93ffd8c1..fd8387e57 100644
Binary files a/lib/rp2350-riscv/libipv4-ipv6.a and b/lib/rp2350-riscv/libipv4-ipv6.a differ
diff --git a/lib/rp2350-riscv/libipv4.a b/lib/rp2350-riscv/libipv4.a
index 1005dbf0a..3f65e1b39 100644
Binary files a/lib/rp2350-riscv/libipv4.a and b/lib/rp2350-riscv/libipv4.a differ
diff --git a/lib/rp2350-riscv/libpico.a b/lib/rp2350-riscv/libpico.a
index 74cf6e1ee..09ff41c15 100644
Binary files a/lib/rp2350-riscv/libpico.a and b/lib/rp2350-riscv/libpico.a differ
diff --git a/lib/rp2350/libipv4-big.a b/lib/rp2350/libipv4-big.a
index 3b60d9571..1b740e9f3 100644
Binary files a/lib/rp2350/libipv4-big.a and b/lib/rp2350/libipv4-big.a differ
diff --git a/lib/rp2350/libipv4-bt-big.a b/lib/rp2350/libipv4-bt-big.a
index 1fd68a317..842c1aa54 100644
Binary files a/lib/rp2350/libipv4-bt-big.a and b/lib/rp2350/libipv4-bt-big.a differ
diff --git a/lib/rp2350/libipv4-bt.a b/lib/rp2350/libipv4-bt.a
index 2dc8e1f8b..5e42cfb1f 100644
Binary files a/lib/rp2350/libipv4-bt.a and b/lib/rp2350/libipv4-bt.a differ
diff --git a/lib/rp2350/libipv4-ipv6-big.a b/lib/rp2350/libipv4-ipv6-big.a
index c25e906a5..c2a8b8eeb 100644
Binary files a/lib/rp2350/libipv4-ipv6-big.a and b/lib/rp2350/libipv4-ipv6-big.a differ
diff --git a/lib/rp2350/libipv4-ipv6-bt-big.a b/lib/rp2350/libipv4-ipv6-bt-big.a
index 5e8dc1f9d..6b1f3a407 100644
Binary files a/lib/rp2350/libipv4-ipv6-bt-big.a and b/lib/rp2350/libipv4-ipv6-bt-big.a differ
diff --git a/lib/rp2350/libipv4-ipv6-bt.a b/lib/rp2350/libipv4-ipv6-bt.a
index fc89df7f0..47be94f7c 100644
Binary files a/lib/rp2350/libipv4-ipv6-bt.a and b/lib/rp2350/libipv4-ipv6-bt.a differ
diff --git a/lib/rp2350/libipv4-ipv6.a b/lib/rp2350/libipv4-ipv6.a
index e06e3d633..b9833b4ee 100644
Binary files a/lib/rp2350/libipv4-ipv6.a and b/lib/rp2350/libipv4-ipv6.a differ
diff --git a/lib/rp2350/libipv4.a b/lib/rp2350/libipv4.a
index b3e2abbfa..a3b0a84cc 100644
Binary files a/lib/rp2350/libipv4.a and b/lib/rp2350/libipv4.a differ
diff --git a/lib/rp2350/libpico.a b/lib/rp2350/libpico.a
index 8469c6934..d9940e107 100644
Binary files a/lib/rp2350/libpico.a and b/lib/rp2350/libpico.a differ
diff --git a/tools/libpico/CMakeLists.txt b/tools/libpico/CMakeLists.txt
index 87c7f601a..655c5feb8 100644
--- a/tools/libpico/CMakeLists.txt
+++ b/tools/libpico/CMakeLists.txt
@@ -312,8 +312,8 @@ target_link_libraries(ipv4-ipv6-bt-big-${cpu}
 
 foreach(tgt pico ipv4 ipv4-ipv6 ipv4-big ipv4-ipv6-big ipv4-bt ipv4-ipv6-bt ipv4-bt-big ipv4-ipv6-bt-big)
     add_custom_command(TARGET ${tgt}-${cpu} POST_BUILD
-        COMMAND arm-none-eabi-ar d lib${tgt}-${cpu}.a stdio.c.obj stdio_uart.c.obj stdio_usb.c.obj stdio_usb_descriptors.c.obj pico_malloc.c.obj newlib_interface.c.obj
-        COMMAND arm-none-eabi-ar d lib${tgt}-${cpu}.a btstack_flash_bank.c.obj  # Need to override with our own implementation
+        COMMAND arm-none-eabi-ar d lib${tgt}-${cpu}.a pico_malloc.c.o newlib_interface.c.o stdlib.c.o stdio.c.o stdio_uart.c.o
+        COMMAND arm-none-eabi-ar d lib${tgt}-${cpu}.a btstack_flash_bank.c.o  # Need to override with our own implementation
         COMMAND cp lib${tgt}-${cpu}.a ../../../lib/${cpu}/lib${tgt}.a
     )
 endforeach()