diff --git a/port/daemon/configure.ac b/port/daemon/configure.ac
index df4192354..4a63134a2 100644
--- a/port/daemon/configure.ac
+++ b/port/daemon/configure.ac
@@ -34,7 +34,7 @@ fi
 
 case "$host_os" in
     darwin*)
-        btstack_run_loop_SOURCES="btstack_run_loop_posix.o btstack_run_loop_corefoundation.m"
+        btstack_run_loop_SOURCES="btstack_run_loop_base.o btstack_run_loop_posix.o btstack_run_loop_corefoundation.m"
         LDFLAGS+="-framework CoreFoundation -framework Foundation"
         BTSTACK_LIB_LDFLAGS="-dynamiclib -install_name \$(prefix)/lib/libBTstack.dylib"
         BTSTACK_LIB_EXTENSION="dylib"
@@ -57,7 +57,7 @@ case "$host_os" in
         UART_DRIVER=block_windows
         ;;
     *)
-        btstack_run_loop_SOURCES="btstack_run_loop_posix.o"
+        btstack_run_loop_SOURCES="btstack_run_loop_base.o btstack_run_loop_posix.o"
         BTSTACK_LIB_LDFLAGS="-shared -Wl,-rpath,\$(prefix)/lib"
         BTSTACK_LIB_EXTENSION="so"
         REMOTE_DEVICE_DB_SOURCES="rfcomm_service_db_memory.o"
diff --git a/port/libusb/Makefile b/port/libusb/Makefile
index 711ffe414..0bf8d5e8b 100644
--- a/port/libusb/Makefile
+++ b/port/libusb/Makefile
@@ -3,7 +3,7 @@ BTSTACK_ROOT ?= ../..
 
 CORE += main.c btstack_stdin_posix.c btstack_tlv_posix.c
 
-COMMON += hci_transport_h2_libusb.c btstack_run_loop_posix.c le_device_db_tlv.c btstack_link_key_db_tlv.c wav_util.c btstack_network_posix.c
+COMMON += hci_transport_h2_libusb.c btstack_run_loop_base.c btstack_run_loop_posix.c le_device_db_tlv.c btstack_link_key_db_tlv.c wav_util.c btstack_network_posix.c
 COMMON += btstack_audio_portaudio.c btstack_chipset_zephyr.c rijndael.c
 
 include ${BTSTACK_ROOT}/example/Makefile.inc
diff --git a/port/posix-h4-atwilc3000/Makefile b/port/posix-h4-atwilc3000/Makefile
index 8234bf7eb..c2cb21c8b 100644
--- a/port/posix-h4-atwilc3000/Makefile
+++ b/port/posix-h4-atwilc3000/Makefile
@@ -3,6 +3,7 @@ BTSTACK_ROOT ?= ../..
 
 CORE += \
 	btstack_chipset_atwilc3000.c \
+	btstack_run_loop_base.c \
 	btstack_run_loop_posix.c \
 	btstack_tlv_posix.c \
 	btstack_uart_posix.c \
diff --git a/port/posix-h4-da14581/Makefile b/port/posix-h4-da14581/Makefile
index 1d139ba67..40011aa76 100644
--- a/port/posix-h4-da14581/Makefile
+++ b/port/posix-h4-da14581/Makefile
@@ -4,6 +4,7 @@ BTSTACK_ROOT ?= ../..
 CORE += \
 	btstack_chipset_da14581.c \
 	hci_581_active_uart.c \
+	btstack_run_loop_base.c \
 	btstack_run_loop_posix.c \
 	btstack_tlv_posix.c \
 	btstack_uart_posix.c \
diff --git a/port/posix-h4-da14585/Makefile b/port/posix-h4-da14585/Makefile
index 89c842ac7..85f1f4a18 100644
--- a/port/posix-h4-da14585/Makefile
+++ b/port/posix-h4-da14585/Makefile
@@ -3,6 +3,7 @@ BTSTACK_ROOT ?= ../..
 
 CORE += \
 	btstack_chipset_da14581.c \
+	btstack_run_loop_base.c \
 	btstack_run_loop_posix.c \
 	btstack_tlv_posix.c \
 	btstack_uart_posix.c \
diff --git a/port/posix-h4-zephyr/Makefile b/port/posix-h4-zephyr/Makefile
index a3d4171f3..c2348e396 100644
--- a/port/posix-h4-zephyr/Makefile
+++ b/port/posix-h4-zephyr/Makefile
@@ -2,6 +2,7 @@
 BTSTACK_ROOT ?= ../..
 
 CORE += \
+	btstack_run_loop_base.c \
 	btstack_run_loop_posix.c \
 	btstack_tlv_posix.c \
 	btstack_uart_posix.c \
diff --git a/port/posix-h4/Makefile b/port/posix-h4/Makefile
index 74862c5d2..5e78b7570 100644
--- a/port/posix-h4/Makefile
+++ b/port/posix-h4/Makefile
@@ -10,6 +10,7 @@ CORE += \
 	btstack_chipset_stlc2500d.c \
 	btstack_chipset_tc3566x.c \
 	btstack_link_key_db_tlv.c \
+	btstack_run_loop_base.c \
 	btstack_run_loop_posix.c \
 	btstack_audio.c \
     btstack_audio_portaudio.c \
diff --git a/port/posix-h5/Makefile b/port/posix-h5/Makefile
index 5a9931351..97846aad3 100644
--- a/port/posix-h5/Makefile
+++ b/port/posix-h5/Makefile
@@ -9,6 +9,7 @@ CORE += \
 	btstack_chipset_stlc2500d.c \
 	btstack_chipset_tc3566x.c \
 	btstack_link_key_db_tlv.c \
+	btstack_run_loop_base.c \
 	btstack_run_loop_posix.c \
 	btstack_tlv_posix.c \
 	btstack_uart_posix.c \
diff --git a/port/posix-h5/main.c b/port/posix-h5/main.c
index 642ffd844..1876d1a62 100644
--- a/port/posix-h5/main.c
+++ b/port/posix-h5/main.c
@@ -208,10 +208,10 @@ int main(int argc, const char * argv[]){
     printf("Packet Log: %s\n", pklg_path);
 
     // pick serial port
-    // config.device_name = "/dev/tty.usbserial-A900K2WS"; // DFROBOT
+    config.device_name = "/dev/tty.usbserial-A900K2WS"; // DFROBOT
     // config.device_name = "/dev/tty.usbserial-A50285BI"; // BOOST-CC2564MODA New
     // config.device_name = "/dev/tty.usbserial-A9OVNX5P"; // RedBear IoT pHAT breakout board
-    config.device_name = "/dev/tty.usbserial-A900K0VK"; // CSR8811 breakout board
+    // config.device_name = "/dev/tty.usbserial-A900K0VK"; // CSR8811 breakout board
 
     // accept path from command line
     if (argc >= 3 && strcmp(argv[1], "-u") == 0){
diff --git a/port/raspi/Makefile b/port/raspi/Makefile
index cd91ce1c8..437d4db02 100644
--- a/port/raspi/Makefile
+++ b/port/raspi/Makefile
@@ -6,6 +6,7 @@ CORE += \
 	btstack_chipset_bcm_download_firmware.c \
 	btstack_control_raspi.c \
 	btstack_link_key_db_tlv.c \
+	btstack_run_loop_base.c \
 	btstack_run_loop_posix.c \
 	btstack_tlv_posix.c \
 	btstack_uart_posix.c \