diff --git a/src/btstack_memory.h b/src/btstack_memory.h
index a052f2509..ddfb55a86 100644
--- a/src/btstack_memory.h
+++ b/src/btstack_memory.h
@@ -75,7 +75,7 @@ extern "C" {
 #endif
 
 #ifdef ENABLE_MESH
-#include "ble/mesh/mesh_network.h"
+#include "mesh/mesh_network.h"
 #include "mesh_keys.h"
 #include "mesh_virtual_addresses.h"
 #endif
diff --git a/src/ble/mesh/adv_bearer.c b/src/mesh/adv_bearer.c
similarity index 99%
rename from src/ble/mesh/adv_bearer.c
rename to src/mesh/adv_bearer.c
index da50a2ae6..cd3d4d9fb 100644
--- a/src/ble/mesh/adv_bearer.c
+++ b/src/mesh/adv_bearer.c
@@ -41,7 +41,7 @@
 
 #include <string.h>
 
-#include "ble/mesh/adv_bearer.h"
+#include "mesh/adv_bearer.h"
 #include "ble/core.h"
 #include "bluetooth.h"
 #include "bluetooth_data_types.h"
diff --git a/src/ble/mesh/adv_bearer.h b/src/mesh/adv_bearer.h
similarity index 100%
rename from src/ble/mesh/adv_bearer.h
rename to src/mesh/adv_bearer.h
diff --git a/src/ble/mesh/beacon.c b/src/mesh/beacon.c
similarity index 99%
rename from src/ble/mesh/beacon.c
rename to src/mesh/beacon.c
index 5cee8e1b9..01e7baec0 100644
--- a/src/ble/mesh/beacon.c
+++ b/src/mesh/beacon.c
@@ -39,9 +39,9 @@
 
 #include <string.h>
 
-#include "ble/mesh/beacon.h"
-#include "ble/mesh/adv_bearer.h"
-#include "ble/mesh/gatt_bearer.h"
+#include "mesh/beacon.h"
+#include "mesh/adv_bearer.h"
+#include "mesh/gatt_bearer.h"
 #include "ble/core.h"
 #include "bluetooth.h"
 #include "bluetooth_data_types.h"
diff --git a/src/ble/mesh/beacon.h b/src/mesh/beacon.h
similarity index 100%
rename from src/ble/mesh/beacon.h
rename to src/mesh/beacon.h
diff --git a/src/ble/mesh/gatt_bearer.c b/src/mesh/gatt_bearer.c
similarity index 99%
rename from src/ble/mesh/gatt_bearer.c
rename to src/mesh/gatt_bearer.c
index 3b20a0d3d..b3d93e5e8 100644
--- a/src/ble/mesh/gatt_bearer.c
+++ b/src/mesh/gatt_bearer.c
@@ -41,7 +41,7 @@
 
 #include "ble/gatt-service/mesh_proxy_service_server.h"
 #include "ble/att_server.h"
-#include "ble/mesh/gatt_bearer.h"
+#include "mesh/gatt_bearer.h"
 #include "ble/core.h"
 #include "bluetooth.h"
 #include "bluetooth_data_types.h"
diff --git a/src/ble/mesh/gatt_bearer.h b/src/mesh/gatt_bearer.h
similarity index 100%
rename from src/ble/mesh/gatt_bearer.h
rename to src/mesh/gatt_bearer.h
diff --git a/src/ble/mesh/mesh_crypto.c b/src/mesh/mesh_crypto.c
similarity index 100%
rename from src/ble/mesh/mesh_crypto.c
rename to src/mesh/mesh_crypto.c
diff --git a/src/ble/mesh/mesh_crypto.h b/src/mesh/mesh_crypto.h
similarity index 100%
rename from src/ble/mesh/mesh_crypto.h
rename to src/mesh/mesh_crypto.h
diff --git a/src/ble/mesh/mesh_lower_transport.c b/src/mesh/mesh_lower_transport.c
similarity index 99%
rename from src/ble/mesh/mesh_lower_transport.c
rename to src/mesh/mesh_lower_transport.c
index 3ac209471..111e0a9fe 100644
--- a/src/ble/mesh/mesh_lower_transport.c
+++ b/src/mesh/mesh_lower_transport.c
@@ -40,7 +40,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "ble/mesh/beacon.h"
+#include "mesh/beacon.h"
 #include "btstack_util.h"
 #include "btstack_memory.h"
 #include "mesh_peer.h"
diff --git a/src/ble/mesh/mesh_lower_transport.h b/src/mesh/mesh_lower_transport.h
similarity index 99%
rename from src/ble/mesh/mesh_lower_transport.h
rename to src/mesh/mesh_lower_transport.h
index ace09c626..a269aac74 100644
--- a/src/ble/mesh/mesh_lower_transport.h
+++ b/src/mesh/mesh_lower_transport.h
@@ -46,7 +46,7 @@ extern "C"
 #endif
 
 #include <stdint.h>
-#include "ble/mesh/mesh_network.h"
+#include "mesh/mesh_network.h"
 
 typedef enum {
     MESH_TRANSPORT_OPCODE_ACK = 0,
diff --git a/src/ble/mesh/mesh_network.c b/src/mesh/mesh_network.c
similarity index 99%
rename from src/ble/mesh/mesh_network.c
rename to src/mesh/mesh_network.c
index 43820cd8c..9fb8c6c26 100644
--- a/src/ble/mesh/mesh_network.c
+++ b/src/mesh/mesh_network.c
@@ -41,9 +41,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "ble/mesh/adv_bearer.h"
-#include "ble/mesh/pb_adv.h"
-#include "ble/mesh/beacon.h"
+#include "mesh/adv_bearer.h"
+#include "mesh/pb_adv.h"
+#include "mesh/beacon.h"
 #include "provisioning.h"
 #include "provisioning_device.h"
 #include "mesh_keys.h"
@@ -51,7 +51,7 @@
 #include "btstack_memory.h"
 
 #ifdef ENABLE_MESH_GATT_BEARER
-#include "ble/mesh/gatt_bearer.h"
+#include "mesh/gatt_bearer.h"
 #endif
 
 // configuration
diff --git a/src/ble/mesh/mesh_network.h b/src/mesh/mesh_network.h
similarity index 100%
rename from src/ble/mesh/mesh_network.h
rename to src/mesh/mesh_network.h
diff --git a/src/ble/mesh/mesh_upper_transport.c b/src/mesh/mesh_upper_transport.c
similarity index 99%
rename from src/ble/mesh/mesh_upper_transport.c
rename to src/mesh/mesh_upper_transport.c
index 90f73c974..8baadb381 100644
--- a/src/ble/mesh/mesh_upper_transport.c
+++ b/src/mesh/mesh_upper_transport.c
@@ -40,9 +40,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "ble/mesh/beacon.h"
-#include "ble/mesh/mesh_lower_transport.h"
-#include "ble/mesh/mesh_upper_transport.h"
+#include "mesh/beacon.h"
+#include "mesh/mesh_lower_transport.h"
+#include "mesh/mesh_upper_transport.h"
 #include "btstack_util.h"
 #include "btstack_memory.h"
 #include "mesh_peer.h"
diff --git a/src/ble/mesh/mesh_upper_transport.h b/src/mesh/mesh_upper_transport.h
similarity index 99%
rename from src/ble/mesh/mesh_upper_transport.h
rename to src/mesh/mesh_upper_transport.h
index b0a87a77a..68eee7c3e 100644
--- a/src/ble/mesh/mesh_upper_transport.h
+++ b/src/mesh/mesh_upper_transport.h
@@ -47,7 +47,7 @@ extern "C"
 
 
 #include <stdint.h>
-#include "ble/mesh/mesh_network.h"
+#include "mesh/mesh_network.h"
 
 void mesh_transport_init();
 
diff --git a/src/ble/mesh/pb_adv.c b/src/mesh/pb_adv.c
similarity index 99%
rename from src/ble/mesh/pb_adv.c
rename to src/mesh/pb_adv.c
index ba4a6ae81..f537bcd65 100644
--- a/src/ble/mesh/pb_adv.c
+++ b/src/mesh/pb_adv.c
@@ -41,8 +41,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "ble/mesh/adv_bearer.h"
-#include "ble/mesh/beacon.h"
+#include "mesh/adv_bearer.h"
+#include "mesh/beacon.h"
 #include "provisioning.h"
 #include "btstack_util.h"
 #include "btstack_debug.h"
diff --git a/src/ble/mesh/pb_adv.h b/src/mesh/pb_adv.h
similarity index 100%
rename from src/ble/mesh/pb_adv.h
rename to src/mesh/pb_adv.h
diff --git a/src/ble/mesh/pb_gatt.c b/src/mesh/pb_gatt.c
similarity index 99%
rename from src/ble/mesh/pb_gatt.c
rename to src/mesh/pb_gatt.c
index f4a3db0a4..640ae98cc 100644
--- a/src/ble/mesh/pb_gatt.c
+++ b/src/mesh/pb_gatt.c
@@ -42,7 +42,7 @@
 #include "btstack_util.h"
 #include "btstack_debug.h"
 #include "btstack_event.h"
-#include "ble/mesh/pb_gatt.h"
+#include "mesh/pb_gatt.h"
 #include "ble/gatt-service/mesh_provisioning_service_server.h"
 #include "provisioning.h"
 #include "ble/att_server.h"
diff --git a/src/ble/mesh/pb_gatt.h b/src/mesh/pb_gatt.h
similarity index 100%
rename from src/ble/mesh/pb_gatt.h
rename to src/mesh/pb_gatt.h
diff --git a/test/mesh/CMakeLists.txt b/test/mesh/CMakeLists.txt
index 8ab5580ef..c5c46fbb2 100644
--- a/test/mesh/CMakeLists.txt
+++ b/test/mesh/CMakeLists.txt
@@ -18,8 +18,8 @@ include_directories(.)
 
 file(GLOB SOURCES_SRC       "../../src/*.c"                     "../../src/*.h" "../../example/sco_demo_util.c" "../../example/sco_demo_util.h")
 file(GLOB SOURCES_BLE       "../../src/ble/*.c"                 "../../src/ble/*.h")
-file(GLOB SOURCES_MESH      "../../src/ble/mesh/*.c"            "../../src/ble/mesh/*.h" )
 file(GLOB SOURCES_GATT      "../../src/ble/gatt-service/*.c"    "../../src/ble/gatt-service/*.h")
+file(GLOB SOURCES_MESH      "../../src/mesh/*.c"                "../../src/mesh/*.h" )
 file(GLOB SOURCES_UECC      "../../3rd-party/micro-ecc/uECC.c"  "../../3rd-party/micro-ecc/uECC.h")
 file(GLOB SOURCES_POSIX     "../../platform/posix/*.c"          "../../platform/posix/*.h")
 file(GLOB SOURCES_LIBUSB    "../../platform/libusb/*.c"         "../../platform/libusb/*.h")
diff --git a/test/mesh/Makefile b/test/mesh/Makefile
index 1d008004d..d0d08b978 100644
--- a/test/mesh/Makefile
+++ b/test/mesh/Makefile
@@ -35,7 +35,7 @@ CFLAGS  += -g -DUNIT_TEST -Wall \
 	-I$(BTSTACK_ROOT)/test/rijndael \
 
 VPATH += ${BTSTACK_ROOT}/test/rijndael
-VPATH += ${BTSTACK_ROOT}/src/ble/mesh
+VPATH += ${BTSTACK_ROOT}/src/mesh
 VPATH += ${BTSTACK_ROOT}/src/classic
 VPATH += ${BTSTACK_ROOT}/platform/posix
 VPATH += ${BTSTACK_ROOT}/platform/embedded
diff --git a/test/mesh/mesh.c b/test/mesh/mesh.c
index 3a834e510..3af8cb487 100644
--- a/test/mesh/mesh.c
+++ b/test/mesh/mesh.c
@@ -41,14 +41,14 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "ble/mesh/adv_bearer.h"
-#include "ble/mesh/gatt_bearer.h"
-#include "ble/mesh/beacon.h"
-#include "ble/mesh/mesh_crypto.h"
-#include "ble/mesh/mesh_lower_transport.h"
-#include "ble/mesh/mesh_upper_transport.h"
-#include "ble/mesh/pb_adv.h"
-#include "ble/mesh/pb_gatt.h"
+#include "mesh/adv_bearer.h"
+#include "mesh/gatt_bearer.h"
+#include "mesh/beacon.h"
+#include "mesh/mesh_crypto.h"
+#include "mesh/mesh_lower_transport.h"
+#include "mesh/mesh_upper_transport.h"
+#include "mesh/pb_adv.h"
+#include "mesh/pb_gatt.h"
 #include "ble/gatt-service/mesh_provisioning_service_server.h"
 #include "provisioning.h"
 #include "provisioning_device.h"
diff --git a/test/mesh/mesh_access.c b/test/mesh/mesh_access.c
index 1e1753ca8..264b99789 100644
--- a/test/mesh/mesh_access.c
+++ b/test/mesh/mesh_access.c
@@ -40,7 +40,7 @@
 #include <string.h>
 #include <stdio.h>
 #include <stdarg.h>
-#include "ble/mesh/mesh_upper_transport.h"
+#include "mesh/mesh_upper_transport.h"
 #include "mesh_access.h"
 #include "btstack_memory.h"
 #include "btstack_debug.h"
diff --git a/test/mesh/mesh_access.h b/test/mesh/mesh_access.h
index 9a07c81fa..f5f1c243e 100644
--- a/test/mesh/mesh_access.h
+++ b/test/mesh/mesh_access.h
@@ -40,7 +40,7 @@
 
 #include <stdint.h>
 #include "btstack_linked_list.h"
-#include "ble/mesh/mesh_lower_transport.h"
+#include "mesh/mesh_lower_transport.h"
 #include "mesh_keys.h"
 #include "bluetooth_company_id.h"
 
diff --git a/test/mesh/mesh_configuration_server.c b/test/mesh/mesh_configuration_server.c
index 3a4b36ed8..c8c7daca1 100644
--- a/test/mesh/mesh_configuration_server.c
+++ b/test/mesh/mesh_configuration_server.c
@@ -41,19 +41,19 @@
 #include <stdio.h>
 #include "mesh_configuration_server.h"
 #include "btstack_util.h"
-#include "ble/mesh/mesh_network.h"
-#include "ble/mesh/mesh_upper_transport.h"
+#include "mesh/mesh_network.h"
+#include "mesh/mesh_upper_transport.h"
 #include "mesh_keys.h"
 #include "mesh_access.h"
 #include "mesh_foundation.h"
 #include "bluetooth_company_id.h"
 #include "btstack_memory.h"
-#include "ble/mesh/mesh_crypto.h"
+#include "mesh/mesh_crypto.h"
 #include "mesh_virtual_addresses.h"
 #include "btstack_debug.h"
 #include "btstack_tlv.h"
 #include "mesh_proxy.h"
-#include "ble/mesh/gatt_bearer.h"
+#include "mesh/gatt_bearer.h"
 
 #define MESH_HEARTBEAT_FEATURES_SUPPORTED_MASK 0x000f
 
diff --git a/test/mesh/mesh_foundation.h b/test/mesh/mesh_foundation.h
index 4a3be20f5..8a793be37 100644
--- a/test/mesh/mesh_foundation.h
+++ b/test/mesh/mesh_foundation.h
@@ -47,7 +47,7 @@ extern "C"
 
 
 #include <stdint.h>
-#include "ble/mesh/mesh_network.h"
+#include "mesh/mesh_network.h"
 
 #define MESH_TTL_MAX 0x7f
 #define MESH_FOUNDATION_STATE_NOT_SUPPORTED 2
diff --git a/test/mesh/mesh_generic_client.c b/test/mesh/mesh_generic_client.c
index a5bc6b59d..d0a237f51 100644
--- a/test/mesh/mesh_generic_client.c
+++ b/test/mesh/mesh_generic_client.c
@@ -42,8 +42,8 @@
 #include "mesh_generic_client.h"
 #include "btstack_util.h"
 #include "mesh_generic_model.h"
-#include "ble/mesh/mesh_network.h"
-#include "ble/mesh/mesh_upper_transport.h"
+#include "mesh/mesh_network.h"
+#include "mesh/mesh_upper_transport.h"
 #include "mesh_keys.h"
 #include "mesh_access.h"
 #include "mesh_foundation.h"
diff --git a/test/mesh/mesh_generic_level_server.c b/test/mesh/mesh_generic_level_server.c
index cb1b90cf5..9acdaafee 100644
--- a/test/mesh/mesh_generic_level_server.c
+++ b/test/mesh/mesh_generic_level_server.c
@@ -42,8 +42,8 @@
 #include "mesh_generic_level_server.h"
 #include "btstack_util.h"
 #include "mesh_generic_model.h"
-#include "ble/mesh/mesh_network.h"
-#include "ble/mesh/mesh_upper_transport.h"
+#include "mesh/mesh_network.h"
+#include "mesh/mesh_upper_transport.h"
 #include "mesh_keys.h"
 #include "mesh_access.h"
 #include "mesh_foundation.h"
diff --git a/test/mesh/mesh_generic_server.c b/test/mesh/mesh_generic_server.c
index d4f24af49..223067045 100644
--- a/test/mesh/mesh_generic_server.c
+++ b/test/mesh/mesh_generic_server.c
@@ -42,8 +42,8 @@
 #include "mesh_generic_server.h"
 #include "btstack_util.h"
 #include "mesh_generic_model.h"
-#include "ble/mesh/mesh_network.h"
-#include "ble/mesh/mesh_upper_transport.h"
+#include "mesh/mesh_network.h"
+#include "mesh/mesh_upper_transport.h"
 #include "mesh_keys.h"
 #include "mesh_access.h"
 #include "mesh_foundation.h"
diff --git a/test/mesh/mesh_keys.h b/test/mesh/mesh_keys.h
index 53384ac71..86f5c2ec7 100644
--- a/test/mesh/mesh_keys.h
+++ b/test/mesh/mesh_keys.h
@@ -47,8 +47,8 @@ extern "C"
 
 
 #include <stdint.h>
-#include "ble/mesh/mesh_network.h"
-#include "ble/mesh/adv_bearer.h"
+#include "mesh/mesh_network.h"
+#include "mesh/adv_bearer.h"
 
 
 typedef enum {
diff --git a/test/mesh/mesh_message_test.c b/test/mesh/mesh_message_test.c
index 0da347833..b19d9745b 100644
--- a/test/mesh/mesh_message_test.c
+++ b/test/mesh/mesh_message_test.c
@@ -5,12 +5,13 @@
 
 #include "bluetooth_data_types.h"
 #include "bluetooth_gatt.h"
-#include "ble/mesh/adv_bearer.h"
-#include "ble/mesh/gatt_bearer.h"
-#include "ble/mesh/mesh_crypto.h"
-#include "ble/mesh/mesh_network.h"
-#include "ble/mesh/mesh_lower_transport.h"
-#include "ble/mesh/mesh_upper_transport.h"
+#include "mesh_peer.h"
+#include "mesh/adv_bearer.h"
+#include "mesh/gatt_bearer.h"
+#include "mesh/mesh_crypto.h"
+#include "mesh/mesh_network.h"
+#include "mesh/mesh_lower_transport.h"
+#include "mesh/mesh_upper_transport.h"
 #include "btstack_util.h"
 #include "provisioning.h"
 #include "btstack_memory.h"
diff --git a/test/mesh/mesh_peer.c b/test/mesh/mesh_peer.c
index 66330e47b..cde07901c 100644
--- a/test/mesh/mesh_peer.c
+++ b/test/mesh/mesh_peer.c
@@ -4,8 +4,8 @@
 
 #include "btstack_memory.h"
 #include "btstack_util.h"
-#include "ble/mesh/beacon.h"
-#include "ble/mesh/mesh_upper_transport.h"
+#include "mesh/beacon.h"
+#include "mesh/mesh_upper_transport.h"
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/test/mesh/mesh_peer.h b/test/mesh/mesh_peer.h
index 35a843541..3ac7f6f2f 100644
--- a/test/mesh/mesh_peer.h
+++ b/test/mesh/mesh_peer.h
@@ -38,7 +38,11 @@
 #ifndef __MESH_PEER_H
 #define __MESH_PEER_H
 
-#include "ble/mesh/mesh_network.h"
+#if defined __cplusplus
+extern "C" {
+#endif
+
+#include "mesh/mesh_network.h"
 
 // mesh seq auth validation
 typedef struct {
@@ -61,6 +65,10 @@ typedef struct {
 mesh_peer_t * mesh_peer_for_addr(uint16_t address);
 
 // reset seq auth == replay protection
-void mesh_seq_auth_reset();
+void mesh_seq_auth_reset(void);
+
+#if defined __cplusplus
+}
+#endif
 
 #endif //__MESH_PEER_H
diff --git a/test/mesh/mesh_proxy.c b/test/mesh/mesh_proxy.c
index 908075493..ee1d29a95 100644
--- a/test/mesh/mesh_proxy.c
+++ b/test/mesh/mesh_proxy.c
@@ -39,8 +39,8 @@
 
 #include <string.h>
 
-#include "ble/mesh/adv_bearer.h"
-#include "ble/mesh/mesh_crypto.h"
+#include "mesh/adv_bearer.h"
+#include "mesh/mesh_crypto.h"
 #include "bluetooth_company_id.h"
 #include "bluetooth_data_types.h"
 #include "bluetooth_gatt.h"
diff --git a/test/mesh/provisioner.c b/test/mesh/provisioner.c
index e0d6c4f51..7bc1f80db 100644
--- a/test/mesh/provisioner.c
+++ b/test/mesh/provisioner.c
@@ -41,9 +41,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "ble/mesh/adv_bearer.h"
-#include "ble/mesh/pb_adv.h"
-#include "ble/mesh/beacon.h"
+#include "mesh/adv_bearer.h"
+#include "mesh/pb_adv.h"
+#include "mesh/beacon.h"
 #include "provisioning.h"
 #include "provisioning_provisioner.h"
 #include "btstack.h"
diff --git a/test/mesh/provisioning_device.c b/test/mesh/provisioning_device.c
index b27637ea2..2e7deec3a 100644
--- a/test/mesh/provisioning_device.c
+++ b/test/mesh/provisioning_device.c
@@ -42,10 +42,10 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "ble/mesh/pb_adv.h"
-#include "ble/mesh/pb_gatt.h"
+#include "mesh/pb_adv.h"
+#include "mesh/pb_gatt.h"
 
-#include "ble/mesh/mesh_crypto.h"
+#include "mesh/mesh_crypto.h"
 #include "classic/rfcomm.h" // for crc8
 #include "btstack.h"
 #include "provisioning.h"
diff --git a/test/mesh/provisioning_device_test.cpp b/test/mesh/provisioning_device_test.cpp
index e6aaefccf..107c5d3ef 100644
--- a/test/mesh/provisioning_device_test.cpp
+++ b/test/mesh/provisioning_device_test.cpp
@@ -39,8 +39,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "ble/mesh/pb_adv.h"
-#include "ble/mesh/pb_gatt.h"
+#include "mesh/pb_adv.h"
+#include "mesh/pb_gatt.h"
 #include "ble/gatt-service/mesh_provisioning_service_server.h"
 #include "provisioning.h"
 #include "provisioning_device.h"
diff --git a/test/mesh/provisioning_provisioner.c b/test/mesh/provisioning_provisioner.c
index a188b44f0..1e5677b86 100644
--- a/test/mesh/provisioning_provisioner.c
+++ b/test/mesh/provisioning_provisioner.c
@@ -41,8 +41,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "ble/mesh/pb_adv.h"
-#include "ble/mesh/mesh_crypto.h"
+#include "mesh/pb_adv.h"
+#include "mesh/mesh_crypto.h"
 #include "classic/rfcomm.h" // for crc8
 #include "btstack.h"
 #include "provisioning.h"
diff --git a/test/mesh/provisioning_provisioner_test.cpp b/test/mesh/provisioning_provisioner_test.cpp
index 1611dfb0d..3d0d6f315 100644
--- a/test/mesh/provisioning_provisioner_test.cpp
+++ b/test/mesh/provisioning_provisioner_test.cpp
@@ -39,8 +39,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "ble/mesh/pb_adv.h"
-#include "ble/mesh/pb_gatt.h"
+#include "mesh/pb_adv.h"
+#include "mesh/pb_gatt.h"
 #include "ble/gatt-service/mesh_provisioning_service_server.h"
 #include "provisioning.h"
 #include "provisioning_provisioner.h"
diff --git a/tool/btstack_memory_generator.py b/tool/btstack_memory_generator.py
index cc9f83925..464da0c59 100755
--- a/tool/btstack_memory_generator.py
+++ b/tool/btstack_memory_generator.py
@@ -83,7 +83,7 @@ extern "C" {
 #endif
 
 #ifdef ENABLE_MESH
-#include "ble/mesh/mesh_network.h"
+#include "mesh/mesh_network.h"
 #include "mesh_keys.h"
 #include "mesh_virtual_addresses.h"
 #endif