diff --git a/port/linux/hci_transport_linux.c b/platform/linux/hci_transport_linux.c
similarity index 99%
rename from port/linux/hci_transport_linux.c
rename to platform/linux/hci_transport_linux.c
index 3a9439236..423b289b6 100644
--- a/port/linux/hci_transport_linux.c
+++ b/platform/linux/hci_transport_linux.c
@@ -89,7 +89,6 @@
 #define hci_le_clear_white_list linux_hci_le_clear_white_list
 #define hci_le_clear_resolving_list linux_hci_le_clear_resolving_list
 #define hci_le_read_resolving_list_size linux_hci_le_read_resolving_list_size
-#include <bluetooth/hci_lib.h>
 
 // assert pre-buffer for packet type is available
 #if !defined(HCI_OUTGOING_PRE_BUFFER_SIZE) || (HCI_OUTGOING_PRE_BUFFER_SIZE == 0)
diff --git a/port/linux/hci_transport_linux.h b/platform/linux/hci_transport_linux.h
similarity index 100%
rename from port/linux/hci_transport_linux.h
rename to platform/linux/hci_transport_linux.h
diff --git a/port/linux/CMakeLists.txt b/port/linux/CMakeLists.txt
index a7f4500df..9dff28380 100644
--- a/port/linux/CMakeLists.txt
+++ b/port/linux/CMakeLists.txt
@@ -44,6 +44,7 @@ include_directories(${BTSTACK_ROOT}/platform/embedded)
 include_directories(${BTSTACK_ROOT}/platform/lwip)
 include_directories(${BTSTACK_ROOT}/platform/lwip/port)
 include_directories(${BTSTACK_ROOT}/platform/posix)
+include_directories(${BTSTACK_ROOT}/platform/linux)
 
 file(GLOB SOURCES_SRC       "${BTSTACK_ROOT}/src/*.c" "${BTSTACK_ROOT}/example/*demo_util*.c")
 file(GLOB SOURCES_BLE       "${BTSTACK_ROOT}/src/ble/*.c")
@@ -58,6 +59,7 @@ file(GLOB SOURCES_MD5       "${BTSTACK_ROOT}/3rd-party/md5/md5.c")
 file(GLOB SOURCES_RIJNDAEL  "${BTSTACK_ROOT}/3rd-party/rijndael/rijndael.c")
 file(GLOB SOURCES_YXML      "${BTSTACK_ROOT}/3rd-party/yxml/yxml.c")
 file(GLOB SOURCES_POSIX     "${BTSTACK_ROOT}/platform/posix/*.c")
+file(GLOB SOURCES_LINUX     "${BTSTACK_ROOT}/platform/linux/*.c")
 file(GLOB SOURCES_LC3_GOOGLE "${BTSTACK_ROOT}/3rd-party/lc3-google/src/*.c")
 file(GLOB SOURCES_PORT      "*.c")
 
@@ -98,7 +100,7 @@ set (LWIP_DHCPD
 		)
 set (LWIP_PORT
 		${BTSTACK_ROOT}/platform/lwip/port/sys_arch.c
-		${BTSTACK_ROOT}//platform/lwip/bnep_lwip.c
+		${BTSTACK_ROOT}/platform/lwip/bnep_lwip.c
 		)
 set (SOURCES_LWIP ${LWIP_CORE_SRC} ${LWIP_IPV4_SRC} ${LWIP_NETIF_SRC} ${LWIP_HTTPD} ${LWIP_DHCPD} ${LWIP_PORT})
 
@@ -132,6 +134,7 @@ set(SOURCES
 		${SOURCES_TC2566X}
 		${SOURCES_UECC}
 		${SOURCES_POSIX}
+        ${SOURCES_LINUX}
 		${SOURCES_YXML}
 		${SOURCES_ZEPHYR}
 )