diff --git a/ios/RetroArch/input/BTStack/btstack/btstack.h b/ios/RetroArch/input/BTStack/btstack/btstack.h
index 03c02a0fb2..4c866dc7f9 100644
--- a/ios/RetroArch/input/BTStack/btstack/btstack.h
+++ b/ios/RetroArch/input/BTStack/btstack/btstack.h
@@ -40,9 +40,9 @@
 
 #pragma once
 
-#include "hci_cmds.h"
-#include "run_loop.h"
-#include "utils.h"
+#include <btstack/hci_cmds.h>
+#include <btstack/run_loop.h>
+#include <btstack/utils.h>
 
 #include <stdint.h>
 
diff --git a/ios/RetroArch/input/BTStack/btstack/btstack_memory.c b/ios/RetroArch/input/BTStack/btstack/btstack_memory.c
index 9e3e7b9a10..b832ef8d6f 100644
--- a/ios/RetroArch/input/BTStack/btstack/btstack_memory.c
+++ b/ios/RetroArch/input/BTStack/btstack/btstack_memory.c
@@ -44,7 +44,7 @@
  */
 
 #include "btstack_memory.h"
-#include "memory_pool.h"
+#include <btstack/memory_pool.h>
 
 #include <stdlib.h>
 
diff --git a/ios/RetroArch/input/BTStack/btstack/daemon.c b/ios/RetroArch/input/BTStack/btstack/daemon.c
index c4ef78c9e7..77014f91ec 100644
--- a/ios/RetroArch/input/BTStack/btstack/daemon.c
+++ b/ios/RetroArch/input/BTStack/btstack/daemon.c
@@ -54,9 +54,9 @@
 
 #include <getopt.h>
 
-#include "btstack.h"
-#include "linked_list.h"
-#include "run_loop.h"
+#include <btstack/btstack.h>
+#include <btstack/linked_list.h>
+#include <btstack/run_loop.h>
 
 #include "debug.h"
 #include "hci.h"
diff --git a/ios/RetroArch/input/BTStack/btstack/hci.c b/ios/RetroArch/input/BTStack/btstack/hci.c
index 37a2dd5c42..5a48838d01 100644
--- a/ios/RetroArch/input/BTStack/btstack/hci.c
+++ b/ios/RetroArch/input/BTStack/btstack/hci.c
@@ -51,14 +51,14 @@
 
 #ifndef EMBEDDED
 #include <unistd.h> // gethostbyname
-#include "version.h"
+#include <btstack/version.h>
 #endif
 
 #include "btstack_memory.h"
 #include "debug.h"
 #include "hci_dump.h"
 
-#include "hci_cmds.h"
+#include <btstack/hci_cmds.h>
 
 #define HCI_CONNECTION_TIMEOUT_MS 10000
 
diff --git a/ios/RetroArch/input/BTStack/btstack/hci_cmds.c b/ios/RetroArch/input/BTStack/btstack/hci_cmds.c
index 638c440b9c..b517815ff7 100644
--- a/ios/RetroArch/input/BTStack/btstack/hci_cmds.c
+++ b/ios/RetroArch/input/BTStack/btstack/hci_cmds.c
@@ -40,11 +40,11 @@
  *  Created by Matthias Ringwald on 7/23/09.
  */
 
-#include "hci_cmds.h"
+#include <btstack/hci_cmds.h>
 
 #include <string.h>
 
-#include "sdp_util.h"
+#include <btstack/sdp_util.h>
 #include "config.h"
 #include "hci.h"
 
diff --git a/ios/RetroArch/input/BTStack/btstack/hci_transport_h4_ehcill_dma.c b/ios/RetroArch/input/BTStack/btstack/hci_transport_h4_ehcill_dma.c
index 29f550face..fec101b527 100644
--- a/ios/RetroArch/input/BTStack/btstack/hci_transport_h4_ehcill_dma.c
+++ b/ios/RetroArch/input/BTStack/btstack/hci_transport_h4_ehcill_dma.c
@@ -54,9 +54,11 @@
 #include "hci.h"
 #include "hci_dump.h"
 #include "hci_transport.h"
-#include "run_loop.h"
+#include <btstack/run_loop.h>
 
-#include "hal_uart_dma.h"
+#include <btstack/hal_uart_dma.h>
+
+// #define DUMP
 
 // eHCILL commands (+interal CTS signal)
 #define EHCILL_GO_TO_SLEEP_IND 0x030
@@ -314,6 +316,17 @@ static void h4_block_sent(void){
     }
 }
 
+#ifdef DUMP
+static void dump(uint8_t *data, uint16_t len){
+    int i;
+    if (len > 5) len = 8;
+    for (i=0; i<len;i++){
+        printf("%02X ", ((uint8_t *)data)[i]);
+    }
+    printf("\n\r");
+}
+#endif
+
 static int h4_process(struct data_source *ds) {
     
     // notify about packet sent
@@ -326,6 +339,12 @@ static int h4_process(struct data_source *ds) {
 
     if (h4_state != H4_PACKET_RECEIVED) return 0;
         
+    // log packet
+#ifdef DUMP
+    printf("RX: ");
+    dump(hci_packet, read_pos);
+#endif
+    
     packet_handler(hci_packet[0], &hci_packet[1], read_pos-1);
 
     h4_rx_init_sm();
@@ -436,6 +455,11 @@ static int ehcill_send_packet(uint8_t packet_type, uint8_t *packet, int size){
         return -1;
     }
     
+#ifdef DUMP
+    printf("TX: %02x ", packet_type);
+    dump(packet, size);
+#endif
+    
     tx_packet_type = packet_type;
     tx_data = packet;
     tx_len  = size;
diff --git a/ios/RetroArch/input/BTStack/btstack/linked_list.c b/ios/RetroArch/input/BTStack/btstack/linked_list.c
index a012d45c0a..4ad5de69d6 100644
--- a/ios/RetroArch/input/BTStack/btstack/linked_list.c
+++ b/ios/RetroArch/input/BTStack/btstack/linked_list.c
@@ -40,7 +40,7 @@
  *  Created by Matthias Ringwald on 7/13/09.
  */
 
-#include "linked_list.h"
+#include <btstack/linked_list.h>
 #include <stdlib.h>
 /**
  * tests if list is empty
diff --git a/ios/RetroArch/input/BTStack/btstack/memory_pool.c b/ios/RetroArch/input/BTStack/btstack/memory_pool.c
index 75f1b6a8be..9ab94a8c2a 100644
--- a/ios/RetroArch/input/BTStack/btstack/memory_pool.c
+++ b/ios/RetroArch/input/BTStack/btstack/memory_pool.c
@@ -43,7 +43,7 @@
  *
  */
 
-#include "memory_pool.h"
+#include <btstack/memory_pool.h>
 #include <stddef.h>
 
 typedef struct node {
diff --git a/ios/RetroArch/input/BTStack/btstack/rfcomm.c b/ios/RetroArch/input/BTStack/btstack/rfcomm.c
index 9e9b0ba19d..1c3516c736 100644
--- a/ios/RetroArch/input/BTStack/btstack/rfcomm.c
+++ b/ios/RetroArch/input/BTStack/btstack/rfcomm.c
@@ -43,11 +43,11 @@
 #include <string.h> // memcpy
 #include <stdint.h>
 
-#include "btstack.h"
-#include "hci_cmds.h"
-#include "utils.h"
+#include <btstack/btstack.h>
+#include <btstack/hci_cmds.h>
+#include <btstack/utils.h>
 
-#include "utils.h"
+#include <btstack/utils.h>
 #include "btstack_memory.h"
 #include "hci.h"
 #include "hci_dump.h"
diff --git a/ios/RetroArch/input/BTStack/btstack/run_loop.c b/ios/RetroArch/input/BTStack/btstack/run_loop.c
index 9b66f043d2..59ed77edff 100644
--- a/ios/RetroArch/input/BTStack/btstack/run_loop.c
+++ b/ios/RetroArch/input/BTStack/btstack/run_loop.c
@@ -40,7 +40,7 @@
  *  Created by Matthias Ringwald on 6/6/09.
  */
 
-#include "run_loop.h"
+#include <btstack/run_loop.h>
 
 #include <stdio.h>
 #include <stdlib.h>  // exit()
diff --git a/ios/RetroArch/input/BTStack/btstack/run_loop.h b/ios/RetroArch/input/BTStack/btstack/run_loop.h
index b6fc92a14b..90494bf777 100644
--- a/ios/RetroArch/input/BTStack/btstack/run_loop.h
+++ b/ios/RetroArch/input/BTStack/btstack/run_loop.h
@@ -37,7 +37,7 @@
 
 #pragma once
 
-#include "linked_list.h"
+#include <btstack/linked_list.h>
 
 #include <stdint.h>
 
diff --git a/ios/RetroArch/input/BTStack/btstack/run_loop_embedded.c b/ios/RetroArch/input/BTStack/btstack/run_loop_embedded.c
index 3134d2f2d9..4ed5a9cac9 100644
--- a/ios/RetroArch/input/BTStack/btstack/run_loop_embedded.c
+++ b/ios/RetroArch/input/BTStack/btstack/run_loop_embedded.c
@@ -52,10 +52,10 @@
  */
 
 
-#include "run_loop.h"
-#include "linked_list.h"
-#include "hal_tick.h"
-#include "hal_cpu.h"
+#include <btstack/run_loop.h>
+#include <btstack/linked_list.h>
+#include <btstack/hal_tick.h>
+#include <btstack/hal_cpu.h>
 
 #include "run_loop_private.h"
 #include "debug.h"
diff --git a/ios/RetroArch/input/BTStack/btstack/run_loop_posix.c b/ios/RetroArch/input/BTStack/btstack/run_loop_posix.c
index add6586f9a..5ea30ace06 100644
--- a/ios/RetroArch/input/BTStack/btstack/run_loop_posix.c
+++ b/ios/RetroArch/input/BTStack/btstack/run_loop_posix.c
@@ -40,8 +40,8 @@
  *  Created by Matthias Ringwald on 6/6/09.
  */
 
-#include "run_loop.h"
-#include "linked_list.h"
+#include <btstack/run_loop.h>
+#include <btstack/linked_list.h>
 
 #include "debug.h"
 #include "run_loop_private.h"
diff --git a/ios/RetroArch/input/BTStack/btstack/sdp_util.c b/ios/RetroArch/input/BTStack/btstack/sdp_util.c
index de9aac017b..803e9e0626 100644
--- a/ios/RetroArch/input/BTStack/btstack/sdp_util.c
+++ b/ios/RetroArch/input/BTStack/btstack/sdp_util.c
@@ -38,8 +38,8 @@
  *  sdp_util.c
  */
 
-#include "sdp_util.h"
-#include "utils.h"
+#include <btstack/sdp_util.h>
+#include <btstack/utils.h>
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/ios/RetroArch/input/BTStack/btstack/socket_connection.c b/ios/RetroArch/input/BTStack/btstack/socket_connection.c
index 29e5856634..25af85be20 100644
--- a/ios/RetroArch/input/BTStack/btstack/socket_connection.c
+++ b/ios/RetroArch/input/BTStack/btstack/socket_connection.c
@@ -50,7 +50,7 @@
 
 #include "config.h"
 
-#include "btstack.h"
+#include <btstack/btstack.h>
 
 #include <arpa/inet.h>
 #include <errno.h>
diff --git a/ios/RetroArch/input/BTStack/btstack/utils.c b/ios/RetroArch/input/BTStack/btstack/utils.c
index a8a607eea7..395dd62f7e 100644
--- a/ios/RetroArch/input/BTStack/btstack/utils.c
+++ b/ios/RetroArch/input/BTStack/btstack/utils.c
@@ -43,7 +43,7 @@
  */
 
 #include "config.h"
-#include "utils.h"
+#include <btstack/utils.h>
 #include <stdio.h>
 #include "debug.h"