diff --git a/src/ble/gatt-service/mesh_provisioning_service_server.c b/src/ble/gatt-service/mesh_provisioning_service_server.c
index e9f4b1f69..9b01dd1c6 100644
--- a/src/ble/gatt-service/mesh_provisioning_service_server.c
+++ b/src/ble/gatt-service/mesh_provisioning_service_server.c
@@ -37,19 +37,19 @@
 
 #define __BTSTACK_FILE__ "mesh_provisioning_service_server.c"
 
-#include "bluetooth.h"
-#include "btstack_defines.h"
+#include "ble/gatt-service/mesh_provisioning_service_server.h"
+
 #include "ble/att_db.h"
 #include "ble/att_server.h"
-#include "btstack_util.h"
+#include "bluetooth.h"
 #include "bluetooth_gatt.h"
 #include "btstack_debug.h"
-#include "l2cap.h"
-#include "hci.h"
+#include "btstack_defines.h"
 #include "btstack_event.h"
+#include "btstack_util.h"
+#include "hci.h"
 
-#include "ble/gatt-service/mesh_provisioning_service_server.h"
-#include "provisioning.h"
+#include "mesh/provisioning.h"
 
 typedef struct {
     hci_con_handle_t con_handle;
diff --git a/src/ble/gatt-service/mesh_provisioning_service_server.h b/src/ble/gatt-service/mesh_provisioning_service_server.h
index fe101344c..4276dacff 100644
--- a/src/ble/gatt-service/mesh_provisioning_service_server.h
+++ b/src/ble/gatt-service/mesh_provisioning_service_server.h
@@ -38,6 +38,7 @@
 #define __MESH_PROVISIONING_SERVICE_SERVER_H
 
 #include <stdint.h>
+
 #include "hci.h"
 
 #if defined __cplusplus
diff --git a/src/ble/gatt-service/mesh_proxy_service_server.c b/src/ble/gatt-service/mesh_proxy_service_server.c
index a4f83356c..c1bfa21cb 100644
--- a/src/ble/gatt-service/mesh_proxy_service_server.c
+++ b/src/ble/gatt-service/mesh_proxy_service_server.c
@@ -37,19 +37,19 @@
 
 #define __BTSTACK_FILE__ "mesh_proxy_service_server.c"
 
-#include "bluetooth.h"
-#include "btstack_defines.h"
+#include "ble/gatt-service/mesh_proxy_service_server.h"
+
 #include "ble/att_db.h"
 #include "ble/att_server.h"
-#include "btstack_util.h"
+#include "bluetooth.h"
 #include "bluetooth_gatt.h"
 #include "btstack_debug.h"
-#include "l2cap.h"
-#include "hci.h"
+#include "btstack_defines.h"
 #include "btstack_event.h"
+#include "btstack_util.h"
+#include "hci.h"
 
-#include "ble/gatt-service/mesh_proxy_service_server.h"
-#include "provisioning.h"
+#include "mesh/provisioning.h"
 
 typedef struct {
     hci_con_handle_t con_handle;
diff --git a/src/ble/gatt-service/mesh_proxy_service_server.h b/src/ble/gatt-service/mesh_proxy_service_server.h
index b2adb36e8..43763069b 100644
--- a/src/ble/gatt-service/mesh_proxy_service_server.h
+++ b/src/ble/gatt-service/mesh_proxy_service_server.h
@@ -38,6 +38,7 @@
 #define __MESH_PROXY_SERVICE_SERVER_H
 
 #include <stdint.h>
+
 #include "hci.h"
 
 #if defined __cplusplus
diff --git a/src/btstack_memory.h b/src/btstack_memory.h
index c9e11e0a8..8acc2e808 100644
--- a/src/btstack_memory.h
+++ b/src/btstack_memory.h
@@ -76,8 +76,8 @@ extern "C" {
 
 #ifdef ENABLE_MESH
 #include "mesh/mesh_network.h"
-#include "mesh_keys.h"
-#include "mesh_virtual_addresses.h"
+#include "mesh/mesh_keys.h"
+#include "mesh/mesh_virtual_addresses.h"
 #endif
 
 /* API_START */
diff --git a/test/mesh/CMakeLists.txt b/test/mesh/CMakeLists.txt
index 9d350ba75..9253bb55e 100644
--- a/test/mesh/CMakeLists.txt
+++ b/test/mesh/CMakeLists.txt
@@ -28,7 +28,7 @@ file(GLOB SOURCES_LIBUSB    "../../platform/libusb/*.c"         "../../platform/
 file(GLOB SOURCES_OFF "../../src/ble/le_device_db_memory.c" "../../src/ble/le_device_db_memory.h" "../../src/ble/le_device_db_tlv.c" "../../src/ble/le_device_db_tlv.h")
 list(REMOVE_ITEM SOURCES_BLE ${SOURCES_OFF})
 
-set(SOURCES_MESH_NEW main.c mesh.c mesh_access.c mesh_access.h mesh_configuration_server.c mesh_foundation.c mesh_foundation.h mesh_keys.c mesh_keys.h mesh_virtual_addresses.c mesh_virtual_addresses.h mesh_peer.c mesh_peer.h mesh_proxy.h mesh_proxy.c provisioner.c provisioning.c provisioning.h provisioning_device.c provisioning_device.h provisioning_provisioner.c provisioning_provisioner.h mesh_generic_server.h mesh_generic_server.c mesh_iv_index_seq_number.c )
+set(SOURCES_MESH_NEW main.c)
 
 set(SOURCES 
 	${SOURCES_POSIX}
@@ -46,7 +46,7 @@ list(SORT SOURCES)
 add_library(btstack STATIC ${SOURCES})
 
 # list of targets
-set(EXAMPLES_C mesh.c)
+set(EXAMPLES_C mesh_pts.c)
 
 file(GLOB EXAMPLES_GATT "*.gatt")
 
diff --git a/tool/btstack_memory_generator.py b/tool/btstack_memory_generator.py
index 9e7dd97d6..77db908cf 100755
--- a/tool/btstack_memory_generator.py
+++ b/tool/btstack_memory_generator.py
@@ -84,8 +84,8 @@ extern "C" {
 
 #ifdef ENABLE_MESH
 #include "mesh/mesh_network.h"
-#include "mesh_keys.h"
-#include "mesh_virtual_addresses.h"
+#include "mesh/mesh_keys.h"
+#include "mesh/mesh_virtual_addresses.h"
 #endif
 
 /* API_START */