diff --git a/libs/openzap/mod_openzap/mod_openzap.c b/libs/openzap/mod_openzap/mod_openzap.c
index cb4e8fbae2..843e77a9a1 100644
--- a/libs/openzap/mod_openzap/mod_openzap.c
+++ b/libs/openzap/mod_openzap/mod_openzap.c
@@ -2912,5 +2912,5 @@ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_openzap_shutdown)
  * c-basic-offset:4
  * End:
  * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4 
+ * vim:set softtabstop=4 shiftwidth=4 tabstop=4:
  */
diff --git a/libs/openzap/src/g711.c b/libs/openzap/src/g711.c
index 97772c25f5..37511c3a9c 100644
--- a/libs/openzap/src/g711.c
+++ b/libs/openzap/src/g711.c
@@ -99,6 +99,6 @@ uint8_t ulaw_to_alaw(uint8_t ulaw)
  * c-basic-offset:4
  * End:
  * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab:
+ * vim:set softtabstop=4 shiftwidth=4 tabstop=4:
  */
 
diff --git a/libs/openzap/src/hashtable.c b/libs/openzap/src/hashtable.c
index 5dafc09233..eeb2aaa07a 100644
--- a/libs/openzap/src/hashtable.c
+++ b/libs/openzap/src/hashtable.c
@@ -334,6 +334,6 @@ OZ_DECLARE(void) hashtable_this(struct hashtable_iterator *i, const void **key,
  * c-basic-offset:4
  * End:
  * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab:
+ * vim:set softtabstop=4 shiftwidth=4 tabstop=4:
  */
 
diff --git a/libs/openzap/src/hashtable_itr.c b/libs/openzap/src/hashtable_itr.c
index 8519ab3c77..8973b08ad0 100644
--- a/libs/openzap/src/hashtable_itr.c
+++ b/libs/openzap/src/hashtable_itr.c
@@ -181,6 +181,6 @@ hashtable_iterator_search(struct hashtable_itr *itr,
  * c-basic-offset:4
  * End:
  * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab:
+ * vim:set softtabstop=4 shiftwidth=4 tabstop=4:
  */
 
diff --git a/libs/openzap/src/include/g711.h b/libs/openzap/src/include/g711.h
index 2d7e481e48..6f4c1d2542 100644
--- a/libs/openzap/src/include/g711.h
+++ b/libs/openzap/src/include/g711.h
@@ -391,5 +391,5 @@ extern "C" {
  * c-basic-offset:4
  * End:
  * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab:
+ * vim:set softtabstop=4 shiftwidth=4 tabstop=4:
  */
diff --git a/libs/openzap/src/include/hashtable.h b/libs/openzap/src/include/hashtable.h
index ea63e2e91d..0d185bbc5b 100644
--- a/libs/openzap/src/include/hashtable.h
+++ b/libs/openzap/src/include/hashtable.h
@@ -224,5 +224,5 @@ OZ_DECLARE(void) hashtable_this(struct hashtable_iterator *i, const void **key,
  * c-basic-offset:4
  * End:
  * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab:
+ * vim:set softtabstop=4 shiftwidth=4 tabstop=4:
  */
diff --git a/libs/openzap/src/include/hashtable_itr.h b/libs/openzap/src/include/hashtable_itr.h
index e14833ab57..6897ce949c 100644
--- a/libs/openzap/src/include/hashtable_itr.h
+++ b/libs/openzap/src/include/hashtable_itr.h
@@ -124,6 +124,6 @@ hashtable_iterator_search(struct hashtable_itr *itr,
  * c-basic-offset:4
  * End:
  * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab:
+ * vim:set softtabstop=4 shiftwidth=4 tabstop=4:
  */
 
diff --git a/libs/openzap/src/include/hashtable_private.h b/libs/openzap/src/include/hashtable_private.h
index 0f329ca3a6..1bb10fd016 100644
--- a/libs/openzap/src/include/hashtable_private.h
+++ b/libs/openzap/src/include/hashtable_private.h
@@ -101,5 +101,5 @@ indexFor(unsigned int tablelength, unsigned int hashvalue) {
  * c-basic-offset:4
  * End:
  * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab:
+ * vim:set softtabstop=4 shiftwidth=4 tabstop=4:
  */
diff --git a/libs/openzap/src/include/openzap.h b/libs/openzap/src/include/openzap.h
index ee09acc2fb..522e435f7c 100644
--- a/libs/openzap/src/include/openzap.h
+++ b/libs/openzap/src/include/openzap.h
@@ -757,5 +757,5 @@ static __inline__ void zap_clear_flag_all(zap_span_t *span, uint32_t flag)
  * c-basic-offset:4
  * End:
  * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab:
+ * vim:set softtabstop=4 shiftwidth=4 tabstop=4:
  */
diff --git a/libs/openzap/src/include/sangoma_tdm_api.h b/libs/openzap/src/include/sangoma_tdm_api.h
index 08ae5cf00d..062d4e219d 100644
--- a/libs/openzap/src/include/sangoma_tdm_api.h
+++ b/libs/openzap/src/include/sangoma_tdm_api.h
@@ -316,6 +316,6 @@ static __inline__ int tdmv_api_writemsg_tdm(sng_fd_t fd, void *hdrbuf, int hdrle
  * c-basic-offset:4
  * End:
  * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab:
+ * vim:set softtabstop=4 shiftwidth=4 tabstop=4:
  */
 
diff --git a/libs/openzap/src/include/zap_buffer.h b/libs/openzap/src/include/zap_buffer.h
index 2824c7938a..9a05420979 100644
--- a/libs/openzap/src/include/zap_buffer.h
+++ b/libs/openzap/src/include/zap_buffer.h
@@ -142,5 +142,5 @@ OZ_DECLARE(zap_size_t) zap_buffer_zwrite(zap_buffer_t *buffer, const void *data,
  * c-basic-offset:4
  * End:
  * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab:
+ * vim:set softtabstop=4 shiftwidth=4 tabstop=4:
  */
diff --git a/libs/openzap/src/include/zap_config.h b/libs/openzap/src/include/zap_config.h
index 967c09cd79..f2f2e374bf 100644
--- a/libs/openzap/src/include/zap_config.h
+++ b/libs/openzap/src/include/zap_config.h
@@ -134,5 +134,5 @@ OZ_DECLARE (int) zap_config_get_cas_bits(char *strvalue, unsigned char *outbits)
  * c-basic-offset:4
  * End:
  * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab:
+ * vim:set softtabstop=4 shiftwidth=4 tabstop=4:
  */
diff --git a/libs/openzap/src/include/zap_m3ua.h b/libs/openzap/src/include/zap_m3ua.h
index 12e6c45582..18de6db838 100644
--- a/libs/openzap/src/include/zap_m3ua.h
+++ b/libs/openzap/src/include/zap_m3ua.h
@@ -123,6 +123,6 @@ zap_status_t m3ua_start(zap_span_t *span);
  * c-basic-offset:4
  * End:
  * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab:
+ * vim:set softtabstop=4 shiftwidth=4 tabstop=4:
  */
 
diff --git a/libs/openzap/src/include/zap_threadmutex.h b/libs/openzap/src/include/zap_threadmutex.h
index 8639027ab7..6e2af571ac 100644
--- a/libs/openzap/src/include/zap_threadmutex.h
+++ b/libs/openzap/src/include/zap_threadmutex.h
@@ -46,6 +46,6 @@ OZ_DECLARE(zap_status_t) _zap_mutex_unlock(zap_mutex_t *mutex);
  * c-basic-offset:4
  * End:
  * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab:
+ * vim:set softtabstop=4 shiftwidth=4 tabstop=4:
  */
 
diff --git a/libs/openzap/src/include/zap_types.h b/libs/openzap/src/include/zap_types.h
index 2db87513a0..72c467c398 100644
--- a/libs/openzap/src/include/zap_types.h
+++ b/libs/openzap/src/include/zap_types.h
@@ -618,6 +618,6 @@ typedef enum {
  * c-basic-offset:4
  * End:
  * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab:
+ * vim:set softtabstop=4 shiftwidth=4 tabstop=4:
  */
 
diff --git a/libs/openzap/src/m3ua_client.c b/libs/openzap/src/m3ua_client.c
index 05dfc49523..ba33dd4317 100644
--- a/libs/openzap/src/m3ua_client.c
+++ b/libs/openzap/src/m3ua_client.c
@@ -327,7 +327,7 @@ const char *m3uac_event_id_name(uint32_t event_id)
  * c-basic-offset:4
  * End:
  * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab:
+ * vim:set softtabstop=4 shiftwidth=4 tabstop=4:
  */
 
 
diff --git a/libs/openzap/src/m3ua_client.h b/libs/openzap/src/m3ua_client.h
index 29620e0302..b80309017c 100644
--- a/libs/openzap/src/m3ua_client.h
+++ b/libs/openzap/src/m3ua_client.h
@@ -160,5 +160,5 @@ int m3uac_exec_command(m3uac_connection_t *mcon, int span, int chan, int id, int
  * c-basic-offset:4
  * End:
  * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab:
+ * vim:set softtabstop=4 shiftwidth=4 tabstop=4:
  */
diff --git a/libs/openzap/src/ozmod/ozmod_analog/ozmod_analog.c b/libs/openzap/src/ozmod/ozmod_analog/ozmod_analog.c
index 20de17dbd1..e45d3413db 100644
--- a/libs/openzap/src/ozmod/ozmod_analog/ozmod_analog.c
+++ b/libs/openzap/src/ozmod/ozmod_analog/ozmod_analog.c
@@ -995,5 +995,5 @@ EX_DECLARE_DATA zap_module_t zap_module = {
  * c-basic-offset:4
  * End:
  * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab:
+ * vim:set softtabstop=4 shiftwidth=4 tabstop=4:
  */
diff --git a/libs/openzap/src/ozmod/ozmod_analog/zap_analog.h b/libs/openzap/src/ozmod/ozmod_analog/zap_analog.h
index b48b168e69..563285eb2c 100644
--- a/libs/openzap/src/ozmod/ozmod_analog/zap_analog.h
+++ b/libs/openzap/src/ozmod/ozmod_analog/zap_analog.h
@@ -66,5 +66,5 @@ typedef struct zap_analog_data zap_analog_data_t;
  * c-basic-offset:4
  * End:
  * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab:
+ * vim:set softtabstop=4 shiftwidth=4 tabstop=4:
  */
diff --git a/libs/openzap/src/ozmod/ozmod_analog_em/ozmod_analog_em.c b/libs/openzap/src/ozmod/ozmod_analog_em/ozmod_analog_em.c
index 3a8e9a2156..a756f564f8 100644
--- a/libs/openzap/src/ozmod/ozmod_analog_em/ozmod_analog_em.c
+++ b/libs/openzap/src/ozmod/ozmod_analog_em/ozmod_analog_em.c
@@ -704,5 +704,5 @@ EX_DECLARE_DATA zap_module_t zap_module = {
  * c-basic-offset:4
  * End:
  * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab:
+ * vim:set softtabstop=4 shiftwidth=4 tabstop=4:
  */
diff --git a/libs/openzap/src/ozmod/ozmod_analog_em/zap_analog_em.h b/libs/openzap/src/ozmod/ozmod_analog_em/zap_analog_em.h
index 9411844c44..4d34ca98fe 100644
--- a/libs/openzap/src/ozmod/ozmod_analog_em/zap_analog_em.h
+++ b/libs/openzap/src/ozmod/ozmod_analog_em/zap_analog_em.h
@@ -65,5 +65,5 @@ typedef struct zap_analog_data zap_analog_em_data_t;
  * c-basic-offset:4
  * End:
  * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab:
+ * vim:set softtabstop=4 shiftwidth=4 tabstop=4:
  */
diff --git a/libs/openzap/src/ozmod/ozmod_isdn/ozmod_isdn.c b/libs/openzap/src/ozmod/ozmod_isdn/ozmod_isdn.c
index 7aa23604fa..d054bd08d1 100644
--- a/libs/openzap/src/ozmod/ozmod_isdn/ozmod_isdn.c
+++ b/libs/openzap/src/ozmod/ozmod_isdn/ozmod_isdn.c
@@ -2421,5 +2421,5 @@ EX_DECLARE_DATA zap_module_t zap_module = {
  * c-basic-offset:4
  * End:
  * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab:
+ * vim:set softtabstop=4 shiftwidth=4 tabstop=4:
  */
diff --git a/libs/openzap/src/ozmod/ozmod_isdn/zap_isdn.h b/libs/openzap/src/ozmod/ozmod_isdn/zap_isdn.h
index 470a8022bb..b16b004a9d 100644
--- a/libs/openzap/src/ozmod/ozmod_isdn/zap_isdn.h
+++ b/libs/openzap/src/ozmod/ozmod_isdn/zap_isdn.h
@@ -92,6 +92,6 @@ typedef struct zap_isdn_bchan_data zap_isdn_bchan_data_t;
  * c-basic-offset:4
  * End:
  * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab:
+ * vim:set softtabstop=4 shiftwidth=4 tabstop=4:
  */
 
diff --git a/libs/openzap/src/ozmod/ozmod_libpri/lpwrap_pri.c b/libs/openzap/src/ozmod/ozmod_libpri/lpwrap_pri.c
index c75533b223..3df1d54d89 100644
--- a/libs/openzap/src/ozmod/ozmod_libpri/lpwrap_pri.c
+++ b/libs/openzap/src/ozmod/ozmod_libpri/lpwrap_pri.c
@@ -298,6 +298,6 @@ int lpwrap_run_pri(struct lpwrap_pri *spri)
  * c-basic-offset:4
  * End:
  * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab:
+ * vim:set softtabstop=4 shiftwidth=4 tabstop=4:
  */
 
diff --git a/libs/openzap/src/ozmod/ozmod_libpri/ozmod_libpri.c b/libs/openzap/src/ozmod/ozmod_libpri/ozmod_libpri.c
index b15f2dfac7..809bab2447 100644
--- a/libs/openzap/src/ozmod/ozmod_libpri/ozmod_libpri.c
+++ b/libs/openzap/src/ozmod/ozmod_libpri/ozmod_libpri.c
@@ -1365,5 +1365,5 @@ zap_module_t zap_module = {
  * c-basic-offset:4
  * End:
  * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab:
+ * vim:set softtabstop=4 shiftwidth=4 tabstop=4:
  */
diff --git a/libs/openzap/src/ozmod/ozmod_libpri/ozmod_libpri.h b/libs/openzap/src/ozmod/ozmod_libpri/ozmod_libpri.h
index ac01a1fafa..4e33aba17d 100644
--- a/libs/openzap/src/ozmod/ozmod_libpri/ozmod_libpri.h
+++ b/libs/openzap/src/ozmod/ozmod_libpri/ozmod_libpri.h
@@ -93,6 +93,6 @@ typedef struct zap_isdn_bchan_data zap_isdn_bchan_data_t;
  * c-basic-offset:4
  * End:
  * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab:
+ * vim:set softtabstop=4 shiftwidth=4 tabstop=4:
  */
 
diff --git a/libs/openzap/src/ozmod/ozmod_pika/ozmod_pika.c b/libs/openzap/src/ozmod/ozmod_pika/ozmod_pika.c
index 995c6df554..154c1618ff 100644
--- a/libs/openzap/src/ozmod/ozmod_pika/ozmod_pika.c
+++ b/libs/openzap/src/ozmod/ozmod_pika/ozmod_pika.c
@@ -1464,6 +1464,6 @@ EX_DECLARE_DATA zap_module_t zap_module = {
  * c-basic-offset:4
  * End:
  * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab:
+ * vim:set softtabstop=4 shiftwidth=4 tabstop=4:
  */
 
diff --git a/libs/openzap/src/ozmod/ozmod_pika/zap_pika.h b/libs/openzap/src/ozmod/ozmod_pika/zap_pika.h
index da1864d486..27c455a429 100644
--- a/libs/openzap/src/ozmod/ozmod_pika/zap_pika.h
+++ b/libs/openzap/src/ozmod/ozmod_pika/zap_pika.h
@@ -128,5 +128,5 @@ PIKA_STR2ENUM_P(pika_str2compand_mode, pika_compand_mode2str, PIKA_TSpanCompandM
  * c-basic-offset:4
  * End:
  * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab:
+ * vim:set softtabstop=4 shiftwidth=4 tabstop=4:
  */
diff --git a/libs/openzap/src/ozmod/ozmod_sangoma_boost/ozmod_sangoma_boost.c b/libs/openzap/src/ozmod/ozmod_sangoma_boost/ozmod_sangoma_boost.c
index 2b502ba6cd..2e20a9cc25 100644
--- a/libs/openzap/src/ozmod/ozmod_sangoma_boost/ozmod_sangoma_boost.c
+++ b/libs/openzap/src/ozmod/ozmod_sangoma_boost/ozmod_sangoma_boost.c
@@ -1461,5 +1461,5 @@ zap_module_t zap_module = {
  * c-basic-offset:4
  * End:
  * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab:
+ * vim:set softtabstop=4 shiftwidth=4 tabstop=4:
  */
diff --git a/libs/openzap/src/ozmod/ozmod_sangoma_boost/sangoma_boost_client.c b/libs/openzap/src/ozmod/ozmod_sangoma_boost/sangoma_boost_client.c
index 224218c6f2..f0ecef1b97 100644
--- a/libs/openzap/src/ozmod/ozmod_sangoma_boost/sangoma_boost_client.c
+++ b/libs/openzap/src/ozmod/ozmod_sangoma_boost/sangoma_boost_client.c
@@ -520,6 +520,6 @@ const char *sangomabc_event_id_name(uint32_t event_id)
  * c-basic-offset:4
  * End:
  * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab:
+ * vim:set softtabstop=4 shiftwidth=4 tabstop=4:
  */
 
diff --git a/libs/openzap/src/ozmod/ozmod_sangoma_boost/sangoma_boost_client.h b/libs/openzap/src/ozmod/ozmod_sangoma_boost/sangoma_boost_client.h
index 5554cb1ff6..1b86c5df01 100644
--- a/libs/openzap/src/ozmod/ozmod_sangoma_boost/sangoma_boost_client.h
+++ b/libs/openzap/src/ozmod/ozmod_sangoma_boost/sangoma_boost_client.h
@@ -144,5 +144,5 @@ int sangomabc_exec_commandp(sangomabc_connection_t *pcon, int span, int chan, in
  * c-basic-offset:4
  * End:
  * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab:
+ * vim:set softtabstop=4 shiftwidth=4 tabstop=4:
  */
diff --git a/libs/openzap/src/ozmod/ozmod_sangoma_boost/zap_sangoma_boost.h b/libs/openzap/src/ozmod/ozmod_sangoma_boost/zap_sangoma_boost.h
index 3d82c6f5c0..932787c93a 100644
--- a/libs/openzap/src/ozmod/ozmod_sangoma_boost/zap_sangoma_boost.h
+++ b/libs/openzap/src/ozmod/ozmod_sangoma_boost/zap_sangoma_boost.h
@@ -58,6 +58,6 @@ typedef struct zap_sangoma_boost_data {
  * c-basic-offset:4
  * End:
  * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab:
+ * vim:set softtabstop=4 shiftwidth=4 tabstop=4:
  */
 
diff --git a/libs/openzap/src/ozmod/ozmod_skel/ozmod_skel.c b/libs/openzap/src/ozmod/ozmod_skel/ozmod_skel.c
index aa468a356f..949e0fbf31 100644
--- a/libs/openzap/src/ozmod/ozmod_skel/ozmod_skel.c
+++ b/libs/openzap/src/ozmod/ozmod_skel/ozmod_skel.c
@@ -147,6 +147,6 @@ zap_module_t zap_module = {
  * c-basic-offset:4
  * End:
  * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab:
+ * vim:set softtabstop=4 shiftwidth=4 tabstop=4:
  */
 
diff --git a/libs/openzap/src/ozmod/ozmod_zt/ozmod_zt.c b/libs/openzap/src/ozmod/ozmod_zt/ozmod_zt.c
index 9e4369334b..b8788d2a58 100644
--- a/libs/openzap/src/ozmod/ozmod_zt/ozmod_zt.c
+++ b/libs/openzap/src/ozmod/ozmod_zt/ozmod_zt.c
@@ -1224,5 +1224,5 @@ zap_module_t zap_module = {
  * c-basic-offset:4
  * End:
  * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab:
+ * vim:set softtabstop=4 shiftwidth=4 tabstop=4:
  */
diff --git a/libs/openzap/src/ozmod/ozmod_zt/ozmod_zt.h b/libs/openzap/src/ozmod/ozmod_zt/ozmod_zt.h
index 38de3076e3..14516f6fe9 100644
--- a/libs/openzap/src/ozmod/ozmod_zt/ozmod_zt.h
+++ b/libs/openzap/src/ozmod/ozmod_zt/ozmod_zt.h
@@ -359,5 +359,5 @@ ZT_ABIT = 8
  * c-basic-offset:4
  * End:
  * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab:
+ * vim:set softtabstop=4 shiftwidth=4 tabstop=4:
  */
diff --git a/libs/openzap/src/priserver.c b/libs/openzap/src/priserver.c
index 377ded7325..7a37357083 100644
--- a/libs/openzap/src/priserver.c
+++ b/libs/openzap/src/priserver.c
@@ -324,5 +324,5 @@ int main(int argc, char *argv[])
  * c-basic-offset:4
  * End:
  * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab:
+ * vim:set softtabstop=4 shiftwidth=4 tabstop=4:
  */
diff --git a/libs/openzap/src/sangoma_pri.c b/libs/openzap/src/sangoma_pri.c
index bf213699b6..5cf6a5cd10 100644
--- a/libs/openzap/src/sangoma_pri.c
+++ b/libs/openzap/src/sangoma_pri.c
@@ -246,6 +246,6 @@ int sangoma_run_pri(struct sangoma_pri *spri)
  * c-basic-offset:4
  * End:
  * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab:
+ * vim:set softtabstop=4 shiftwidth=4 tabstop=4:
  */
 
diff --git a/libs/openzap/src/testanalog.c b/libs/openzap/src/testanalog.c
index 274228dea0..1a9542be4f 100644
--- a/libs/openzap/src/testanalog.c
+++ b/libs/openzap/src/testanalog.c
@@ -128,6 +128,6 @@ done:
  * c-basic-offset:4
  * End:
  * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab:
+ * vim:set softtabstop=4 shiftwidth=4 tabstop=4:
  */
 
diff --git a/libs/openzap/src/testapp.c b/libs/openzap/src/testapp.c
index ea83419a99..cfa27c9296 100644
--- a/libs/openzap/src/testapp.c
+++ b/libs/openzap/src/testapp.c
@@ -79,5 +79,5 @@ int main(int argc, char *argv[])
  * c-basic-offset:4
  * End:
  * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab:
+ * vim:set softtabstop=4 shiftwidth=4 tabstop=4:
  */
diff --git a/libs/openzap/src/testboost.c b/libs/openzap/src/testboost.c
index 4838f54def..cec952219b 100644
--- a/libs/openzap/src/testboost.c
+++ b/libs/openzap/src/testboost.c
@@ -71,5 +71,5 @@ int main(int argc, char *argv[])
  * c-basic-offset:4
  * End:
  * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab:
+ * vim:set softtabstop=4 shiftwidth=4 tabstop=4:
  */
diff --git a/libs/openzap/src/testisdn.c b/libs/openzap/src/testisdn.c
index 252f0bcec8..f32f47a3f0 100644
--- a/libs/openzap/src/testisdn.c
+++ b/libs/openzap/src/testisdn.c
@@ -70,5 +70,5 @@ int main(int argc, char *argv[])
  * c-basic-offset:4
  * End:
  * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab:
+ * vim:set softtabstop=4 shiftwidth=4 tabstop=4:
  */
diff --git a/libs/openzap/src/testpri.c b/libs/openzap/src/testpri.c
index a672d9322f..1d203eae55 100644
--- a/libs/openzap/src/testpri.c
+++ b/libs/openzap/src/testpri.c
@@ -158,5 +158,5 @@ int main(int argc, char *argv[])
  * c-basic-offset:4
  * End:
  * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab:
+ * vim:set softtabstop=4 shiftwidth=4 tabstop=4:
  */
diff --git a/libs/openzap/src/testr2.c b/libs/openzap/src/testr2.c
index f5f093cb4f..83a950cff0 100644
--- a/libs/openzap/src/testr2.c
+++ b/libs/openzap/src/testr2.c
@@ -82,5 +82,5 @@ int main(int argc, char *argv[])
  * c-basic-offset:4
  * End:
  * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab:
+ * vim:set softtabstop=4 shiftwidth=4 tabstop=4:
  */
diff --git a/libs/openzap/src/zap_buffer.c b/libs/openzap/src/zap_buffer.c
index 8315825ff7..0e2279d7e3 100644
--- a/libs/openzap/src/zap_buffer.c
+++ b/libs/openzap/src/zap_buffer.c
@@ -298,5 +298,5 @@ OZ_DECLARE(void) zap_buffer_destroy(zap_buffer_t **buffer)
  * c-basic-offset:4
  * End:
  * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab:
+ * vim:set softtabstop=4 shiftwidth=4 tabstop=4:
  */
diff --git a/libs/openzap/src/zap_config.c b/libs/openzap/src/zap_config.c
index 05d5db3c61..ca0315594b 100644
--- a/libs/openzap/src/zap_config.c
+++ b/libs/openzap/src/zap_config.c
@@ -247,5 +247,5 @@ OZ_DECLARE (int) zap_config_get_cas_bits(char *strvalue, unsigned char *outbits)
  * c-basic-offset:4
  * End:
  * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab:
+ * vim:set softtabstop=4 shiftwidth=4 tabstop=4:
  */
diff --git a/libs/openzap/src/zap_io.c b/libs/openzap/src/zap_io.c
index 98df71f723..0f1c53647d 100644
--- a/libs/openzap/src/zap_io.c
+++ b/libs/openzap/src/zap_io.c
@@ -3088,5 +3088,5 @@ OZ_DECLARE_NONSTD(zap_status_t) zap_console_stream_write(zap_stream_handle_t *ha
  * c-basic-offset:4
  * End:
  * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab:
+ * vim:set softtabstop=4 shiftwidth=4 tabstop=4:
  */
diff --git a/libs/openzap/src/zap_threadmutex.c b/libs/openzap/src/zap_threadmutex.c
index 2dc4763068..b6bc8435b6 100644
--- a/libs/openzap/src/zap_threadmutex.c
+++ b/libs/openzap/src/zap_threadmutex.c
@@ -233,5 +233,5 @@ OZ_DECLARE(zap_status_t) _zap_mutex_unlock(zap_mutex_t *mutex)
  * c-basic-offset:4
  * End:
  * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab:
+ * vim:set softtabstop=4 shiftwidth=4 tabstop=4:
  */