diff --git a/port/stm32-l451-miromico-sx1280/port/btstack_config.h b/port/stm32-l451-miromico-sx1280/port/btstack_config.h
index edff15276..fa46811f7 100644
--- a/port/stm32-l451-miromico-sx1280/port/btstack_config.h
+++ b/port/stm32-l451-miromico-sx1280/port/btstack_config.h
@@ -1,5 +1,5 @@
 //
-// btstack_config.h 
+// btstack_config.h
 //
 
 #ifndef BTSTACK_CONFIG_H
diff --git a/port/stm32-wb55xx-nucleo-freertos/port/btstack_config.h b/port/stm32-wb55xx-nucleo-freertos/port/btstack_config.h
index 579ffe791..233e1f1ea 100644
--- a/port/stm32-wb55xx-nucleo-freertos/port/btstack_config.h
+++ b/port/stm32-wb55xx-nucleo-freertos/port/btstack_config.h
@@ -1,5 +1,5 @@
 //
-// btstack_config.h 
+// btstack_config.h
 //
 //  Made for BlueKitchen by OneWave with <3
 //      Author: ftrefou@onewave.io
diff --git a/tool/metrics/btstack_config.h b/tool/metrics/btstack_config.h
index ad119ed2f..34273eb14 100644
--- a/tool/metrics/btstack_config.h
+++ b/tool/metrics/btstack_config.h
@@ -2,28 +2,28 @@
 // btstack_config.h for metric calculation
 //
 
-#ifndef __BTSTACK_CONFIG
-#define __BTSTACK_CONFIG
+#ifndef BTSTACK_CONFIG_H
+#define BTSTACK_CONFIG_H
 
 // Port related features
 #define HAVE_BTSTACK_STDIN
 
 // BTstack features that can be enabled
+#define ENABLE_ATT_DELAYED_RESPONSE
 #define ENABLE_BLE
 #define ENABLE_CLASSIC
 #define ENABLE_HFP_WIDE_BAND_SPEECH
+#define ENABLE_L2CAP_ENHANCED_RETRANSMISSION_MODE
 #define ENABLE_LE_CENTRAL
+#define ENABLE_LE_DATA_CHANNELS
+#define ENABLE_LE_DATA_LENGTH_EXTENSION
 #define ENABLE_LE_PERIPHERAL
 #define ENABLE_LE_SECURE_CONNECTIONS
-#define ENABLE_LE_DATA_CHANNELS
-#define ENABLE_MICRO_ECC_FOR_LE_SECURE_CONNECTIONS
-#define ENABLE_LE_DATA_LENGTH_EXTENSION
-#define ENABLE_ATT_DELAYED_RESPONSE
 #define ENABLE_LOG_ERROR
-#define ENABLE_LOG_INFO 
+#define ENABLE_LOG_INFO
+#define ENABLE_MICRO_ECC_FOR_LE_SECURE_CONNECTIONS
 #define ENABLE_SCO_OVER_HCI
 #define ENABLE_SDP_DES_DUMP
-#define ENABLE_L2CAP_ENHANCED_RETRANSMISSION_MODE
 
 // BTstack configuration. buffers, sizes, ...
 #define HCI_ACL_PAYLOAD_SIZE (1691 + 4)
@@ -33,8 +33,8 @@
 
 #define MAX_ATT_DB_SIZE 1024
 
-#define NVM_NUM_LINK_KEYS     16
 #define NVM_NUM_DEVICE_DB_ENTRIES     16
+#define NVM_NUM_LINK_KEYS     16
 
 // Mesh Configuration
 #define ENABLE_MESH
@@ -42,12 +42,12 @@
 #define ENABLE_MESH_GATT_BEARER
 #define ENABLE_MESH_PB_ADV
 #define ENABLE_MESH_PB_GATT
-#define ENABLE_MESH_PROXY_SERVER
 #define ENABLE_MESH_PROVISIONER
+#define ENABLE_MESH_PROXY_SERVER
 
+#define MAX_NR_MESH_SUBNETS            2
 #define MAX_NR_MESH_TRANSPORT_KEYS    16
 #define MAX_NR_MESH_VIRTUAL_ADDRESSES 16
-#define MAX_NR_MESH_SUBNETS            2
 
 // allow for one NetKey update
 #define MAX_NR_MESH_NETWORK_KEYS      (MAX_NR_MESH_SUBNETS+1)