diff --git a/nimble/host/mesh/include/mesh/cdb.h b/nimble/host/mesh/include/mesh/cdb.h
index 444fb5d29..fa691eb64 100644
--- a/nimble/host/mesh/include/mesh/cdb.h
+++ b/nimble/host/mesh/include/mesh/cdb.h
@@ -262,4 +262,4 @@ struct bt_mesh_cdb_app_key *bt_mesh_cdb_app_key_get(uint16_t app_idx);
  */
 void bt_mesh_cdb_app_key_store(const struct bt_mesh_cdb_app_key *key);
 
-#endif /* ZEPHYR_INCLUDE_BLUETOOTH_MESH_CDB_H_ */
\ No newline at end of file
+#endif /* ZEPHYR_INCLUDE_BLUETOOTH_MESH_CDB_H_ */
diff --git a/nimble/host/mesh/include/mesh/cfg.h b/nimble/host/mesh/include/mesh/cfg.h
index 6fd69266e..422ef3e66 100644
--- a/nimble/host/mesh/include/mesh/cfg.h
+++ b/nimble/host/mesh/include/mesh/cfg.h
@@ -488,4 +488,4 @@ ssize_t bt_mesh_app_keys_get(uint16_t net_idx, uint16_t app_idxs[], size_t max,
  * @}
  */
 
-#endif /* _BT_MESH_CFG_H_ */
\ No newline at end of file
+#endif /* _BT_MESH_CFG_H_ */
diff --git a/nimble/host/mesh/include/mesh/heartbeat.h b/nimble/host/mesh/include/mesh/heartbeat.h
index b9990f6fd..2e4986094 100644
--- a/nimble/host/mesh/include/mesh/heartbeat.h
+++ b/nimble/host/mesh/include/mesh/heartbeat.h
@@ -120,4 +120,4 @@ extern struct bt_mesh_hb_cb hb_cb;
  * @}
  */
 
-#endif /* _BLUETOOTH_MESH_HEARTBEAT_H_ */
\ No newline at end of file
+#endif /* _BLUETOOTH_MESH_HEARTBEAT_H_ */
diff --git a/nimble/host/mesh/include/mesh/msg.h b/nimble/host/mesh/include/mesh/msg.h
index 0cc00ff35..e327545b1 100644
--- a/nimble/host/mesh/include/mesh/msg.h
+++ b/nimble/host/mesh/include/mesh/msg.h
@@ -222,4 +222,4 @@ bool bt_mesh_msg_ack_ctx_match(const struct bt_mesh_msg_ack_ctx *ack,
 /**
  * @}
  */
-#endif /* ZEPHYR_INCLUDE_BLUETOOTH_MESH_MSG_H_ */
\ No newline at end of file
+#endif /* ZEPHYR_INCLUDE_BLUETOOTH_MESH_MSG_H_ */
diff --git a/nimble/host/mesh/src/access.c b/nimble/host/mesh/src/access.c
index e498910db..2c07b0947 100644
--- a/nimble/host/mesh/src/access.c
+++ b/nimble/host/mesh/src/access.c
@@ -1310,4 +1310,4 @@ void bt_mesh_access_init(void)
 	SYSINIT_PANIC_ASSERT_MSG(rc == 0,
 				 "Failed to register bt_mesh_access conf");
     #endif
-}
\ No newline at end of file
+}
diff --git a/nimble/host/mesh/src/adv_legacy.c b/nimble/host/mesh/src/adv_legacy.c
index 94065bc9b..5bebff896 100644
--- a/nimble/host/mesh/src/adv_legacy.c
+++ b/nimble/host/mesh/src/adv_legacy.c
@@ -242,4 +242,4 @@ int bt_mesh_adv_start(const struct ble_gap_adv_params *param, int32_t duration,
 	adv_timeout = duration;
 	return bt_le_adv_start(param, duration, ad, ad_len, sd, sd_len);
 }
-#endif
\ No newline at end of file
+#endif
diff --git a/nimble/host/mesh/src/app_keys.c b/nimble/host/mesh/src/app_keys.c
index 97589968d..acc51f2a6 100644
--- a/nimble/host/mesh/src/app_keys.c
+++ b/nimble/host/mesh/src/app_keys.c
@@ -714,4 +714,4 @@ void bt_mesh_app_key_init(void)
 	SYSINIT_PANIC_ASSERT_MSG(rc == 0,
 				 "Failed to register bt_mesh_app_key conf");
 #endif
-}
\ No newline at end of file
+}
diff --git a/nimble/host/mesh/src/app_keys.h b/nimble/host/mesh/src/app_keys.h
index 1c560560d..3ef9ce7c8 100644
--- a/nimble/host/mesh/src/app_keys.h
+++ b/nimble/host/mesh/src/app_keys.h
@@ -65,4 +65,4 @@ extern void (*bt_mesh_app_key_cb_list[1]) (uint16_t app_idx, uint16_t net_idx,
 /** @brief Store pending application keys in persistent storage. */
 void bt_mesh_app_key_pending_store(void);
 void bt_mesh_app_key_init(void);
-#endif /* _BT_MESH_APP_KEYS_H_ */
\ No newline at end of file
+#endif /* _BT_MESH_APP_KEYS_H_ */
diff --git a/nimble/host/mesh/src/cfg.c b/nimble/host/mesh/src/cfg.c
index ec68cac7b..282aefaf4 100644
--- a/nimble/host/mesh/src/cfg.c
+++ b/nimble/host/mesh/src/cfg.c
@@ -385,4 +385,4 @@ void bt_mesh_cfg_default_set(void)
 	if (CONFIG_BT_MESH_FRIEND_ENABLED) {
 		atomic_set_bit(bt_mesh.flags, BT_MESH_FRIEND);
 	}
-}
\ No newline at end of file
+}
diff --git a/nimble/host/mesh/src/cfg.h b/nimble/host/mesh/src/cfg.h
index 0bd7ad39c..4901655f5 100644
--- a/nimble/host/mesh/src/cfg.h
+++ b/nimble/host/mesh/src/cfg.h
@@ -7,4 +7,4 @@
 void bt_mesh_cfg_default_set(void);
 void bt_mesh_cfg_pending_store(void);
 
-bool bt_mesh_fixed_group_match(uint16_t addr);
\ No newline at end of file
+bool bt_mesh_fixed_group_match(uint16_t addr);
diff --git a/nimble/host/mesh/src/heartbeat.c b/nimble/host/mesh/src/heartbeat.c
index 50cfdb6d5..faf2f7661 100644
--- a/nimble/host/mesh/src/heartbeat.c
+++ b/nimble/host/mesh/src/heartbeat.c
@@ -461,4 +461,4 @@ void bt_mesh_hb_pub_init(void)
 	SYSINIT_PANIC_ASSERT_MSG(rc == 0,
 				 "Failed to register bt_mesh_hb_pub conf");
 #endif
-}
\ No newline at end of file
+}
diff --git a/nimble/host/mesh/src/heartbeat.h b/nimble/host/mesh/src/heartbeat.h
index 7fcfacf19..a03636663 100644
--- a/nimble/host/mesh/src/heartbeat.h
+++ b/nimble/host/mesh/src/heartbeat.h
@@ -40,4 +40,4 @@ uint8_t bt_mesh_hb_pub_set(struct bt_mesh_hb_pub *hb_pub);
 uint8_t bt_mesh_hb_sub_set(uint16_t src, uint16_t dst, uint32_t period);
 void bt_mesh_hb_sub_reset_count(void);
 void bt_mesh_hb_pub_pending_store(void);
-void bt_mesh_hb_pub_init(void);
\ No newline at end of file
+void bt_mesh_hb_pub_init(void);
diff --git a/nimble/host/mesh/src/light_model.c b/nimble/host/mesh/src/light_model.c
index bc4792c63..e7199519b 100644
--- a/nimble/host/mesh/src/light_model.c
+++ b/nimble/host/mesh/src/light_model.c
@@ -55,4 +55,3 @@ int light_model_light_lightness_set(struct bt_mesh_model *model, int16_t lightne
 {
 	return light_model_gen_level_set(model, lightness);
 }
-
diff --git a/nimble/host/mesh/src/model_cli.c b/nimble/host/mesh/src/model_cli.c
index fd052426a..22f9b99ee 100644
--- a/nimble/host/mesh/src/model_cli.c
+++ b/nimble/host/mesh/src/model_cli.c
@@ -302,4 +302,3 @@ done:
 	os_mbuf_free_chain(msg);
 	return err;
 }
-
diff --git a/nimble/host/mesh/src/msg.c b/nimble/host/mesh/src/msg.c
index f75082cb9..b788ffe1e 100644
--- a/nimble/host/mesh/src/msg.c
+++ b/nimble/host/mesh/src/msg.c
@@ -81,4 +81,4 @@ bool bt_mesh_msg_ack_ctx_match(const struct bt_mesh_msg_ack_ctx *ack,
 	}
 
 	return true;
-}
\ No newline at end of file
+}
diff --git a/nimble/host/mesh/src/pb_gatt.c b/nimble/host/mesh/src/pb_gatt.c
index 906abd2fc..9a0d7091e 100644
--- a/nimble/host/mesh/src/pb_gatt.c
+++ b/nimble/host/mesh/src/pb_gatt.c
@@ -172,4 +172,4 @@ const struct prov_bearer pb_gatt = {
 	.send = buf_send,
 	.clear_tx = clear_tx,
 };
-#endif
\ No newline at end of file
+#endif
diff --git a/nimble/host/mesh/src/pb_gatt_srv.c b/nimble/host/mesh/src/pb_gatt_srv.c
index 61fadb6fc..ee37819d5 100644
--- a/nimble/host/mesh/src/pb_gatt_srv.c
+++ b/nimble/host/mesh/src/pb_gatt_srv.c
@@ -468,4 +468,4 @@ int bt_mesh_pb_gatt_adv_start(void)
 
 	return err;
 }
-#endif
\ No newline at end of file
+#endif
diff --git a/nimble/host/mesh/src/pb_gatt_srv.h b/nimble/host/mesh/src/pb_gatt_srv.h
index 816089477..a5ebce528 100644
--- a/nimble/host/mesh/src/pb_gatt_srv.h
+++ b/nimble/host/mesh/src/pb_gatt_srv.h
@@ -28,4 +28,4 @@ extern struct svc_handles {
 	uint16_t prov_data_out_h;
 } svc_handles;
 
-#endif /* __PB_GATT_SRV_H__ */
\ No newline at end of file
+#endif /* __PB_GATT_SRV_H__ */
diff --git a/nimble/host/mesh/src/provisioner.h b/nimble/host/mesh/src/provisioner.h
index ccda47efe..315bde299 100644
--- a/nimble/host/mesh/src/provisioner.h
+++ b/nimble/host/mesh/src/provisioner.h
@@ -7,4 +7,4 @@
  */
 
 int bt_mesh_pb_adv_open(const uint8_t uuid[16], uint16_t net_idx, uint16_t addr,
-			uint8_t attention_duration);
\ No newline at end of file
+			uint8_t attention_duration);
diff --git a/nimble/host/mesh/src/proxy_srv.c b/nimble/host/mesh/src/proxy_srv.c
index f634f400e..3507d0a45 100644
--- a/nimble/host/mesh/src/proxy_srv.c
+++ b/nimble/host/mesh/src/proxy_srv.c
@@ -982,4 +982,4 @@ int bt_mesh_proxy_init(void)
 	ble_gatts_svc_set_visibility(svc_handles.prov_h, 0);
 
 	return 0;
-}
\ No newline at end of file
+}
diff --git a/nimble/host/mesh/src/rpl.c b/nimble/host/mesh/src/rpl.c
index 6fd08b2fe..3a54414ce 100644
--- a/nimble/host/mesh/src/rpl.c
+++ b/nimble/host/mesh/src/rpl.c
@@ -377,4 +377,4 @@ void bt_mesh_rpl_init(void)
 	SYSINIT_PANIC_ASSERT_MSG(rc == 0,
 				 "Failed to register bt_mesh_rpl conf");
 #endif
-}
\ No newline at end of file
+}
diff --git a/nimble/host/mesh/src/rpl.h b/nimble/host/mesh/src/rpl.h
index b79ce887d..9d110d9da 100644
--- a/nimble/host/mesh/src/rpl.h
+++ b/nimble/host/mesh/src/rpl.h
@@ -29,4 +29,4 @@ bool bt_mesh_rpl_check(struct bt_mesh_net_rx *rx,
 void bt_mesh_rpl_clear(void);
 void bt_mesh_rpl_update(struct bt_mesh_rpl *rpl,
 			struct bt_mesh_net_rx *rx);
-void bt_mesh_rpl_init(void);
\ No newline at end of file
+void bt_mesh_rpl_init(void);
diff --git a/nimble/host/mesh/src/subnet.c b/nimble/host/mesh/src/subnet.c
index 14aa8623f..9108cc471 100644
--- a/nimble/host/mesh/src/subnet.c
+++ b/nimble/host/mesh/src/subnet.c
@@ -882,4 +882,4 @@ void bt_mesh_net_key_init(void)
 	SYSINIT_PANIC_ASSERT_MSG(rc == 0,
 				 "Failed to register bt_mesh_net_key conf");
 #endif
-}
\ No newline at end of file
+}
diff --git a/nimble/host/mesh/src/subnet.h b/nimble/host/mesh/src/subnet.h
index b3ac89927..b64177d36 100644
--- a/nimble/host/mesh/src/subnet.h
+++ b/nimble/host/mesh/src/subnet.h
@@ -203,4 +203,4 @@ void bt_mesh_subnet_store(uint16_t net_idx);
 /** @brief Store the pending Subnets in persistent storage. */
 void bt_mesh_subnet_pending_store(void);
 void bt_mesh_net_key_init(void);
-#endif /* _BLUETOOTH_MESH_SUBNET_H_ */
\ No newline at end of file
+#endif /* _BLUETOOTH_MESH_SUBNET_H_ */
diff --git a/nimble/host/mesh/src/transport.h b/nimble/host/mesh/src/transport.h
index a1af9a4bd..ad7a59f23 100644
--- a/nimble/host/mesh/src/transport.h
+++ b/nimble/host/mesh/src/transport.h
@@ -103,4 +103,4 @@ uint8_t *bt_mesh_va_label_get(uint16_t addr);
 
 void bt_mesh_va_pending_store(void);
 
-void bt_mesh_va_init(void);
\ No newline at end of file
+void bt_mesh_va_init(void);
diff --git a/nimble/host/mesh/syscfg.yml b/nimble/host/mesh/syscfg.yml
index ae8190f85..ca74cdff7 100644
--- a/nimble/host/mesh/syscfg.yml
+++ b/nimble/host/mesh/syscfg.yml
@@ -979,4 +979,4 @@ syscfg.vals.BLE_MESH_PB_ADV:
 syscfg.vals.'BLE_MESH_PB_GATT':
     BLE_MESH_PROXY_MSG_LEN: 66
 syscfg.vals.'BLE_MESH_GATT_PROXY':
-    BLE_MESH_PROXY_MSG_LEN: 33
\ No newline at end of file
+    BLE_MESH_PROXY_MSG_LEN: 33