diff --git a/addons/chan_mobile.c b/addons/chan_mobile.c
index 45357989c64a98297e73a48efaf8790f3e608846..26056f420927661066758d26954be83414f78cc3 100644
--- a/addons/chan_mobile.c
+++ b/addons/chan_mobile.c
@@ -4754,8 +4754,8 @@ e_cleanup:
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Bluetooth Mobile Device Channel Driver",
-		.support_level = AST_MODULE_SUPPORT_EXTENDED,
-		.load = load_module,
-		.unload = unload_module,
-		.load_pri = AST_MODPRI_CHANNEL_DRIVER,
+	.support_level = AST_MODULE_SUPPORT_EXTENDED,
+	.load = load_module,
+	.unload = unload_module,
+	.load_pri = AST_MODPRI_CHANNEL_DRIVER,
 );
diff --git a/addons/chan_ooh323.c b/addons/chan_ooh323.c
index da63f03c5b51f8f6a9abe102e869bec8996d5158..58db56fb7eb8710e70ba3700bc409f78d40e6a13 100644
--- a/addons/chan_ooh323.c
+++ b/addons/chan_ooh323.c
@@ -5188,9 +5188,9 @@ void ast_ooh323c_exit()
 #endif
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Objective Systems H323 Channel",
-		.support_level = AST_MODULE_SUPPORT_EXTENDED,
-			.load = load_module,
-			.unload = unload_module,
-			.reload = reload_module,
-			.load_pri = AST_MODPRI_CHANNEL_DRIVER
-			);
+	.support_level = AST_MODULE_SUPPORT_EXTENDED,
+	.load = load_module,
+	.unload = unload_module,
+	.reload = reload_module,
+	.load_pri = AST_MODPRI_CHANNEL_DRIVER
+);
diff --git a/addons/res_config_mysql.c b/addons/res_config_mysql.c
index 299fe5619a6f99bd3002b8e4dcf176350a3f2a79..f44b9d5aeeafadea5489b265eba562a1ead10b73 100644
--- a/addons/res_config_mysql.c
+++ b/addons/res_config_mysql.c
@@ -1748,10 +1748,10 @@ static char *handle_cli_realtime_mysql_status(struct ast_cli_entry *e, int cmd,
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "MySQL RealTime Configuration Driver",
-		.support_level = AST_MODULE_SUPPORT_EXTENDED,
-		.load = load_module,
-		.unload = unload_module,
-		.reload = reload,
-		.load_pri = AST_MODPRI_REALTIME_DRIVER,
-		);
+	.support_level = AST_MODULE_SUPPORT_EXTENDED,
+	.load = load_module,
+	.unload = unload_module,
+	.reload = reload,
+	.load_pri = AST_MODPRI_REALTIME_DRIVER,
+);
 
diff --git a/apps/app_adsiprog.c b/apps/app_adsiprog.c
index 7f5f3e6fe095710ba1c9e9a2a6f287147084346e..3f3d11c257f7f69ed031271b2509d36446bce10d 100644
--- a/apps/app_adsiprog.c
+++ b/apps/app_adsiprog.c
@@ -1612,8 +1612,8 @@ static int load_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Asterisk ADSI Programming Application",
-		.support_level = AST_MODULE_SUPPORT_EXTENDED,
-		.load = load_module,
-		.unload = unload_module,
-		.nonoptreq = "res_adsi",
-		);
+	.support_level = AST_MODULE_SUPPORT_EXTENDED,
+	.load = load_module,
+	.unload = unload_module,
+	.nonoptreq = "res_adsi",
+);
diff --git a/apps/app_alarmreceiver.c b/apps/app_alarmreceiver.c
index d5a01885e98ebe4788dfec3c1ca01233253aedbf..ace4df1dc5f94fba346fa71de9bd57d5b0c42359 100644
--- a/apps/app_alarmreceiver.c
+++ b/apps/app_alarmreceiver.c
@@ -995,8 +995,8 @@ static int reload(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Alarm Receiver for Asterisk",
-		.support_level = AST_MODULE_SUPPORT_EXTENDED,
-		.load = load_module,
-		.unload = unload_module,
-		.reload = reload,
+	.support_level = AST_MODULE_SUPPORT_EXTENDED,
+	.load = load_module,
+	.unload = unload_module,
+	.reload = reload,
 );
diff --git a/apps/app_amd.c b/apps/app_amd.c
index ee5dd6f42bc5bc18ec842b92b6caed198816ebcc..ee421b6bc345d074d20708528128280b2c0d54ec 100644
--- a/apps/app_amd.c
+++ b/apps/app_amd.c
@@ -528,8 +528,8 @@ static int reload(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Answering Machine Detection Application",
-		.support_level = AST_MODULE_SUPPORT_EXTENDED,
-		.load = load_module,
-		.unload = unload_module,
-		.reload = reload,
+	.support_level = AST_MODULE_SUPPORT_EXTENDED,
+	.load = load_module,
+	.unload = unload_module,
+	.reload = reload,
 );
diff --git a/apps/app_celgenuserevent.c b/apps/app_celgenuserevent.c
index fff495460fa67a44217c429cf39b6cdff681677e..b98cd674db74762c575888d93142b46e1b7cfc6a 100644
--- a/apps/app_celgenuserevent.c
+++ b/apps/app_celgenuserevent.c
@@ -102,7 +102,7 @@ static int load_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Generate an User-Defined CEL event",
-		.support_level = AST_MODULE_SUPPORT_CORE,
-				.load = load_module,
-				.unload = unload_module,
-	);
+	.support_level = AST_MODULE_SUPPORT_CORE,
+	.load = load_module,
+	.unload = unload_module,
+);
diff --git a/apps/app_fax.c b/apps/app_fax.c
index ff323df47533dad81035337590a0c61572ec8b78..d6e9b4de011dfdc2cb9894c6d99df25738b36f44 100644
--- a/apps/app_fax.c
+++ b/apps/app_fax.c
@@ -996,9 +996,9 @@ static int load_module(void)
 
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Simple FAX Application",
-		.support_level = AST_MODULE_SUPPORT_EXTENDED,
-		.load = load_module,
-		.unload = unload_module,
-		);
+	.support_level = AST_MODULE_SUPPORT_EXTENDED,
+	.load = load_module,
+	.unload = unload_module,
+);
 
 
diff --git a/apps/app_followme.c b/apps/app_followme.c
index 5fd5d15ba50d2ba1d04bf7e02bb6cb93419d39fe..d2000fd13535a7fa119c2fc83dae71639bee01d2 100644
--- a/apps/app_followme.c
+++ b/apps/app_followme.c
@@ -1582,8 +1582,8 @@ static int reload(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Find-Me/Follow-Me Application",
-		.support_level = AST_MODULE_SUPPORT_CORE,
-		.load = load_module,
-		.unload = unload_module,
-		.reload = reload,
-	       );
+	.support_level = AST_MODULE_SUPPORT_CORE,
+	.load = load_module,
+	.unload = unload_module,
+	.reload = reload,
+);
diff --git a/apps/app_getcpeid.c b/apps/app_getcpeid.c
index 7e457fb6ec61f2a22c145ee65e3acfce7c855615..c896f9ef0731245a8f9fcd96cc2d540d61cb7fc2 100644
--- a/apps/app_getcpeid.c
+++ b/apps/app_getcpeid.c
@@ -139,8 +139,8 @@ static int load_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Get ADSI CPE ID",
-		.support_level = AST_MODULE_SUPPORT_EXTENDED,
-		.load = load_module,
-		.unload = unload_module,
-		.nonoptreq = "res_adsi",
-		);
+	.support_level = AST_MODULE_SUPPORT_EXTENDED,
+	.load = load_module,
+	.unload = unload_module,
+	.nonoptreq = "res_adsi",
+);
diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index ba83eadd644c07a0d3fdf0c742dbcd3303771fcd..e74ad751871a87742c29e7cf853b05f5c2deee3e 100644
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -8271,10 +8271,10 @@ static int reload(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "MeetMe conference bridge",
-		.support_level = AST_MODULE_SUPPORT_EXTENDED,
-		.load = load_module,
-		.unload = unload_module,
-		.reload = reload,
-		.load_pri = AST_MODPRI_DEVSTATE_PROVIDER,
-	       );
+	.support_level = AST_MODULE_SUPPORT_EXTENDED,
+	.load = load_module,
+	.unload = unload_module,
+	.reload = reload,
+	.load_pri = AST_MODPRI_DEVSTATE_PROVIDER,
+);
 
diff --git a/apps/app_minivm.c b/apps/app_minivm.c
index b8a1ceb775980aa01d02b309e7e3d0685cfcac0b..4b1c4b5753aa422cab15f707a86c17a0515b5329 100644
--- a/apps/app_minivm.c
+++ b/apps/app_minivm.c
@@ -3561,8 +3561,8 @@ static int unload_module(void)
 
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Mini VoiceMail (A minimal Voicemail e-mail System)",
-		.support_level = AST_MODULE_SUPPORT_EXTENDED,
-		.load = load_module,
-		.unload = unload_module,
-		.reload = reload,
-		);
+	.support_level = AST_MODULE_SUPPORT_EXTENDED,
+	.load = load_module,
+	.unload = unload_module,
+	.reload = reload,
+);
diff --git a/apps/app_playback.c b/apps/app_playback.c
index 4b9eb15e5f701f92b0d227d71beb9b48ba262446..feb7b633ddd95d04d3758e1b3f365a42c459b6ed 100644
--- a/apps/app_playback.c
+++ b/apps/app_playback.c
@@ -570,8 +570,8 @@ static int load_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Sound File Playback Application",
-		.support_level = AST_MODULE_SUPPORT_CORE,
-		.load = load_module,
-		.unload = unload_module,
-		.reload = reload,
-	       );
+	.support_level = AST_MODULE_SUPPORT_CORE,
+	.load = load_module,
+	.unload = unload_module,
+	.reload = reload,
+);
diff --git a/apps/app_queue.c b/apps/app_queue.c
index 069ef37ac66931e0528adc3505637bebd3453d31..d04080c27b4375f31fb757f509a62624813994b7 100644
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -10912,11 +10912,11 @@ static struct member *find_member_by_queuename_and_interface(const char *queuena
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "True Call Queueing",
-		.support_level = AST_MODULE_SUPPORT_CORE,
-		.load = load_module,
-		.unload = unload_module,
-		.reload = reload,
-		.load_pri = AST_MODPRI_DEVSTATE_CONSUMER,
-		.nonoptreq = "res_monitor",
-	       );
+	.support_level = AST_MODULE_SUPPORT_CORE,
+	.load = load_module,
+	.unload = unload_module,
+	.reload = reload,
+	.load_pri = AST_MODPRI_DEVSTATE_CONSUMER,
+	.nonoptreq = "res_monitor",
+);
 
diff --git a/apps/app_speech_utils.c b/apps/app_speech_utils.c
index 5b44d1468790669701661195c701a30f2bda21f6..7c34dca527e0f6040db241ca71bb006f8ff67035 100644
--- a/apps/app_speech_utils.c
+++ b/apps/app_speech_utils.c
@@ -1002,8 +1002,8 @@ static int load_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Dialplan Speech Applications",
-		.support_level = AST_MODULE_SUPPORT_CORE,
-		.load = load_module,
-		.unload = unload_module,
-		.nonoptreq = "res_speech",
-		);
+	.support_level = AST_MODULE_SUPPORT_CORE,
+	.load = load_module,
+	.unload = unload_module,
+	.nonoptreq = "res_speech",
+);
diff --git a/apps/app_stack.c b/apps/app_stack.c
index 2d440abfd409e2aeafa868e81fff66833756b365..be8abbf585063a31287604b1557d32b89000b8ce 100644
--- a/apps/app_stack.c
+++ b/apps/app_stack.c
@@ -1318,9 +1318,9 @@ static int load_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT | AST_MODFLAG_LOAD_ORDER, "Dialplan subroutines (Gosub, Return, etc)",
-		.support_level = AST_MODULE_SUPPORT_CORE,
-		.load = load_module,
-		.unload = unload_module,
-		.load_pri = AST_MODPRI_APP_DEPEND,
-		.nonoptreq = "res_agi",
-		);
+	.support_level = AST_MODULE_SUPPORT_CORE,
+	.load = load_module,
+	.unload = unload_module,
+	.load_pri = AST_MODPRI_APP_DEPEND,
+	.nonoptreq = "res_agi",
+);
diff --git a/apps/app_stasis.c b/apps/app_stasis.c
index 22e8342923383754f5a443c1af62b66030c4bca6..aa77a0d3c38070cf5a83a02d002aed058fda1e39 100644
--- a/apps/app_stasis.c
+++ b/apps/app_stasis.c
@@ -141,4 +141,4 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Stasis dialplan applicat
 	.load = load_module,
 	.unload = unload_module,
 	.nonoptreq = "res_stasis",
-	);
+);
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 532275e3d40d0ee3f8ea56172c430c08c69d3d6c..f8e88c107919b636e9d2bb2d440ff585483d6ee9 100644
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -16116,9 +16116,9 @@ play2_msg_cleanup:
  */
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, tdesc,
-		.support_level = AST_MODULE_SUPPORT_CORE,
-		.load = load_module,
-		.unload = unload_module,
-		.reload = reload,
-		.nonoptreq = "res_adsi,res_smdi",
-		);
+	.support_level = AST_MODULE_SUPPORT_CORE,
+	.load = load_module,
+	.unload = unload_module,
+	.reload = reload,
+	.nonoptreq = "res_adsi,res_smdi",
+);
diff --git a/cel/cel_custom.c b/cel/cel_custom.c
index 0c55e497b97a801960d673f0ec6ddda8415e5a4a..f6377fcd71b81ddc27e74a7991c4d65b2d0ea920 100644
--- a/cel/cel_custom.c
+++ b/cel/cel_custom.c
@@ -222,5 +222,5 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Customizable Comma Se
 	.unload = unload_module,
 	.reload = reload,
 	.load_pri = AST_MODPRI_CDR_DRIVER,
-	);
+);
 
diff --git a/channels/chan_alsa.c b/channels/chan_alsa.c
index 755936367dd41a310b7a4e7a20943b64cba5171a..9441800db3c099d903d60e7d1a2a4ebe3db8f827 100644
--- a/channels/chan_alsa.c
+++ b/channels/chan_alsa.c
@@ -1046,8 +1046,8 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "ALSA Console Channel Driver",
-		.support_level = AST_MODULE_SUPPORT_EXTENDED,
-		.load = load_module,
-		.unload = unload_module,
-		.load_pri = AST_MODPRI_CHANNEL_DRIVER,
-	);
+	.support_level = AST_MODULE_SUPPORT_EXTENDED,
+	.load = load_module,
+	.unload = unload_module,
+	.load_pri = AST_MODPRI_CHANNEL_DRIVER,
+);
diff --git a/channels/chan_bridge_media.c b/channels/chan_bridge_media.c
index 0a3468a12275b5d70a5c50e14cf5667109aaec45..8e177ae0c4f50ff9a13f703128860449969ef3cd 100644
--- a/channels/chan_bridge_media.c
+++ b/channels/chan_bridge_media.c
@@ -216,6 +216,6 @@ static int load_module(void)
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Bridge Media Channel Driver",
 	.support_level = AST_MODULE_SUPPORT_CORE,
-    .load = load_module,
-    .unload = unload_module,
+	.load = load_module,
+	.unload = unload_module,
 );
diff --git a/channels/chan_console.c b/channels/chan_console.c
index 4fc538b77e9b76e88a5bae9ec1c5a3f1c6cd1f8f..a8dbc9751acddb25403360ba7daded642a53cdde 100644
--- a/channels/chan_console.c
+++ b/channels/chan_console.c
@@ -1578,9 +1578,9 @@ static int reload(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Console Channel Driver",
-		.support_level = AST_MODULE_SUPPORT_EXTENDED,
-		.load = load_module,
-		.unload = unload_module,
-		.reload = reload,
-		.load_pri = AST_MODPRI_CHANNEL_DRIVER,
+	.support_level = AST_MODULE_SUPPORT_EXTENDED,
+	.load = load_module,
+	.unload = unload_module,
+	.reload = reload,
+	.load_pri = AST_MODPRI_CHANNEL_DRIVER,
 );
diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c
index 0b187dc3241192adcbce9dd349d3405486264152..2f637dcfe16e39b698ed1b9cbef622989682d589 100644
--- a/channels/chan_dahdi.c
+++ b/channels/chan_dahdi.c
@@ -19753,4 +19753,4 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, tdesc,
 	.reload = reload,
 	.load_pri = AST_MODPRI_CHANNEL_DRIVER,
 	.nonoptreq = "res_smdi",
-	);
+);
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index bb9c52bb82e78093223780da30696c3206919354..0c27d2d63e069eedba96a2016c798059d386ba82 100644
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -15150,10 +15150,10 @@ static int load_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Inter Asterisk eXchange (Ver 2)",
-		.support_level = AST_MODULE_SUPPORT_CORE,
-		.load = load_module,
-		.unload = unload_module,
-		.reload = reload,
-		.load_pri = AST_MODPRI_CHANNEL_DRIVER,
-		.nonoptreq = "res_crypto",
-		);
+	.support_level = AST_MODULE_SUPPORT_CORE,
+	.load = load_module,
+	.unload = unload_module,
+	.reload = reload,
+	.load_pri = AST_MODPRI_CHANNEL_DRIVER,
+	.nonoptreq = "res_crypto",
+);
diff --git a/channels/chan_mgcp.c b/channels/chan_mgcp.c
index 37935be4b63f41b849c199d495e3a12a96629239..98c6c307b7bd28756d49bba40f34f3c7254c58e2 100644
--- a/channels/chan_mgcp.c
+++ b/channels/chan_mgcp.c
@@ -5025,10 +5025,10 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Media Gateway Control Protocol (MGCP)",
-		.support_level = AST_MODULE_SUPPORT_EXTENDED,
-		.load = load_module,
-		.unload = unload_module,
-		.reload = reload,
-		.load_pri = AST_MODPRI_CHANNEL_DRIVER,
-		.nonoptreq = "res_pktccops",
-	       );
+	.support_level = AST_MODULE_SUPPORT_EXTENDED,
+	.load = load_module,
+	.unload = unload_module,
+	.reload = reload,
+	.load_pri = AST_MODPRI_CHANNEL_DRIVER,
+	.nonoptreq = "res_pktccops",
+);
diff --git a/channels/chan_motif.c b/channels/chan_motif.c
index 05c6944ef351645d5dc465a8f5589e22beb97243..0851bf01a7c2d4bc5e14387b41bf1e084662eb12 100644
--- a/channels/chan_motif.c
+++ b/channels/chan_motif.c
@@ -2819,9 +2819,9 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Motif Jingle Channel Driver",
-		.support_level = AST_MODULE_SUPPORT_CORE,
-		.load = load_module,
-		.unload = unload_module,
-		.reload = reload,
-		.load_pri = AST_MODPRI_CHANNEL_DRIVER,
-	       );
+	.support_level = AST_MODULE_SUPPORT_CORE,
+	.load = load_module,
+	.unload = unload_module,
+	.reload = reload,
+	.load_pri = AST_MODPRI_CHANNEL_DRIVER,
+);
diff --git a/channels/chan_pjsip.c b/channels/chan_pjsip.c
index 07dd1b7b4545bfc3c4068789ecb4bd585ca83221..1195f16140ffbd9d6504407e2f4e0141d7acbfae 100644
--- a/channels/chan_pjsip.c
+++ b/channels/chan_pjsip.c
@@ -2421,8 +2421,8 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "PJSIP Channel Driver",
-		.support_level = AST_MODULE_SUPPORT_CORE,
-		.load = load_module,
-		.unload = unload_module,
-		.load_pri = AST_MODPRI_CHANNEL_DRIVER,
-	       );
+	.support_level = AST_MODULE_SUPPORT_CORE,
+	.load = load_module,
+	.unload = unload_module,
+	.load_pri = AST_MODPRI_CHANNEL_DRIVER,
+);
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 528e208d94e1c4680841a3489ab7a28b77c50725..9eeb75fe3ec37a52225f82910b69c42123aa8ef7 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -34758,10 +34758,10 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Session Initiation Protocol (SIP)",
-		.support_level = AST_MODULE_SUPPORT_CORE,
-		.load = load_module,
-		.unload = unload_module,
-		.reload = reload,
-		.load_pri = AST_MODPRI_CHANNEL_DRIVER,
-		.nonoptreq = "res_crypto,res_http_websocket",
-	       );
+	.support_level = AST_MODULE_SUPPORT_CORE,
+	.load = load_module,
+	.unload = unload_module,
+	.reload = reload,
+	.load_pri = AST_MODPRI_CHANNEL_DRIVER,
+	.nonoptreq = "res_crypto,res_http_websocket",
+);
diff --git a/channels/chan_skinny.c b/channels/chan_skinny.c
index 1d7d65af4c14b4a758e23e0243074aefd4a884f6..47c7352c6611886b9d1687cbc5bbfed640b8009a 100644
--- a/channels/chan_skinny.c
+++ b/channels/chan_skinny.c
@@ -8793,9 +8793,9 @@ static int reload(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Skinny Client Control Protocol (Skinny)",
-		.support_level = AST_MODULE_SUPPORT_EXTENDED,
-		.load = load_module,
-		.unload = unload_module,
-		.reload = reload,
-		.load_pri = AST_MODPRI_CHANNEL_DRIVER,
+	.support_level = AST_MODULE_SUPPORT_EXTENDED,
+	.load = load_module,
+	.unload = unload_module,
+	.reload = reload,
+	.load_pri = AST_MODPRI_CHANNEL_DRIVER,
 );
diff --git a/channels/chan_unistim.c b/channels/chan_unistim.c
index 82b3fced9f07684025a555e9d3239c877c40bda6..a3c0ffd5c13a5d43b927d0801bb8e49a42aaaeee 100644
--- a/channels/chan_unistim.c
+++ b/channels/chan_unistim.c
@@ -7178,7 +7178,7 @@ int reload(void)
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "UNISTIM Protocol (USTM)",
 	.support_level = AST_MODULE_SUPPORT_EXTENDED,
-    .load = load_module,
-    .unload = unload_module,
-    .reload = reload,
+	.load = load_module,
+	.unload = unload_module,
+	.reload = reload,
 );
diff --git a/codecs/codec_adpcm.c b/codecs/codec_adpcm.c
index d46230971eed2df20f05473d581558c86e2bcfc5..fa5d8769cb5123a6db0ba77c7d5d429577edaa0d 100644
--- a/codecs/codec_adpcm.c
+++ b/codecs/codec_adpcm.c
@@ -355,7 +355,7 @@ static int load_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Adaptive Differential PCM Coder/Decoder",
-		.support_level = AST_MODULE_SUPPORT_CORE,
-		.load = load_module,
-		.unload = unload_module,
-	       );
+	.support_level = AST_MODULE_SUPPORT_CORE,
+	.load = load_module,
+	.unload = unload_module,
+);
diff --git a/codecs/codec_alaw.c b/codecs/codec_alaw.c
index 21ca5c89d4d73a0b5f7ad8755f63996696ca8a26..515835dd7f458933de022b3e573fca8144e20f7e 100644
--- a/codecs/codec_alaw.c
+++ b/codecs/codec_alaw.c
@@ -139,7 +139,7 @@ static int load_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "A-law Coder/Decoder",
-		.support_level = AST_MODULE_SUPPORT_CORE,
-		.load = load_module,
-		.unload = unload_module,
-	       );
+	.support_level = AST_MODULE_SUPPORT_CORE,
+	.load = load_module,
+	.unload = unload_module,
+);
diff --git a/codecs/codec_dahdi.c b/codecs/codec_dahdi.c
index 69f6f32fe5af76b199b9595f5653967432a84143..baa73f229d5f73e64e627b6a470e099212750653 100644
--- a/codecs/codec_dahdi.c
+++ b/codecs/codec_dahdi.c
@@ -873,8 +873,8 @@ static int load_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Generic DAHDI Transcoder Codec Translator",
-		.support_level = AST_MODULE_SUPPORT_CORE,
-		.load = load_module,
-		.unload = unload_module,
-		.reload = reload,
-	       );
+	.support_level = AST_MODULE_SUPPORT_CORE,
+	.load = load_module,
+	.unload = unload_module,
+	.reload = reload,
+);
diff --git a/codecs/codec_g722.c b/codecs/codec_g722.c
index fdae2a7d30e8c4e7b898f8dc1ede629970dd5449..d368c38af19ce928b1f4a38e18f59989200f01a0 100644
--- a/codecs/codec_g722.c
+++ b/codecs/codec_g722.c
@@ -250,7 +250,7 @@ static int load_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "ITU G.722-64kbps G722 Transcoder",
-		.support_level = AST_MODULE_SUPPORT_CORE,
-		.load = load_module,
-		.unload = unload_module,
-	       );
+	.support_level = AST_MODULE_SUPPORT_CORE,
+	.load = load_module,
+	.unload = unload_module,
+);
diff --git a/codecs/codec_g726.c b/codecs/codec_g726.c
index 0f9d33c0173ed30c5fbb2bfccfb0290b54b5b0dd..8b44cbbd941d37a4ef8e212f9cf736d573303805 100644
--- a/codecs/codec_g726.c
+++ b/codecs/codec_g726.c
@@ -899,7 +899,7 @@ static int load_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "ITU G.726-32kbps G726 Transcoder",
-		.support_level = AST_MODULE_SUPPORT_CORE,
-		.load = load_module,
-		.unload = unload_module,
-	       );
+	.support_level = AST_MODULE_SUPPORT_CORE,
+	.load = load_module,
+	.unload = unload_module,
+);
diff --git a/codecs/codec_gsm.c b/codecs/codec_gsm.c
index 92ccd8257214f0a228d2dd10fb9df561d233219d..4660048c801558f9c1c58bc54b28866df38ff93c 100644
--- a/codecs/codec_gsm.c
+++ b/codecs/codec_gsm.c
@@ -237,7 +237,7 @@ static int load_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "GSM Coder/Decoder",
-		.support_level = AST_MODULE_SUPPORT_CORE,
-		.load = load_module,
-		.unload = unload_module,
-	       );
+	.support_level = AST_MODULE_SUPPORT_CORE,
+	.load = load_module,
+	.unload = unload_module,
+);
diff --git a/codecs/codec_lpc10.c b/codecs/codec_lpc10.c
index b560e62d2d50a9a8da7ed1a8abfab5458e66e6b0..49df8f753d8c438fe07696ebb4bf6ea188e766c8 100644
--- a/codecs/codec_lpc10.c
+++ b/codecs/codec_lpc10.c
@@ -266,7 +266,7 @@ static int load_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "LPC10 2.4kbps Coder/Decoder",
-		.support_level = AST_MODULE_SUPPORT_CORE,
-		.load = load_module,
-		.unload = unload_module,
-	       );
+	.support_level = AST_MODULE_SUPPORT_CORE,
+	.load = load_module,
+	.unload = unload_module,
+);
diff --git a/codecs/codec_speex.c b/codecs/codec_speex.c
index f7b6046dce9d4b3436b0fa72dc322c34da6155ee..c61f7c4f4e756d9079f7a6af30c23514df01e5a4 100644
--- a/codecs/codec_speex.c
+++ b/codecs/codec_speex.c
@@ -625,8 +625,8 @@ static int load_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Speex Coder/Decoder",
-		.support_level = AST_MODULE_SUPPORT_CORE,
-		.load = load_module,
-		.unload = unload_module,
-		.reload = reload,
-	       );
+	.support_level = AST_MODULE_SUPPORT_CORE,
+	.load = load_module,
+	.unload = unload_module,
+	.reload = reload,
+);
diff --git a/codecs/codec_ulaw.c b/codecs/codec_ulaw.c
index e75e29b107886db7248a20247079001636e2ed3a..ca2f411f93b7598faac3daa303cb5187907b2ede 100644
--- a/codecs/codec_ulaw.c
+++ b/codecs/codec_ulaw.c
@@ -190,7 +190,7 @@ static int load_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "mu-Law Coder/Decoder",
-		.support_level = AST_MODULE_SUPPORT_CORE,
-		.load = load_module,
-		.unload = unload_module,
-	       );
+	.support_level = AST_MODULE_SUPPORT_CORE,
+	.load = load_module,
+	.unload = unload_module,
+);
diff --git a/funcs/func_aes.c b/funcs/func_aes.c
index 52fddb67ecd069d8f2f6dae14b6f64667c4adf8a..9347b6f8e2280abdfe38fc8ac1a19ed6ab5bbb5b 100644
--- a/funcs/func_aes.c
+++ b/funcs/func_aes.c
@@ -179,8 +179,8 @@ static int load_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "AES dialplan functions",
-		.support_level = AST_MODULE_SUPPORT_CORE,
-		.load = load_module,
-		.unload = unload_module,
-		.nonoptreq = "res_crypto",
-	);
+	.support_level = AST_MODULE_SUPPORT_CORE,
+	.load = load_module,
+	.unload = unload_module,
+	.nonoptreq = "res_crypto",
+);
diff --git a/funcs/func_curl.c b/funcs/func_curl.c
index ed5f12f58200750b564dc15ff5dc1b837f40da50..fd03fc375f7e118222e611b5cb1d8f15e985bef0 100644
--- a/funcs/func_curl.c
+++ b/funcs/func_curl.c
@@ -874,9 +874,9 @@ static int load_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Load external URL",
-		.support_level = AST_MODULE_SUPPORT_CORE,
-		.load = load_module,
-		.unload = unload_module,
-		.load_pri = AST_MODPRI_REALTIME_DEPEND2,
-	);
+	.support_level = AST_MODULE_SUPPORT_CORE,
+	.load = load_module,
+	.unload = unload_module,
+	.load_pri = AST_MODPRI_REALTIME_DEPEND2,
+);
 
diff --git a/funcs/func_dialplan.c b/funcs/func_dialplan.c
index 70bb111b14b2f6364265acc1e3e3972912964449..0a5220b0907d700c2e5f28598a692037375ab667 100644
--- a/funcs/func_dialplan.c
+++ b/funcs/func_dialplan.c
@@ -198,4 +198,4 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Dialplan Context/Exte
 	.load = load_module,
 	.unload = unload_module,
 	.load_pri = AST_MODPRI_APP_DEPEND,
-	);
+);
diff --git a/funcs/func_odbc.c b/funcs/func_odbc.c
index 7d09ec5a73c982bb57a2a9b258f00a58cb8f4688..4744ba626fd42ad9438c678936d1a3ec96dfe816 100644
--- a/funcs/func_odbc.c
+++ b/funcs/func_odbc.c
@@ -1580,9 +1580,9 @@ reload_out:
 /* XXX need to revise usecount - set if query_lock is set */
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "ODBC lookups",
-		.support_level = AST_MODULE_SUPPORT_CORE,
-		.load = load_module,
-		.unload = unload_module,
-		.reload = reload,
-	       );
+	.support_level = AST_MODULE_SUPPORT_CORE,
+	.load = load_module,
+	.unload = unload_module,
+	.reload = reload,
+);
 
diff --git a/funcs/func_periodic_hook.c b/funcs/func_periodic_hook.c
index e62e660bf2d69ab2578a87fe6682f667eee16e9a..6ddab5600dd0d418a21104fdf580387073fe8b62 100644
--- a/funcs/func_periodic_hook.c
+++ b/funcs/func_periodic_hook.c
@@ -521,7 +521,7 @@ int AST_OPTIONAL_API_NAME(ast_beep_stop)(struct ast_channel *chan, const char *b
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS, "Periodic dialplan hooks.",
-		.support_level = AST_MODULE_SUPPORT_CORE,
-		.load = load_module,
-		.unload = unload_module,
-		);
+	.support_level = AST_MODULE_SUPPORT_CORE,
+	.load = load_module,
+	.unload = unload_module,
+);
diff --git a/pbx/pbx_ael.c b/pbx/pbx_ael.c
index 7e28b8946672833a6979aacb833caa62245757f8..1985d27a0bd5d8e89802a584b7b75b6ac5a85adf 100644
--- a/pbx/pbx_ael.c
+++ b/pbx/pbx_ael.c
@@ -297,11 +297,11 @@ int ael_external_load_module(void)
 #endif
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Asterisk Extension Language Compiler",
-		.support_level = AST_MODULE_SUPPORT_EXTENDED,
-		.load = load_module,
-		.unload = unload_module,
-		.reload = reload,
-	       );
+	.support_level = AST_MODULE_SUPPORT_EXTENDED,
+	.load = load_module,
+	.unload = unload_module,
+	.reload = reload,
+);
 
 #ifdef AAL_ARGCHECK
 static const char * const ael_funclist[] =
diff --git a/pbx/pbx_config.c b/pbx/pbx_config.c
index 09941a6d57d87f9d4aeda55c91e1e6e953525359..d85b901f9f6e63632bca2dc9f736b2f51d50d5ed 100644
--- a/pbx/pbx_config.c
+++ b/pbx/pbx_config.c
@@ -2104,8 +2104,8 @@ static int reload(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Text Extension Configuration",
-		.support_level = AST_MODULE_SUPPORT_CORE,
-		.load = load_module,
-		.unload = unload_module,
-		.reload = reload,
-	       );
+	.support_level = AST_MODULE_SUPPORT_CORE,
+	.load = load_module,
+	.unload = unload_module,
+	.reload = reload,
+);
diff --git a/pbx/pbx_dundi.c b/pbx/pbx_dundi.c
index 8ea8dd369e05043ceb31891b76b13d1e8170cad2..660968f14a2b3bae779c72a96e1a742cd6071ed9 100644
--- a/pbx/pbx_dundi.c
+++ b/pbx/pbx_dundi.c
@@ -5052,10 +5052,10 @@ static int load_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Distributed Universal Number Discovery (DUNDi)",
-		.support_level = AST_MODULE_SUPPORT_EXTENDED,
-		.load = load_module,
-		.unload = unload_module,
-		.reload = reload,
-		.nonoptreq = "res_crypto",
-	       );
+	.support_level = AST_MODULE_SUPPORT_EXTENDED,
+	.load = load_module,
+	.unload = unload_module,
+	.reload = reload,
+	.nonoptreq = "res_crypto",
+);
 
diff --git a/pbx/pbx_lua.c b/pbx/pbx_lua.c
index 002f05fa655835594f6c863b18eb85f40687ffb9..84b1f71266295285357226ba142c462145a81485 100644
--- a/pbx/pbx_lua.c
+++ b/pbx/pbx_lua.c
@@ -1673,9 +1673,9 @@ static int load_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS, "Lua PBX Switch",
-		.support_level = AST_MODULE_SUPPORT_EXTENDED,
-		.load = load_module,
-		.unload = unload_module,
-		.reload = reload,
-	       );
+	.support_level = AST_MODULE_SUPPORT_EXTENDED,
+	.load = load_module,
+	.unload = unload_module,
+	.reload = reload,
+);
 
diff --git a/res/res_adsi.c b/res/res_adsi.c
index 80086f8fdc875c34ff16e9c6d202f132a9c823ce..314a4eabd75bfb5ff914d32e7a28e4904adb18df 100644
--- a/res/res_adsi.c
+++ b/res/res_adsi.c
@@ -1210,9 +1210,9 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "ADSI Resource",
-		.support_level = AST_MODULE_SUPPORT_CORE,
-		.load = load_module,
-		.unload = unload_module,
-		.reload = reload,
-		.load_pri = AST_MODPRI_APP_DEPEND,
-	       );
+	.support_level = AST_MODULE_SUPPORT_CORE,
+	.load = load_module,
+	.unload = unload_module,
+	.reload = reload,
+	.load_pri = AST_MODPRI_APP_DEPEND,
+);
diff --git a/res/res_ael_share.c b/res/res_ael_share.c
index 936d3b42ed808c1091f2e9108f5527f2b4697d3f..c6306abb84c08389bb2dca89981eeb402f83e9c7 100644
--- a/res/res_ael_share.c
+++ b/res/res_ael_share.c
@@ -53,7 +53,7 @@ static int load_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS, "share-able code for AEL",
-		.support_level = AST_MODULE_SUPPORT_EXTENDED,
-				.load = load_module,
-				.unload = unload_module
-	);
+	.support_level = AST_MODULE_SUPPORT_EXTENDED,
+	.load = load_module,
+	.unload = unload_module
+);
diff --git a/res/res_agi.c b/res/res_agi.c
index fb62cc8c3b4054442e2a68359945dc0e4680ed35..1dc6d404069002c0180a2381d1cfe497e00308d6 100644
--- a/res/res_agi.c
+++ b/res/res_agi.c
@@ -4314,8 +4314,8 @@ static int load_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS | AST_MODFLAG_LOAD_ORDER, "Asterisk Gateway Interface (AGI)",
-		.support_level = AST_MODULE_SUPPORT_CORE,
-		.load = load_module,
-		.unload = unload_module,
-		.load_pri = AST_MODPRI_APP_DEPEND,
-		);
+	.support_level = AST_MODULE_SUPPORT_CORE,
+	.load = load_module,
+	.unload = unload_module,
+	.load_pri = AST_MODPRI_APP_DEPEND,
+);
diff --git a/res/res_ari.c b/res/res_ari.c
index d676b5ee126af5839561b76156aa3570421c15b2..bdc4379b2d4bd2bc16a947486d120e8d16281e8e 100644
--- a/res/res_ari.c
+++ b/res/res_ari.c
@@ -1106,4 +1106,4 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS | AST_MODFLAG_LOAD_
 	.reload = reload_module,
 	.nonoptreq = "res_http_websocket",
 	.load_pri = AST_MODPRI_APP_DEPEND,
-	);
+);
diff --git a/res/res_ari_applications.c b/res/res_ari_applications.c
index 5d38616f8f91ab662b434a9bd417fab18dcb4249..f25fd070f8deb5aab403cfd332e94730e8485425 100644
--- a/res/res_ari_applications.c
+++ b/res/res_ari_applications.c
@@ -546,4 +546,4 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "RESTful API module - Sta
 	.load = load_module,
 	.unload = unload_module,
 	.nonoptreq = "res_ari,res_stasis",
-	);
+);
diff --git a/res/res_ari_asterisk.c b/res/res_ari_asterisk.c
index 92f013301dac5f2098cd5f700c111d7cb6558e73..cb6219b4240d1a986ad5484b9cbfe8a3e76e8b3a 100644
--- a/res/res_ari_asterisk.c
+++ b/res/res_ari_asterisk.c
@@ -447,4 +447,4 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "RESTful API module - Ast
 	.load = load_module,
 	.unload = unload_module,
 	.nonoptreq = "res_ari,res_stasis",
-	);
+);
diff --git a/res/res_ari_bridges.c b/res/res_ari_bridges.c
index 72a34648b3baba54d7bdda42bcbf769326374391..633dc94eb2a2c8023a83e938c4604a64a63e5456 100644
--- a/res/res_ari_bridges.c
+++ b/res/res_ari_bridges.c
@@ -1417,4 +1417,4 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "RESTful API module - Bri
 	.load = load_module,
 	.unload = unload_module,
 	.nonoptreq = "res_ari,res_stasis",
-	);
+);
diff --git a/res/res_ari_channels.c b/res/res_ari_channels.c
index a2305a514fcdb26973161e68ee90167e0d7e3105..05d8d071420e217b947d1d64426c80733d96d130 100644
--- a/res/res_ari_channels.c
+++ b/res/res_ari_channels.c
@@ -2739,4 +2739,4 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "RESTful API module - Cha
 	.load = load_module,
 	.unload = unload_module,
 	.nonoptreq = "res_ari,res_stasis",
-	);
+);
diff --git a/res/res_ari_device_states.c b/res/res_ari_device_states.c
index c4eff8ccd81dfe97c7f856221c548dacb4eb7d73..f6d5781944fdb78675367219665f0401571ce082 100644
--- a/res/res_ari_device_states.c
+++ b/res/res_ari_device_states.c
@@ -362,4 +362,4 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "RESTful API module - Dev
 	.load = load_module,
 	.unload = unload_module,
 	.nonoptreq = "res_ari,res_stasis",
-	);
+);
diff --git a/res/res_ari_endpoints.c b/res/res_ari_endpoints.c
index c23fbc658df653a3a5e24b39f6064e1c742851f8..af50a09498f2f37bedb8da6aa0d34bb0c961c1a6 100644
--- a/res/res_ari_endpoints.c
+++ b/res/res_ari_endpoints.c
@@ -502,4 +502,4 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "RESTful API module - End
 	.load = load_module,
 	.unload = unload_module,
 	.nonoptreq = "res_ari,res_stasis",
-	);
+);
diff --git a/res/res_ari_events.c b/res/res_ari_events.c
index aea318d688aa1e4dbf39b2231b72d6a727611a05..66b01a743d998fa77dbce78fcc6fb3dd09de7d81 100644
--- a/res/res_ari_events.c
+++ b/res/res_ari_events.c
@@ -376,4 +376,4 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "RESTful API module - Web
 	.load = load_module,
 	.unload = unload_module,
 	.nonoptreq = "res_ari,res_stasis",
-	);
+);
diff --git a/res/res_ari_mailboxes.c b/res/res_ari_mailboxes.c
index 0fe83c224bad7039aeff1b1ff700886d58bf6693..4f3c731208f9cd6752f6cf2089ec5b6098af66e1 100644
--- a/res/res_ari_mailboxes.c
+++ b/res/res_ari_mailboxes.c
@@ -368,4 +368,4 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "RESTful API module - Mai
 	.load = load_module,
 	.unload = unload_module,
 	.nonoptreq = "res_ari,res_stasis",
-	);
+);
diff --git a/res/res_ari_model.c b/res/res_ari_model.c
index 64e2c5d9b99c66f929a5e896fda775bd993ad5b3..14265cdce97e10ae7aab109bd12fff908ab08331 100644
--- a/res/res_ari_model.c
+++ b/res/res_ari_model.c
@@ -208,4 +208,4 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER | AST_MODFLAG_GLOBAL_SY
 	.load = load_module,
 	.unload = unload_module,
 	.load_pri = AST_MODPRI_APP_DEPEND,
-        );
+);
diff --git a/res/res_ari_playbacks.c b/res/res_ari_playbacks.c
index a0fc29a5b1ab1c710dc86cfda02ec948e111a5d7..d01802145adfa5820eec218f757e29d8e272df40 100644
--- a/res/res_ari_playbacks.c
+++ b/res/res_ari_playbacks.c
@@ -319,4 +319,4 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "RESTful API module - Pla
 	.load = load_module,
 	.unload = unload_module,
 	.nonoptreq = "res_ari,res_stasis",
-	);
+);
diff --git a/res/res_ari_recordings.c b/res/res_ari_recordings.c
index 61d23aa32bf995612723f4a11a0b64590939bc31..df4a124bebc10c723ad34fe50a22643b84045875 100644
--- a/res/res_ari_recordings.c
+++ b/res/res_ari_recordings.c
@@ -843,4 +843,4 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "RESTful API module - Rec
 	.load = load_module,
 	.unload = unload_module,
 	.nonoptreq = "res_ari,res_stasis",
-	);
+);
diff --git a/res/res_ari_sounds.c b/res/res_ari_sounds.c
index ea7f60a0b6fcde0d46339c1b9b53842bde3c572e..8bb217153a59649245099cd81db4c60e809edbf8 100644
--- a/res/res_ari_sounds.c
+++ b/res/res_ari_sounds.c
@@ -248,4 +248,4 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "RESTful API module - Sou
 	.load = load_module,
 	.unload = unload_module,
 	.nonoptreq = "res_ari,res_stasis",
-	);
+);
diff --git a/res/res_calendar.c b/res/res_calendar.c
index 78bc24b2123b3d1f70d16668a23b35b2621a6ad2..1a9878b3276357f6232251836b2278c3258d6903 100644
--- a/res/res_calendar.c
+++ b/res/res_calendar.c
@@ -1913,9 +1913,9 @@ static int load_module(void)
 	return AST_MODULE_LOAD_SUCCESS;
 }
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS | AST_MODFLAG_LOAD_ORDER, "Asterisk Calendar integration",
-		.support_level = AST_MODULE_SUPPORT_CORE,
-		.load = load_module,
-		.unload = unload_module,
-		.reload = reload,
-		.load_pri = AST_MODPRI_DEVSTATE_PROVIDER,
-	);
+	.support_level = AST_MODULE_SUPPORT_CORE,
+	.load = load_module,
+	.unload = unload_module,
+	.reload = reload,
+	.load_pri = AST_MODPRI_DEVSTATE_PROVIDER,
+);
diff --git a/res/res_calendar_caldav.c b/res/res_calendar_caldav.c
index 2e3eb934bab66a7d2143259113bf38550d5998b7..590408571fe3bfa89f6508986143366db7ad78c7 100644
--- a/res/res_calendar_caldav.c
+++ b/res/res_calendar_caldav.c
@@ -725,8 +725,8 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Asterisk CalDAV Calendar Integration",
-		.support_level = AST_MODULE_SUPPORT_CORE,
-		.load = load_module,
-		.unload = unload_module,
-		.load_pri = AST_MODPRI_DEVSTATE_PLUGIN,
-	);
+	.support_level = AST_MODULE_SUPPORT_CORE,
+	.load = load_module,
+	.unload = unload_module,
+	.load_pri = AST_MODPRI_DEVSTATE_PLUGIN,
+);
diff --git a/res/res_calendar_exchange.c b/res/res_calendar_exchange.c
index b11edcf222d4a0eaad4c31079724eac13a044aae..577d65ba6966a387f5e82705ceee578b0c0cb047 100644
--- a/res/res_calendar_exchange.c
+++ b/res/res_calendar_exchange.c
@@ -741,8 +741,8 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Asterisk MS Exchange Calendar Integration",
-		.support_level = AST_MODULE_SUPPORT_CORE,
-		.load = load_module,
-		.unload = unload_module,
-		.load_pri = AST_MODPRI_DEVSTATE_PLUGIN,
-	);
+	.support_level = AST_MODULE_SUPPORT_CORE,
+	.load = load_module,
+	.unload = unload_module,
+	.load_pri = AST_MODPRI_DEVSTATE_PLUGIN,
+);
diff --git a/res/res_calendar_icalendar.c b/res/res_calendar_icalendar.c
index 4c7c8a903b1dde829dbc8362fa7b4c835b83c023..507f19cbf50f94ccc9df3f9474e3ed95f1168ca8 100644
--- a/res/res_calendar_icalendar.c
+++ b/res/res_calendar_icalendar.c
@@ -504,8 +504,8 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Asterisk iCalendar .ics file integration",
-		.support_level = AST_MODULE_SUPPORT_CORE,
-		.load = load_module,
-		.unload = unload_module,
-		.load_pri = AST_MODPRI_DEVSTATE_PLUGIN,
-	);
+	.support_level = AST_MODULE_SUPPORT_CORE,
+	.load = load_module,
+	.unload = unload_module,
+	.load_pri = AST_MODPRI_DEVSTATE_PLUGIN,
+);
diff --git a/res/res_chan_stats.c b/res/res_chan_stats.c
index c9167d93a27134d46a1bfe7072f48bacc7e9067c..8b188dc130c89b4ffa0060e14dba9a97e1f56cb8 100644
--- a/res/res_chan_stats.c
+++ b/res/res_chan_stats.c
@@ -184,4 +184,4 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Example of how to use St
 	.load = load_module,
 	.unload = unload_module,
 	.nonoptreq = "res_statsd"
-	);
+);
diff --git a/res/res_clialiases.c b/res/res_clialiases.c
index ba55551b9d7931cd02b533baf854811863cc9da1..74d763ac7fddae75658648fd4eadca3e366df7d4 100644
--- a/res/res_clialiases.c
+++ b/res/res_clialiases.c
@@ -300,8 +300,8 @@ static int load_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "CLI Aliases",
-		.support_level = AST_MODULE_SUPPORT_CORE,
-		.load = load_module,
-		.unload = unload_module,
-		.reload = reload_module,
-		);
+	.support_level = AST_MODULE_SUPPORT_CORE,
+	.load = load_module,
+	.unload = unload_module,
+	.reload = reload_module,
+);
diff --git a/res/res_config_curl.c b/res/res_config_curl.c
index 985f51eedf90a56981e4df0dddc603a8bf19b128..7b571d549b7eb059109dca0be50f3f12039aaa73 100644
--- a/res/res_config_curl.c
+++ b/res/res_config_curl.c
@@ -658,9 +658,9 @@ static int load_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Realtime Curl configuration",
-		.support_level = AST_MODULE_SUPPORT_CORE,
-		.load = load_module,
-		.unload = unload_module,
-		.reload = reload_module,
-		.load_pri = AST_MODPRI_REALTIME_DRIVER,
-	);
+	.support_level = AST_MODULE_SUPPORT_CORE,
+	.load = load_module,
+	.unload = unload_module,
+	.reload = reload_module,
+	.load_pri = AST_MODPRI_REALTIME_DRIVER,
+);
diff --git a/res/res_config_odbc.c b/res/res_config_odbc.c
index b36bcb68a11b391d052aef2b705913d6a0bc881c..37c6d3ff905b3d1a226f7600ed8e7e2c1ca65b48 100644
--- a/res/res_config_odbc.c
+++ b/res/res_config_odbc.c
@@ -1221,9 +1221,9 @@ static int reload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Realtime ODBC configuration",
-		.support_level = AST_MODULE_SUPPORT_CORE,
-		.load = load_module,
-		.unload = unload_module,
-		.reload = reload_module,
-		.load_pri = AST_MODPRI_REALTIME_DRIVER,
-		);
+	.support_level = AST_MODULE_SUPPORT_CORE,
+	.load = load_module,
+	.unload = unload_module,
+	.reload = reload_module,
+	.load_pri = AST_MODPRI_REALTIME_DRIVER,
+);
diff --git a/res/res_config_pgsql.c b/res/res_config_pgsql.c
index 00cde50ed6f597bc372f246b48741d9a36dfa3bb..313c7990cd896ade235628686e59c225d8039fd0 100644
--- a/res/res_config_pgsql.c
+++ b/res/res_config_pgsql.c
@@ -1655,9 +1655,9 @@ static char *handle_cli_realtime_pgsql_status(struct ast_cli_entry *e, int cmd,
 
 /* needs usecount semantics defined */
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "PostgreSQL RealTime Configuration Driver",
-		.support_level = AST_MODULE_SUPPORT_EXTENDED,
-		.load = load_module,
-		.unload = unload_module,
-		.reload = reload,
-		.load_pri = AST_MODPRI_REALTIME_DRIVER,
-	       );
+	.support_level = AST_MODULE_SUPPORT_EXTENDED,
+	.load = load_module,
+	.unload = unload_module,
+	.reload = reload,
+	.load_pri = AST_MODPRI_REALTIME_DRIVER,
+);
diff --git a/res/res_config_sqlite.c b/res/res_config_sqlite.c
index 41fbb0e95111a08c28f0423ed7988e37346c7b67..5659b4e41d06cd6f997c6a165e330d2917693aab 100644
--- a/res/res_config_sqlite.c
+++ b/res/res_config_sqlite.c
@@ -1768,8 +1768,8 @@ static int load_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Realtime SQLite configuration",
-		.support_level = AST_MODULE_SUPPORT_EXTENDED,
-		.load = load_module,
-		.unload = unload_module,
-		.load_pri = AST_MODPRI_REALTIME_DRIVER,
+	.support_level = AST_MODULE_SUPPORT_EXTENDED,
+	.load = load_module,
+	.unload = unload_module,
+	.load_pri = AST_MODPRI_REALTIME_DRIVER,
 );
diff --git a/res/res_crypto.c b/res/res_crypto.c
index a1d711c813e4b68f4cd92faba5606d4e5aeca133..d8f328f088f8324fd3d4eb3795982ba423842295 100644
--- a/res/res_crypto.c
+++ b/res/res_crypto.c
@@ -663,9 +663,9 @@ static int unload_module(void)
 
 /* needs usecount semantics defined */
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS | AST_MODFLAG_LOAD_ORDER, "Cryptographic Digital Signatures",
-		.support_level = AST_MODULE_SUPPORT_CORE,
-		.load = load_module,
-		.unload = unload_module,
-		.reload = reload,
-		.load_pri = AST_MODPRI_CHANNEL_DEPEND, /*!< Since we don't have a config file, we could move up to REALTIME_DEPEND, if necessary */
-	);
+	.support_level = AST_MODULE_SUPPORT_CORE,
+	.load = load_module,
+	.unload = unload_module,
+	.reload = reload,
+	.load_pri = AST_MODPRI_CHANNEL_DEPEND, /*!< Since we don't have a config file, we could move up to REALTIME_DEPEND, if necessary */
+);
diff --git a/res/res_curl.c b/res/res_curl.c
index c3f22c785af8738e2dfe8c84b9ae03dd0a6b08dc..eeacbd298730047635fbc0b8551bd9de657bd014 100644
--- a/res/res_curl.c
+++ b/res/res_curl.c
@@ -97,8 +97,8 @@ static int load_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "cURL Resource Module",
-		.support_level = AST_MODULE_SUPPORT_CORE,
-		.load = load_module,
-		.unload = unload_module,
-		.load_pri = AST_MODPRI_REALTIME_DEPEND,
-	);
+	.support_level = AST_MODULE_SUPPORT_CORE,
+	.load = load_module,
+	.unload = unload_module,
+	.load_pri = AST_MODPRI_REALTIME_DEPEND,
+);
diff --git a/res/res_fax.c b/res/res_fax.c
index 29ec315f759aa0bdd8b81272b8cb6eb85fcffe54..62fe726de9980ddfa07fbef3d25bdfbff76e9058 100644
--- a/res/res_fax.c
+++ b/res/res_fax.c
@@ -4678,9 +4678,9 @@ static int reload_module(void)
 
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS | AST_MODFLAG_LOAD_ORDER, "Generic FAX Applications",
-		.support_level = AST_MODULE_SUPPORT_CORE,
-		.load = load_module,
-		.unload = unload_module,
-		.reload = reload_module,
-		.load_pri = AST_MODPRI_APP_DEPEND,
-	       );
+	.support_level = AST_MODULE_SUPPORT_CORE,
+	.load = load_module,
+	.unload = unload_module,
+	.reload = reload_module,
+	.load_pri = AST_MODPRI_APP_DEPEND,
+);
diff --git a/res/res_fax_spandsp.c b/res/res_fax_spandsp.c
index 288f91dac098f116cab2344c1c445cba14ca7b19..3133530fd47b0c119a9fa65ffaa339d25e65eab7 100644
--- a/res/res_fax_spandsp.c
+++ b/res/res_fax_spandsp.c
@@ -1263,7 +1263,7 @@ static int load_module(void)
 
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Spandsp G.711 and T.38 FAX Technologies",
-		.support_level = AST_MODULE_SUPPORT_EXTENDED,
-		.load = load_module,
-		.unload = unload_module,
-	       );
+	.support_level = AST_MODULE_SUPPORT_EXTENDED,
+	.load = load_module,
+	.unload = unload_module,
+);
diff --git a/res/res_hep.c b/res/res_hep.c
index 72b80694543c89c619aec7a461953f00d71ca64d..e831fff0271407e64e025422cec611d559df0d9f 100644
--- a/res/res_hep.c
+++ b/res/res_hep.c
@@ -625,4 +625,4 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS | AST_MODFLAG_LOAD_
 	.unload = unload_module,
 	.reload = reload_module,
 	.load_pri = AST_MODPRI_APP_DEPEND,
-	);
+);
diff --git a/res/res_hep_pjsip.c b/res/res_hep_pjsip.c
index d0c95e34808b0e4a0221a8e814eee582605b0888..87d68e36d466af266bad5b4bc9154fe7ac1696f5 100644
--- a/res/res_hep_pjsip.c
+++ b/res/res_hep_pjsip.c
@@ -172,8 +172,8 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "PJSIP HEPv3 Logger",
-		.support_level = AST_MODULE_SUPPORT_EXTENDED,
-		.load = load_module,
-		.unload = unload_module,
-		.load_pri = AST_MODPRI_DEFAULT,
-	       );
+	.support_level = AST_MODULE_SUPPORT_EXTENDED,
+	.load = load_module,
+	.unload = unload_module,
+	.load_pri = AST_MODPRI_DEFAULT,
+);
diff --git a/res/res_hep_rtcp.c b/res/res_hep_rtcp.c
index a6b7351af80e29db5cd5467e1c5ac806f8171f23..352262b6fada5dc7336722227a02975b581cc202 100644
--- a/res/res_hep_rtcp.c
+++ b/res/res_hep_rtcp.c
@@ -141,4 +141,4 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "RTCP HEPv3 Logger",
 	.load = load_module,
 	.unload = unload_module,
 	.load_pri = AST_MODPRI_DEFAULT,
-	);
+);
diff --git a/res/res_http_websocket.c b/res/res_http_websocket.c
index 0481e7ecd47d25658e961f68ca93d289ea0dcce1..046c76e815a5de987504f4f251a3cd1a50ea7d50 100644
--- a/res/res_http_websocket.c
+++ b/res/res_http_websocket.c
@@ -1321,8 +1321,8 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS | AST_MODFLAG_LOAD_ORDER, "HTTP WebSocket Support",
-		.support_level = AST_MODULE_SUPPORT_EXTENDED,
-		.load = load_module,
-		.unload = unload_module,
-		.load_pri = AST_MODPRI_CHANNEL_DEPEND,
-	);
+	.support_level = AST_MODULE_SUPPORT_EXTENDED,
+	.load = load_module,
+	.unload = unload_module,
+	.load_pri = AST_MODPRI_CHANNEL_DEPEND,
+);
diff --git a/res/res_manager_devicestate.c b/res/res_manager_devicestate.c
index 3d1f1ab10404064dc0d9f2470e366e1f65b16239..a506e978319504410bd84663beebabcc36357694 100644
--- a/res/res_manager_devicestate.c
+++ b/res/res_manager_devicestate.c
@@ -143,8 +143,8 @@ static int load_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Manager Device State Topic Forwarder",
-		.support_level = AST_MODULE_SUPPORT_CORE,
-		.load = load_module,
-		.unload = unload_module,
-		.load_pri = AST_MODPRI_DEVSTATE_CONSUMER,
-	);
+	.support_level = AST_MODULE_SUPPORT_CORE,
+	.load = load_module,
+	.unload = unload_module,
+	.load_pri = AST_MODPRI_DEVSTATE_CONSUMER,
+);
diff --git a/res/res_manager_presencestate.c b/res/res_manager_presencestate.c
index bb9e63ab92981cc19e7bb504737bc050a491ce7f..fb5719214683d36e625989e1450d4ad0a0ab1dcb 100644
--- a/res/res_manager_presencestate.c
+++ b/res/res_manager_presencestate.c
@@ -142,8 +142,8 @@ static int load_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Manager Presence State Topic Forwarder",
-		.support_level = AST_MODULE_SUPPORT_CORE,
-		.load = load_module,
-		.unload = unload_module,
-		.load_pri = AST_MODPRI_DEVSTATE_CONSUMER,
-	);
+	.support_level = AST_MODULE_SUPPORT_CORE,
+	.load = load_module,
+	.unload = unload_module,
+	.load_pri = AST_MODPRI_DEVSTATE_CONSUMER,
+);
diff --git a/res/res_monitor.c b/res/res_monitor.c
index 047b370085b4fd92465adbeb0731b72ed585444b..6fee0c2a08c320f61fe6896e3b09c304b8e8dd60 100644
--- a/res/res_monitor.c
+++ b/res/res_monitor.c
@@ -1001,8 +1001,8 @@ static int unload_module(void)
 
 /* usecount semantics need to be defined */
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS | AST_MODFLAG_LOAD_ORDER, "Call Monitoring Resource",
-		.support_level = AST_MODULE_SUPPORT_CORE,
-		.load = load_module,
-		.unload = unload_module,
-		.load_pri = AST_MODPRI_CHANNEL_DEPEND,
-		);
+	.support_level = AST_MODULE_SUPPORT_CORE,
+	.load = load_module,
+	.unload = unload_module,
+	.load_pri = AST_MODPRI_CHANNEL_DEPEND,
+);
diff --git a/res/res_odbc.c b/res/res_odbc.c
index 2530a4879bb577207370542beea39db8fddc89d5..06009a2a5efb11d32458f555ef22bdacaf240121 100644
--- a/res/res_odbc.c
+++ b/res/res_odbc.c
@@ -1909,9 +1909,9 @@ static int load_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS | AST_MODFLAG_LOAD_ORDER, "ODBC resource",
-		.support_level = AST_MODULE_SUPPORT_CORE,
-		.load = load_module,
-		.unload = unload_module,
-		.reload = reload,
-		.load_pri = AST_MODPRI_REALTIME_DEPEND,
-	       );
+	.support_level = AST_MODULE_SUPPORT_CORE,
+	.load = load_module,
+	.unload = unload_module,
+	.reload = reload,
+	.load_pri = AST_MODPRI_REALTIME_DEPEND,
+);
diff --git a/res/res_phoneprov.c b/res/res_phoneprov.c
index b9eeccee62c1e5a774908738e6c081f1fb24339c..cf566b3d0ab44ff11ef31860f597a34b81091af2 100644
--- a/res/res_phoneprov.c
+++ b/res/res_phoneprov.c
@@ -1489,12 +1489,12 @@ static int reload(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS | AST_MODFLAG_LOAD_ORDER, "HTTP Phone Provisioning",
-		.support_level = AST_MODULE_SUPPORT_EXTENDED,
-		.load = load_module,
-		.unload = unload_module,
-		.reload = reload,
-		.load_pri = AST_MODPRI_CHANNEL_DEPEND,
-	);
+	.support_level = AST_MODULE_SUPPORT_EXTENDED,
+	.load = load_module,
+	.unload = unload_module,
+	.reload = reload,
+	.load_pri = AST_MODPRI_CHANNEL_DEPEND,
+);
 
 /****  Public API for register/unregister, set defaults, and add extension. ****/
 
diff --git a/res/res_pjsip.c b/res/res_pjsip.c
index a2638099bce46e59e9b505d071d24c3ee685d5ff..3582fae37aefa864aa4929e905c9f7c44617f2db 100644
--- a/res/res_pjsip.c
+++ b/res/res_pjsip.c
@@ -3786,9 +3786,9 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS | AST_MODFLAG_LOAD_ORDER, "Basic SIP resource",
-		.support_level = AST_MODULE_SUPPORT_CORE,
-		.load = load_module,
-		.unload = unload_module,
-		.reload = reload_module,
-		.load_pri = AST_MODPRI_CHANNEL_DEPEND - 5,
+	.support_level = AST_MODULE_SUPPORT_CORE,
+	.load = load_module,
+	.unload = unload_module,
+	.reload = reload_module,
+	.load_pri = AST_MODPRI_CHANNEL_DEPEND - 5,
 );
diff --git a/res/res_pjsip_acl.c b/res/res_pjsip_acl.c
index 151ebededdb7bf96db4bf7e143527d2d783e822f..5c10e5779bda3e75761eb32741363bf08903e3f9 100644
--- a/res/res_pjsip_acl.c
+++ b/res/res_pjsip_acl.c
@@ -317,8 +317,8 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "PJSIP ACL Resource",
-		.support_level = AST_MODULE_SUPPORT_CORE,
-		.load = load_module,
-		.unload = unload_module,
-		.load_pri = AST_MODPRI_APP_DEPEND,
-	       );
+	.support_level = AST_MODULE_SUPPORT_CORE,
+	.load = load_module,
+	.unload = unload_module,
+	.load_pri = AST_MODPRI_APP_DEPEND,
+);
diff --git a/res/res_pjsip_authenticator_digest.c b/res/res_pjsip_authenticator_digest.c
index 8a781254c3e179f7369d6c281c1aa29a45678b8a..e610bb804468d2b0b65270d80c72cbbb4dc7c20d 100644
--- a/res/res_pjsip_authenticator_digest.c
+++ b/res/res_pjsip_authenticator_digest.c
@@ -486,9 +486,9 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "PJSIP authentication resource",
-		.support_level = AST_MODULE_SUPPORT_CORE,
-		.load = load_module,
-		.unload = unload_module,
-		.reload = reload_module,
-		.load_pri = AST_MODPRI_CHANNEL_DEPEND,
+	.support_level = AST_MODULE_SUPPORT_CORE,
+	.load = load_module,
+	.unload = unload_module,
+	.reload = reload_module,
+	.load_pri = AST_MODPRI_CHANNEL_DEPEND,
 );
diff --git a/res/res_pjsip_caller_id.c b/res/res_pjsip_caller_id.c
index 63ef1f4d41cb40fa2872e251e5c03aa00950bf7b..c084a8181e0646d87853b8a0453659b34b2335da 100644
--- a/res/res_pjsip_caller_id.c
+++ b/res/res_pjsip_caller_id.c
@@ -742,8 +742,8 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "PJSIP Caller ID Support",
-		.support_level = AST_MODULE_SUPPORT_CORE,
-		.load = load_module,
-		.unload = unload_module,
-		.load_pri = AST_MODPRI_APP_DEPEND,
-	       );
+	.support_level = AST_MODULE_SUPPORT_CORE,
+	.load = load_module,
+	.unload = unload_module,
+	.load_pri = AST_MODPRI_APP_DEPEND,
+);
diff --git a/res/res_pjsip_config_wizard.c b/res/res_pjsip_config_wizard.c
index 6bde704f2e6d38a6a8d73ad4e5714c66bb56a71d..19e76574d9d79e39fbd1d3c276ff2b65bbedbdb1 100644
--- a/res/res_pjsip_config_wizard.c
+++ b/res/res_pjsip_config_wizard.c
@@ -1195,8 +1195,8 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS | AST_MODFLAG_LOAD_ORDER, "PJSIP Config Wizard",
-		.support_level = AST_MODULE_SUPPORT_CORE,
-		.load = load_module,
-		.unload = unload_module,
-		.load_pri = AST_MODPRI_REALTIME_DRIVER,
-		);
+	.support_level = AST_MODULE_SUPPORT_CORE,
+	.load = load_module,
+	.unload = unload_module,
+	.load_pri = AST_MODPRI_REALTIME_DRIVER,
+);
diff --git a/res/res_pjsip_dialog_info_body_generator.c b/res/res_pjsip_dialog_info_body_generator.c
index d9725f4c53c5187d869fd9b017cd01fec9e29887..c8dc4014e798468627d775a390269185719ede08 100644
--- a/res/res_pjsip_dialog_info_body_generator.c
+++ b/res/res_pjsip_dialog_info_body_generator.c
@@ -207,8 +207,8 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "PJSIP Extension State Dialog Info+XML Provider",
-		.support_level = AST_MODULE_SUPPORT_CORE,
-		.load = load_module,
-		.unload = unload_module,
-		.load_pri = AST_MODPRI_CHANNEL_DEPEND,
+	.support_level = AST_MODULE_SUPPORT_CORE,
+	.load = load_module,
+	.unload = unload_module,
+	.load_pri = AST_MODPRI_CHANNEL_DEPEND,
 );
diff --git a/res/res_pjsip_diversion.c b/res/res_pjsip_diversion.c
index 49f78921209c61324bef2cccbd68b8c9c08dbd87..3dfae455bec437d4e46c2861412395fd4313c4cc 100644
--- a/res/res_pjsip_diversion.c
+++ b/res/res_pjsip_diversion.c
@@ -348,8 +348,8 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "PJSIP Add Diversion Header Support",
-		.support_level = AST_MODULE_SUPPORT_CORE,
-		.load = load_module,
-		.unload = unload_module,
-		.load_pri = AST_MODPRI_APP_DEPEND,
-	       );
+	.support_level = AST_MODULE_SUPPORT_CORE,
+	.load = load_module,
+	.unload = unload_module,
+	.load_pri = AST_MODPRI_APP_DEPEND,
+);
diff --git a/res/res_pjsip_dtmf_info.c b/res/res_pjsip_dtmf_info.c
index b0a6649a0bccebfc0643c7d5b6585d3b282138b8..b6a0b4a1ec4594485fa1e6fcbb419ac8306c62f5 100644
--- a/res/res_pjsip_dtmf_info.c
+++ b/res/res_pjsip_dtmf_info.c
@@ -163,8 +163,8 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "PJSIP DTMF INFO Support",
-		.support_level = AST_MODULE_SUPPORT_CORE,
-		.load = load_module,
-		.unload = unload_module,
-		.load_pri = AST_MODPRI_APP_DEPEND,
-	       );
+	.support_level = AST_MODULE_SUPPORT_CORE,
+	.load = load_module,
+	.unload = unload_module,
+	.load_pri = AST_MODPRI_APP_DEPEND,
+);
diff --git a/res/res_pjsip_endpoint_identifier_anonymous.c b/res/res_pjsip_endpoint_identifier_anonymous.c
index 274c05586894af6438f21929cef7dcaa0fc024f1..06933a9ad03a306aeec24beedb46af8414137614 100644
--- a/res/res_pjsip_endpoint_identifier_anonymous.c
+++ b/res/res_pjsip_endpoint_identifier_anonymous.c
@@ -121,8 +121,8 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "PJSIP Anonymous endpoint identifier",
-		.support_level = AST_MODULE_SUPPORT_CORE,
-		.load = load_module,
-		.unload = unload_module,
-		.load_pri = AST_MODPRI_DEFAULT,
-	       );
+	.support_level = AST_MODULE_SUPPORT_CORE,
+	.load = load_module,
+	.unload = unload_module,
+	.load_pri = AST_MODPRI_DEFAULT,
+);
diff --git a/res/res_pjsip_endpoint_identifier_ip.c b/res/res_pjsip_endpoint_identifier_ip.c
index 5c6e2cc3e8df5387fa52e45e91178d0f8c6ca727..bbf340761b8200c9ccc2776236b40cd2daba0f4d 100644
--- a/res/res_pjsip_endpoint_identifier_ip.c
+++ b/res/res_pjsip_endpoint_identifier_ip.c
@@ -531,9 +531,9 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "PJSIP IP endpoint identifier",
-		.support_level = AST_MODULE_SUPPORT_CORE,
-		.load = load_module,
-		.reload = reload_module,
-		.unload = unload_module,
-		.load_pri = AST_MODPRI_APP_DEPEND,
-	       );
+	.support_level = AST_MODULE_SUPPORT_CORE,
+	.load = load_module,
+	.reload = reload_module,
+	.unload = unload_module,
+	.load_pri = AST_MODPRI_APP_DEPEND,
+);
diff --git a/res/res_pjsip_endpoint_identifier_user.c b/res/res_pjsip_endpoint_identifier_user.c
index 5abf8799994fe816c47cfc0d7dde958ea39b159c..aede2f7d362588d310b46592c6b59dddfb865878 100644
--- a/res/res_pjsip_endpoint_identifier_user.c
+++ b/res/res_pjsip_endpoint_identifier_user.c
@@ -127,8 +127,8 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "PJSIP username endpoint identifier",
-		.support_level = AST_MODULE_SUPPORT_CORE,
-		.load = load_module,
-		.unload = unload_module,
-		.load_pri = AST_MODPRI_APP_DEPEND,
-	       );
+	.support_level = AST_MODULE_SUPPORT_CORE,
+	.load = load_module,
+	.unload = unload_module,
+	.load_pri = AST_MODPRI_APP_DEPEND,
+);
diff --git a/res/res_pjsip_exten_state.c b/res/res_pjsip_exten_state.c
index a05e1915df8bd98805d30af19e198a39bb409c09..5e8a0175e3320669b4965d3e6835c32365647da3 100644
--- a/res/res_pjsip_exten_state.c
+++ b/res/res_pjsip_exten_state.c
@@ -517,8 +517,8 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "PJSIP Extension State Notifications",
-		.support_level = AST_MODULE_SUPPORT_CORE,
-		.load = load_module,
-		.unload = unload_module,
-		.load_pri = AST_MODPRI_CHANNEL_DEPEND,
+	.support_level = AST_MODULE_SUPPORT_CORE,
+	.load = load_module,
+	.unload = unload_module,
+	.load_pri = AST_MODPRI_CHANNEL_DEPEND,
 );
diff --git a/res/res_pjsip_header_funcs.c b/res/res_pjsip_header_funcs.c
index 4ab3fb1d82886525630a1ea3d4f508a18dbc3114..7d164b12a9df956ac8da6f3b55f50b9bd00c3922 100644
--- a/res/res_pjsip_header_funcs.c
+++ b/res/res_pjsip_header_funcs.c
@@ -620,7 +620,8 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "PJSIP Header Functions",
-		.support_level = AST_MODULE_SUPPORT_CORE,
-		.load = load_module,
-		.unload = unload_module,
-		.load_pri = AST_MODPRI_APP_DEPEND,);
+	.support_level = AST_MODULE_SUPPORT_CORE,
+	.load = load_module,
+	.unload = unload_module,
+	.load_pri = AST_MODPRI_APP_DEPEND,
+);
diff --git a/res/res_pjsip_keepalive.c b/res/res_pjsip_keepalive.c
index b854fc957ef96dc011b1147e3b87d07b8b35e4c4..d850973f8c83aa3c88d2d101f92c0bdf2aa58f66 100644
--- a/res/res_pjsip_keepalive.c
+++ b/res/res_pjsip_keepalive.c
@@ -261,9 +261,9 @@ static int reload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "PJSIP Stateful Connection Keepalive Support",
-		.support_level = AST_MODULE_SUPPORT_CORE,
-		.load = load_module,
-		.reload = reload_module,
-		.unload = unload_module,
-		.load_pri = AST_MODPRI_CHANNEL_DEPEND - 4,
-		   );
+	.support_level = AST_MODULE_SUPPORT_CORE,
+	.load = load_module,
+	.reload = reload_module,
+	.unload = unload_module,
+	.load_pri = AST_MODPRI_CHANNEL_DEPEND - 4,
+);
diff --git a/res/res_pjsip_log_forwarder.c b/res/res_pjsip_log_forwarder.c
index 5324063bfd08c5685e88161025ab1e89f23f3cc0..85ca9358c3c290d610dcb7ca3706d86780f07dba 100644
--- a/res/res_pjsip_log_forwarder.c
+++ b/res/res_pjsip_log_forwarder.c
@@ -122,4 +122,4 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS | AST_MODFLAG_LOAD_
 	.load = load_module,
 	.unload = unload_module,
 	.load_pri = AST_MODPRI_CHANNEL_DEPEND - 6,
-	);
+);
diff --git a/res/res_pjsip_logger.c b/res/res_pjsip_logger.c
index db54aa949833dfc19b8ad941904cb1e7f6350b3c..427cb6fb7d81919de26b93feb60eec93d1d50604 100644
--- a/res/res_pjsip_logger.c
+++ b/res/res_pjsip_logger.c
@@ -260,8 +260,8 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "PJSIP Packet Logger",
-		.support_level = AST_MODULE_SUPPORT_CORE,
-		.load = load_module,
-		.unload = unload_module,
-		.load_pri = AST_MODPRI_APP_DEPEND,
-	       );
+	.support_level = AST_MODULE_SUPPORT_CORE,
+	.load = load_module,
+	.unload = unload_module,
+	.load_pri = AST_MODPRI_APP_DEPEND,
+);
diff --git a/res/res_pjsip_messaging.c b/res/res_pjsip_messaging.c
index dab70ca9689cf18e935d5993f1eb64558ad1d525..f3985059c33202b4075906b04094a486e5093a01 100644
--- a/res/res_pjsip_messaging.c
+++ b/res/res_pjsip_messaging.c
@@ -779,8 +779,8 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "PJSIP Messaging Support",
-		.support_level = AST_MODULE_SUPPORT_CORE,
-		.load = load_module,
-		.unload = unload_module,
-		.load_pri = AST_MODPRI_APP_DEPEND,
-	       );
+	.support_level = AST_MODULE_SUPPORT_CORE,
+	.load = load_module,
+	.unload = unload_module,
+	.load_pri = AST_MODPRI_APP_DEPEND,
+);
diff --git a/res/res_pjsip_multihomed.c b/res/res_pjsip_multihomed.c
index e1abff34f9a2b55bf9934547a0c8bdc052da8d7b..68a431153ff7c547419c6dec752a12f8fd2ae60e 100644
--- a/res/res_pjsip_multihomed.c
+++ b/res/res_pjsip_multihomed.c
@@ -232,8 +232,8 @@ static int load_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "PJSIP Multihomed Routing Support",
-		.support_level = AST_MODULE_SUPPORT_CORE,
-		.load = load_module,
-		.unload = unload_module,
-		.load_pri = AST_MODPRI_APP_DEPEND,
-	       );
+	.support_level = AST_MODULE_SUPPORT_CORE,
+	.load = load_module,
+	.unload = unload_module,
+	.load_pri = AST_MODPRI_APP_DEPEND,
+);
diff --git a/res/res_pjsip_mwi.c b/res/res_pjsip_mwi.c
index 2ab7dfee0ea3292bcffd520bc61361cc9b5da2ca..8fefc3ae0279f63692cbba2bdae47f3e9d0cbe52 100644
--- a/res/res_pjsip_mwi.c
+++ b/res/res_pjsip_mwi.c
@@ -1025,9 +1025,9 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "PJSIP MWI resource",
-		.support_level = AST_MODULE_SUPPORT_CORE,
-		.load = load_module,
-		.unload = unload_module,
-		.reload = reload,
-		.load_pri = AST_MODPRI_CHANNEL_DEPEND,
+	.support_level = AST_MODULE_SUPPORT_CORE,
+	.load = load_module,
+	.unload = unload_module,
+	.reload = reload,
+	.load_pri = AST_MODPRI_CHANNEL_DEPEND,
 );
diff --git a/res/res_pjsip_mwi_body_generator.c b/res/res_pjsip_mwi_body_generator.c
index cc558ac82eeed84685767fa0b93448657aa0cd4d..e4b39d534fad73340a74510f9ee2f96ded2c1b47 100644
--- a/res/res_pjsip_mwi_body_generator.c
+++ b/res/res_pjsip_mwi_body_generator.c
@@ -109,8 +109,8 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "PJSIP MWI resource",
-		.support_level = AST_MODULE_SUPPORT_CORE,
-		.load = load_module,
-		.unload = unload_module,
-		.load_pri = AST_MODPRI_CHANNEL_DEPEND,
+	.support_level = AST_MODULE_SUPPORT_CORE,
+	.load = load_module,
+	.unload = unload_module,
+	.load_pri = AST_MODPRI_CHANNEL_DEPEND,
 );
diff --git a/res/res_pjsip_nat.c b/res/res_pjsip_nat.c
index 6e093abcd70bd7cd1e9092ef9837518ea561f09b..c717ba21c634ecc1795cc119ee9eff5dc769bb66 100644
--- a/res/res_pjsip_nat.c
+++ b/res/res_pjsip_nat.c
@@ -306,8 +306,8 @@ static int load_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "PJSIP NAT Support",
-		.support_level = AST_MODULE_SUPPORT_CORE,
-		.load = load_module,
-		.unload = unload_module,
-		.load_pri = AST_MODPRI_APP_DEPEND,
-	       );
+	.support_level = AST_MODULE_SUPPORT_CORE,
+	.load = load_module,
+	.unload = unload_module,
+	.load_pri = AST_MODPRI_APP_DEPEND,
+);
diff --git a/res/res_pjsip_notify.c b/res/res_pjsip_notify.c
index e494daf26fd5509a15cad35a8197c3d3757b0b0c..2396337ef3099fc8517350b22b66fd998d4e4fb0 100644
--- a/res/res_pjsip_notify.c
+++ b/res/res_pjsip_notify.c
@@ -1027,9 +1027,9 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "CLI/AMI PJSIP NOTIFY Support",
-		.support_level = AST_MODULE_SUPPORT_CORE,
-		.load = load_module,
-		.reload = reload_module,
-		.unload = unload_module,
-		.load_pri = AST_MODPRI_APP_DEPEND,
-	       );
+	.support_level = AST_MODULE_SUPPORT_CORE,
+	.load = load_module,
+	.reload = reload_module,
+	.unload = unload_module,
+	.load_pri = AST_MODPRI_APP_DEPEND,
+);
diff --git a/res/res_pjsip_one_touch_record_info.c b/res/res_pjsip_one_touch_record_info.c
index 8b1ff9dab442459867f2f074182f24aa8b5f8441..30dfcaabf87ef2862b45889acd161374cf0ced6b 100644
--- a/res/res_pjsip_one_touch_record_info.c
+++ b/res/res_pjsip_one_touch_record_info.c
@@ -128,4 +128,4 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "PJSIP INFO One Touch
 	.load = load_module,
 	.unload = unload_module,
 	.load_pri = AST_MODPRI_APP_DEPEND,
-	);
+);
diff --git a/res/res_pjsip_outbound_authenticator_digest.c b/res/res_pjsip_outbound_authenticator_digest.c
index de77616fd5ca2809c179bbf0f16e80cdb100b5a9..86a15c7b7509140dfe23cd5e61554a3808b3bc26 100644
--- a/res/res_pjsip_outbound_authenticator_digest.c
+++ b/res/res_pjsip_outbound_authenticator_digest.c
@@ -171,8 +171,8 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "PJSIP authentication resource",
-		.support_level = AST_MODULE_SUPPORT_CORE,
-		.load = load_module,
-		.unload = unload_module,
-		.load_pri = AST_MODPRI_CHANNEL_DEPEND,
+	.support_level = AST_MODULE_SUPPORT_CORE,
+	.load = load_module,
+	.unload = unload_module,
+	.load_pri = AST_MODPRI_CHANNEL_DEPEND,
 );
diff --git a/res/res_pjsip_outbound_publish.c b/res/res_pjsip_outbound_publish.c
index f7669932e2ca674f25ec70b3591f213e9f559b6a..a58bcbb9165e4dc9643f87df5fda2f99d11e1d16 100644
--- a/res/res_pjsip_outbound_publish.c
+++ b/res/res_pjsip_outbound_publish.c
@@ -1189,8 +1189,8 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS | AST_MODFLAG_LOAD_ORDER, "PJSIP Outbound Publish Support",
-		.load = load_module,
-		.reload = reload_module,
-		.unload = unload_module,
-		.load_pri = AST_MODPRI_CHANNEL_DEPEND,
-	       );
+	.load = load_module,
+	.reload = reload_module,
+	.unload = unload_module,
+	.load_pri = AST_MODPRI_CHANNEL_DEPEND,
+);
diff --git a/res/res_pjsip_outbound_registration.c b/res/res_pjsip_outbound_registration.c
index 1dd5f583bd3daa7212534322f09bdec16eadeeb4..a43fca2ec432764fc36eb33f7720bef17deecfb3 100644
--- a/res/res_pjsip_outbound_registration.c
+++ b/res/res_pjsip_outbound_registration.c
@@ -1822,9 +1822,9 @@ static int reload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "PJSIP Outbound Registration Support",
-		.support_level = AST_MODULE_SUPPORT_CORE,
-		.load = load_module,
-		.reload = reload_module,
-		.unload = unload_module,
-		.load_pri = AST_MODPRI_APP_DEPEND,
-	       );
+	.support_level = AST_MODULE_SUPPORT_CORE,
+	.load = load_module,
+	.reload = reload_module,
+	.unload = unload_module,
+	.load_pri = AST_MODPRI_APP_DEPEND,
+);
diff --git a/res/res_pjsip_path.c b/res/res_pjsip_path.c
index d0ee5a49a5353abab0d51887805aa9b4855ab12c..03cbe50768ee62906b9c8705c53392cbf3b7d700 100644
--- a/res/res_pjsip_path.c
+++ b/res/res_pjsip_path.c
@@ -246,8 +246,8 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "PJSIP Path Header Support",
-		.support_level = AST_MODULE_SUPPORT_CORE,
-		.load = load_module,
-		.unload = unload_module,
-		.load_pri = AST_MODPRI_APP_DEPEND,
+	.support_level = AST_MODULE_SUPPORT_CORE,
+	.load = load_module,
+	.unload = unload_module,
+	.load_pri = AST_MODPRI_APP_DEPEND,
 );
diff --git a/res/res_pjsip_phoneprov_provider.c b/res/res_pjsip_phoneprov_provider.c
index 8dafabc53d267de6dab28f623955d7e574737e7c..eef3a082f9c7304fb057848de327b579f72f9416 100644
--- a/res/res_pjsip_phoneprov_provider.c
+++ b/res/res_pjsip_phoneprov_provider.c
@@ -413,8 +413,8 @@ static int reload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "PJSIP Phoneprov Provider",
-		.load = load_module,
-		.reload = reload_module,
-		.unload = unload_module,
-		.load_pri = AST_MODPRI_APP_DEPEND,
-		);
+	.load = load_module,
+	.reload = reload_module,
+	.unload = unload_module,
+	.load_pri = AST_MODPRI_APP_DEPEND,
+);
diff --git a/res/res_pjsip_pidf_body_generator.c b/res/res_pjsip_pidf_body_generator.c
index ef0cce599aa05ce1afa410f47195b6854498c313..0863eafb3ee4e8cf0e78f29787d319a05c299b04 100644
--- a/res/res_pjsip_pidf_body_generator.c
+++ b/res/res_pjsip_pidf_body_generator.c
@@ -132,8 +132,8 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "PJSIP Extension State PIDF Provider",
-		.support_level = AST_MODULE_SUPPORT_CORE,
-		.load = load_module,
-		.unload = unload_module,
-		.load_pri = AST_MODPRI_CHANNEL_DEPEND,
+	.support_level = AST_MODULE_SUPPORT_CORE,
+	.load = load_module,
+	.unload = unload_module,
+	.load_pri = AST_MODPRI_CHANNEL_DEPEND,
 );
diff --git a/res/res_pjsip_pidf_digium_body_supplement.c b/res/res_pjsip_pidf_digium_body_supplement.c
index 86e673afa1cd2e80db368413d2c6a060c1140016..b6212ea5e48f18260154170cc75db729784f92b1 100644
--- a/res/res_pjsip_pidf_digium_body_supplement.c
+++ b/res/res_pjsip_pidf_digium_body_supplement.c
@@ -110,8 +110,8 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "PJSIP PIDF Digium presence supplement",
-		.support_level = AST_MODULE_SUPPORT_CORE,
-		.load = load_module,
-		.unload = unload_module,
-		.load_pri = AST_MODPRI_CHANNEL_DEPEND,
+	.support_level = AST_MODULE_SUPPORT_CORE,
+	.load = load_module,
+	.unload = unload_module,
+	.load_pri = AST_MODPRI_CHANNEL_DEPEND,
 );
diff --git a/res/res_pjsip_pidf_eyebeam_body_supplement.c b/res/res_pjsip_pidf_eyebeam_body_supplement.c
index cd590c3d37e7dda978a95a26519075f54fd7bf63..cc6dfd125c9068f8f2137990a36444687e17f201 100644
--- a/res/res_pjsip_pidf_eyebeam_body_supplement.c
+++ b/res/res_pjsip_pidf_eyebeam_body_supplement.c
@@ -109,8 +109,8 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "PJSIP PIDF Eyebeam supplement",
-		.support_level = AST_MODULE_SUPPORT_CORE,
-		.load = load_module,
-		.unload = unload_module,
-		.load_pri = AST_MODPRI_CHANNEL_DEPEND,
+	.support_level = AST_MODULE_SUPPORT_CORE,
+	.load = load_module,
+	.unload = unload_module,
+	.load_pri = AST_MODPRI_CHANNEL_DEPEND,
 );
diff --git a/res/res_pjsip_publish_asterisk.c b/res/res_pjsip_publish_asterisk.c
index c0d3b90cf44ed729bc9eeac23a81f9afe11e4edc..50d4cc38723c3a92b8ec9dddebb194cbe5fb2a4d 100644
--- a/res/res_pjsip_publish_asterisk.c
+++ b/res/res_pjsip_publish_asterisk.c
@@ -923,8 +923,8 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "PJSIP Asterisk Event PUBLISH Support",
-		.load = load_module,
-		.reload = reload_module,
-		.unload = unload_module,
-		.load_pri = AST_MODPRI_CHANNEL_DEPEND,
+	.load = load_module,
+	.reload = reload_module,
+	.unload = unload_module,
+	.load_pri = AST_MODPRI_CHANNEL_DEPEND,
 );
diff --git a/res/res_pjsip_pubsub.c b/res/res_pjsip_pubsub.c
index 1ecb17d99d42b0976e5309db7c053c511f2d1a5a..5a0e2ba81be29aec57fee4df08072ce63ef7742c 100644
--- a/res/res_pjsip_pubsub.c
+++ b/res/res_pjsip_pubsub.c
@@ -4311,8 +4311,8 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS | AST_MODFLAG_LOAD_ORDER, "PJSIP event resource",
-		.support_level = AST_MODULE_SUPPORT_CORE,
-		.load = load_module,
-		.unload = unload_module,
-		.load_pri = AST_MODPRI_CHANNEL_DEPEND,
+	.support_level = AST_MODULE_SUPPORT_CORE,
+	.load = load_module,
+	.unload = unload_module,
+	.load_pri = AST_MODPRI_CHANNEL_DEPEND,
 );
diff --git a/res/res_pjsip_refer.c b/res/res_pjsip_refer.c
index 5195177d5c00decb63f40e0c95d04d7e8a8c910a..7420e7e6c121e3a8fc92a9ea60ef90115035cde5 100644
--- a/res/res_pjsip_refer.c
+++ b/res/res_pjsip_refer.c
@@ -1141,8 +1141,8 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "PJSIP Blind and Attended Transfer Support",
-		.support_level = AST_MODULE_SUPPORT_CORE,
-		.load = load_module,
-		.unload = unload_module,
-		.load_pri = AST_MODPRI_APP_DEPEND,
-		   );
+	.support_level = AST_MODULE_SUPPORT_CORE,
+	.load = load_module,
+	.unload = unload_module,
+	.load_pri = AST_MODPRI_APP_DEPEND,
+);
diff --git a/res/res_pjsip_registrar.c b/res/res_pjsip_registrar.c
index 944a6055efaa40932866434839bce0b9b64cc1d1..cc18ffa7c04735b88f792f9a0579c031b2ef0f89 100644
--- a/res/res_pjsip_registrar.c
+++ b/res/res_pjsip_registrar.c
@@ -823,8 +823,8 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "PJSIP Registrar Support",
-		.support_level = AST_MODULE_SUPPORT_CORE,
-		.load = load_module,
-		.unload = unload_module,
-		.load_pri = AST_MODPRI_APP_DEPEND,
-	       );
+	.support_level = AST_MODULE_SUPPORT_CORE,
+	.load = load_module,
+	.unload = unload_module,
+	.load_pri = AST_MODPRI_APP_DEPEND,
+);
diff --git a/res/res_pjsip_registrar_expire.c b/res/res_pjsip_registrar_expire.c
index 5b2b350eab7eeca10afb04ee2b49961f4dc184d8..399e7bd0ed53088c20ca671249f03ecdad05c10f 100644
--- a/res/res_pjsip_registrar_expire.c
+++ b/res/res_pjsip_registrar_expire.c
@@ -293,4 +293,4 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "PJSIP Contact Auto-Ex
 	.load = load_module,
 	.unload = unload_module,
 	.load_pri = AST_MODPRI_APP_DEPEND,
-	);
+);
diff --git a/res/res_pjsip_rfc3326.c b/res/res_pjsip_rfc3326.c
index 3ed8de6592ccaf896d4de17b344fb66bc50bc736..6eb27ffe23533dae2d00709b0b8d69c4edbd6307 100644
--- a/res/res_pjsip_rfc3326.c
+++ b/res/res_pjsip_rfc3326.c
@@ -143,8 +143,8 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "PJSIP RFC3326 Support",
-		.support_level = AST_MODULE_SUPPORT_CORE,
-		.load = load_module,
-		.unload = unload_module,
-		.load_pri = AST_MODPRI_APP_DEPEND,
-	       );
+	.support_level = AST_MODULE_SUPPORT_CORE,
+	.load = load_module,
+	.unload = unload_module,
+	.load_pri = AST_MODPRI_APP_DEPEND,
+);
diff --git a/res/res_pjsip_sdp_rtp.c b/res/res_pjsip_sdp_rtp.c
index 55fbfd462b6a79e148d7856a800938a5ba0d65fd..3f48683511cea66919521f8ae066fba919afa3d4 100644
--- a/res/res_pjsip_sdp_rtp.c
+++ b/res/res_pjsip_sdp_rtp.c
@@ -1367,8 +1367,8 @@ end:
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "PJSIP SDP RTP/AVP stream handler",
-		.support_level = AST_MODULE_SUPPORT_CORE,
-		.load = load_module,
-		.unload = unload_module,
-		.load_pri = AST_MODPRI_CHANNEL_DRIVER,
-	);
+	.support_level = AST_MODULE_SUPPORT_CORE,
+	.load = load_module,
+	.unload = unload_module,
+	.load_pri = AST_MODPRI_CHANNEL_DRIVER,
+);
diff --git a/res/res_pjsip_send_to_voicemail.c b/res/res_pjsip_send_to_voicemail.c
index 3a57aea7a2dfeb08b98a12c4a6dcf79c1367592c..9d2b5b14b5e6307fa890c2ede005469a2b504a94 100644
--- a/res/res_pjsip_send_to_voicemail.c
+++ b/res/res_pjsip_send_to_voicemail.c
@@ -232,4 +232,4 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "PJSIP REFER Send to V
 	.load = load_module,
 	.unload = unload_module,
 	.load_pri = AST_MODPRI_APP_DEPEND,
-	);
+);
diff --git a/res/res_pjsip_session.c b/res/res_pjsip_session.c
index 87ce2b0c1b31b5d43b9107bf8b2614438865ce4b..98450109a8072be749d6a85dfeeaec7a7fded4d4 100644
--- a/res/res_pjsip_session.c
+++ b/res/res_pjsip_session.c
@@ -2657,8 +2657,8 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS | AST_MODFLAG_LOAD_ORDER, "PJSIP Session resource",
-		.support_level = AST_MODULE_SUPPORT_CORE,
-		.load = load_module,
-		.unload = unload_module,
-		.load_pri = AST_MODPRI_APP_DEPEND,
-	       );
+	.support_level = AST_MODULE_SUPPORT_CORE,
+	.load = load_module,
+	.unload = unload_module,
+	.load_pri = AST_MODPRI_APP_DEPEND,
+);
diff --git a/res/res_pjsip_sips_contact.c b/res/res_pjsip_sips_contact.c
index f8e554cf43cac4250c9d17375827e2a61def84a2..7579be6f3d7ce400155b0c8d5651d907bb1b8736 100644
--- a/res/res_pjsip_sips_contact.c
+++ b/res/res_pjsip_sips_contact.c
@@ -100,8 +100,8 @@ static int load_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "UAC SIPS Contact support",
-		.support_level = AST_MODULE_SUPPORT_CORE,
-		.load = load_module,
-		.unload = unload_module,
-		.load_pri = AST_MODPRI_APP_DEPEND,
-	       );
+	.support_level = AST_MODULE_SUPPORT_CORE,
+	.load = load_module,
+	.unload = unload_module,
+	.load_pri = AST_MODPRI_APP_DEPEND,
+);
diff --git a/res/res_pjsip_t38.c b/res/res_pjsip_t38.c
index 08e7cf93565aabadb985785c87b0af88ec850dc3..addfd58615aeccfc1cac1584305df9a781e06bc7 100644
--- a/res/res_pjsip_t38.c
+++ b/res/res_pjsip_t38.c
@@ -907,8 +907,8 @@ end:
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "PJSIP T.38 UDPTL Support",
-		.support_level = AST_MODULE_SUPPORT_CORE,
-		.load = load_module,
-		.unload = unload_module,
-		.load_pri = AST_MODPRI_CHANNEL_DRIVER,
-	);
+	.support_level = AST_MODULE_SUPPORT_CORE,
+	.load = load_module,
+	.unload = unload_module,
+	.load_pri = AST_MODPRI_CHANNEL_DRIVER,
+);
diff --git a/res/res_pjsip_transport_websocket.c b/res/res_pjsip_transport_websocket.c
index 94902d65bf3ed712e9640ec5b55209f1cef61214..70e5c2abf2bb6b0f1f8d5579a92b10acea2b632c 100644
--- a/res/res_pjsip_transport_websocket.c
+++ b/res/res_pjsip_transport_websocket.c
@@ -397,8 +397,8 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "PJSIP WebSocket Transport Support",
-		.support_level = AST_MODULE_SUPPORT_CORE,
-		.load = load_module,
-		.unload = unload_module,
-		.load_pri = AST_MODPRI_APP_DEPEND,
-	   );
+	.support_level = AST_MODULE_SUPPORT_CORE,
+	.load = load_module,
+	.unload = unload_module,
+	.load_pri = AST_MODPRI_APP_DEPEND,
+);
diff --git a/res/res_pjsip_xpidf_body_generator.c b/res/res_pjsip_xpidf_body_generator.c
index 43cb1e78bc3371c5e19335d74c4593306eb48cab..37676ff96657274a6cb2b8c534adadb8d8d3c5c6 100644
--- a/res/res_pjsip_xpidf_body_generator.c
+++ b/res/res_pjsip_xpidf_body_generator.c
@@ -174,8 +174,8 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "PJSIP Extension State PIDF Provider",
-		.support_level = AST_MODULE_SUPPORT_CORE,
-		.load = load_module,
-		.unload = unload_module,
-		.load_pri = AST_MODPRI_CHANNEL_DEPEND,
+	.support_level = AST_MODULE_SUPPORT_CORE,
+	.load = load_module,
+	.unload = unload_module,
+	.load_pri = AST_MODPRI_CHANNEL_DEPEND,
 );
diff --git a/res/res_pktccops.c b/res/res_pktccops.c
index 06282c57275bdc26b6b4da9717a0d385dc4f3272..fedd069dfab105fa834efa3d8027ebc04c7fc67c 100644
--- a/res/res_pktccops.c
+++ b/res/res_pktccops.c
@@ -1511,9 +1511,9 @@ static int reload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS, "PktcCOPS manager for MGCP",
-		.support_level = AST_MODULE_SUPPORT_EXTENDED,
-		.load = load_module,
-		.unload = unload_module,
-		.reload = reload_module,
-	       );
+	.support_level = AST_MODULE_SUPPORT_EXTENDED,
+	.load = load_module,
+	.unload = unload_module,
+	.reload = reload_module,
+);
 
diff --git a/res/res_resolver_unbound.c b/res/res_resolver_unbound.c
index 4e79359a76a4ad195e1ed213dea9f4d854516c37..436a8ee359a29c6df11e18a6b61d7f77b68bda98 100644
--- a/res/res_resolver_unbound.c
+++ b/res/res_resolver_unbound.c
@@ -1457,9 +1457,9 @@ static int load_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Unbound DNS Resolver Support",
-		.support_level = AST_MODULE_SUPPORT_CORE,
-		.load = load_module,
-		.unload = unload_module,
-		.reload = reload_module,
-		.load_pri = AST_MODPRI_CHANNEL_DEPEND - 4,
-	       );
+	.support_level = AST_MODULE_SUPPORT_CORE,
+	.load = load_module,
+	.unload = unload_module,
+	.reload = reload_module,
+	.load_pri = AST_MODPRI_CHANNEL_DEPEND - 4,
+);
diff --git a/res/res_rtp_asterisk.c b/res/res_rtp_asterisk.c
index de75626e2d37537f2b9c555704f77ebeec87cc4c..c5b7e5f004aa79dbbb746eeb326e926f93e26e28 100644
--- a/res/res_rtp_asterisk.c
+++ b/res/res_rtp_asterisk.c
@@ -5367,9 +5367,9 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Asterisk RTP Stack",
-		.support_level = AST_MODULE_SUPPORT_CORE,
-		.load = load_module,
-		.unload = unload_module,
-		.reload = reload_module,
-		.load_pri = AST_MODPRI_CHANNEL_DEPEND,
-		);
+	.support_level = AST_MODULE_SUPPORT_CORE,
+	.load = load_module,
+	.unload = unload_module,
+	.reload = reload_module,
+	.load_pri = AST_MODPRI_CHANNEL_DEPEND,
+);
diff --git a/res/res_smdi.c b/res/res_smdi.c
index 6d9a678aa9b38c66aff6334e52fdb1174c675eaf..770ac62d2d2b3f0a8ca02f58eb6e9f2b82dde303 100644
--- a/res/res_smdi.c
+++ b/res/res_smdi.c
@@ -1433,9 +1433,9 @@ static int reload(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS | AST_MODFLAG_LOAD_ORDER, "Simplified Message Desk Interface (SMDI) Resource",
-		.support_level = AST_MODULE_SUPPORT_CORE,
-		.load = load_module,
-		.unload = unload_module,
-		.reload = reload,
-		.load_pri = AST_MODPRI_CHANNEL_DEPEND,
-	       );
+	.support_level = AST_MODULE_SUPPORT_CORE,
+	.load = load_module,
+	.unload = unload_module,
+	.reload = reload,
+	.load_pri = AST_MODPRI_CHANNEL_DEPEND,
+);
diff --git a/res/res_snmp.c b/res/res_snmp.c
index 1a19d76993e9a79e37d87b865d9dc8d6e4b2a124..7eef9f85bec62f4d0f2017d622e67edc875af898 100644
--- a/res/res_snmp.c
+++ b/res/res_snmp.c
@@ -136,7 +136,7 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "SNMP [Sub]Agent for Asterisk",
-		.support_level = AST_MODULE_SUPPORT_EXTENDED,
-		.load = load_module,
-		.unload = unload_module,
-		);
+	.support_level = AST_MODULE_SUPPORT_EXTENDED,
+	.load = load_module,
+	.unload = unload_module,
+);
diff --git a/res/res_speech.c b/res/res_speech.c
index 39c7d5a9ae53efaca796d87457c752e57b2d8e76..1505ca428da2a40b108ef347bd413004a91646b2 100644
--- a/res/res_speech.c
+++ b/res/res_speech.c
@@ -362,8 +362,8 @@ static int load_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS | AST_MODFLAG_LOAD_ORDER, "Generic Speech Recognition API",
-		.support_level = AST_MODULE_SUPPORT_CORE,
-		.load = load_module,
-		.unload = unload_module,
-		.load_pri = AST_MODPRI_APP_DEPEND,
-		);
+	.support_level = AST_MODULE_SUPPORT_CORE,
+	.load = load_module,
+	.unload = unload_module,
+	.load_pri = AST_MODPRI_APP_DEPEND,
+);
diff --git a/res/res_stasis.c b/res/res_stasis.c
index 0fa51d8cdfc017a05d63493ca20bcdfefd5bff1a..631af1e2ef0619569ddab3d02358ebb1c628c05c 100644
--- a/res/res_stasis.c
+++ b/res/res_stasis.c
@@ -2061,4 +2061,4 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS, "Stasis applicatio
 	.support_level = AST_MODULE_SUPPORT_CORE,
 	.load = load_module,
 	.unload = unload_module,
-	);
+);
diff --git a/res/res_stasis_answer.c b/res/res_stasis_answer.c
index 8ced30b87a0a709a66fd8594e542ea9db34f5056..830de8015ccdae582a29e71bc6261f98336d53c4 100644
--- a/res/res_stasis_answer.c
+++ b/res/res_stasis_answer.c
@@ -75,4 +75,5 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS, "Stasis applicatio
 	.support_level = AST_MODULE_SUPPORT_CORE,
 	.load = load_module,
 	.unload = unload_module,
-	.nonoptreq = "res_stasis");
+	.nonoptreq = "res_stasis"
+);
diff --git a/res/res_stasis_device_state.c b/res/res_stasis_device_state.c
index cbebce8b2399daaa17e063cf153887f32d7c42a3..1d135fe55d306d6c40fdbceebe0e75654d55ec7b 100644
--- a/res/res_stasis_device_state.c
+++ b/res/res_stasis_device_state.c
@@ -414,4 +414,5 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS, "Stasis applicatio
 	.support_level = AST_MODULE_SUPPORT_CORE,
 	.load = load_module,
 	.unload = unload_module,
-	.nonoptreq = "res_stasis");
+	.nonoptreq = "res_stasis"
+);
diff --git a/res/res_stasis_mailbox.c b/res/res_stasis_mailbox.c
index 30765329d17a7b73c8f824d5084f702cd37da753..e34cb2058fafeed2830953c1fca2631a27c8aa11 100644
--- a/res/res_stasis_mailbox.c
+++ b/res/res_stasis_mailbox.c
@@ -163,4 +163,4 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS, "Stasis applicatio
 	.load = load_module,
 	.unload = unload_module,
 	.nonoptreq = "res_stasis,res_mwi_external"
-	);
+);
diff --git a/res/res_stasis_playback.c b/res/res_stasis_playback.c
index 7aac06d6658d4b619572ab9a4e54ca569d921b26..9abfe3d17c87bdc4f8ec4548a5a0da42f4ac7dc8 100644
--- a/res/res_stasis_playback.c
+++ b/res/res_stasis_playback.c
@@ -685,4 +685,5 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS, "Stasis applicatio
 	.support_level = AST_MODULE_SUPPORT_CORE,
 	.load = load_module,
 	.unload = unload_module,
-	.nonoptreq = "res_stasis,res_stasis_recording");
+	.nonoptreq = "res_stasis,res_stasis_recording"
+);
diff --git a/res/res_stasis_recording.c b/res/res_stasis_recording.c
index 3a10d41e055edb6ded5da8d980b3a3147f0a6060..02ad875a8f0be03e470ea3d5c83163f2dad8fe38 100644
--- a/res/res_stasis_recording.c
+++ b/res/res_stasis_recording.c
@@ -657,4 +657,5 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS | AST_MODFLAG_LOAD_
 	.load = load_module,
 	.unload = unload_module,
 	.nonoptreq = "res_stasis",
-	.load_pri = AST_MODPRI_APP_DEPEND);
+	.load_pri = AST_MODPRI_APP_DEPEND
+);
diff --git a/res/res_stasis_snoop.c b/res/res_stasis_snoop.c
index 68d76a420d2d0f64760745bf0ed9b47d1933dfa1..e5b5bf6046464ecf364e466e5963b552652318c2 100644
--- a/res/res_stasis_snoop.c
+++ b/res/res_stasis_snoop.c
@@ -427,4 +427,5 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS, "Stasis applicatio
 	.support_level = AST_MODULE_SUPPORT_CORE,
 	.load = load_module,
 	.unload = unload_module,
-	.nonoptreq = "res_stasis");
+	.nonoptreq = "res_stasis"
+);
diff --git a/res/res_stasis_test.c b/res/res_stasis_test.c
index 12b9cc5cee28e1efb8906aa381d86c55312e62e6..9164293f5b4704974c60093c96f125b0ec590aa4 100644
--- a/res/res_stasis_test.c
+++ b/res/res_stasis_test.c
@@ -284,4 +284,4 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS | AST_MODFLAG_LOAD_
 	.load = load_module,
 	.unload = unload_module,
 	.load_pri = AST_MODPRI_APP_DEPEND,
-	);
+);
diff --git a/res/res_statsd.c b/res/res_statsd.c
index 012333524a0862cdfa21dac79a424fdc928e311c..fefe395e8bdba0c2d8b318a8ac542aad406b2cb9 100644
--- a/res/res_statsd.c
+++ b/res/res_statsd.c
@@ -322,4 +322,4 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS | AST_MODFLAG_LOAD_
 	.unload = unload_module,
 	.reload = reload_module,
 	.load_pri = 0,
-	);
+);
diff --git a/res/res_stun_monitor.c b/res/res_stun_monitor.c
index 34558c755cb56b87771a0413ae01acc62475d562..e1bd85b4f08bed2b0b329516e320f42a39529f68 100644
--- a/res/res_stun_monitor.c
+++ b/res/res_stun_monitor.c
@@ -476,9 +476,9 @@ static int load_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS | AST_MODFLAG_LOAD_ORDER, "STUN Network Monitor",
-		.support_level = AST_MODULE_SUPPORT_CORE,
-		.load = load_module,
-		.unload = unload_module,
-		.reload = reload,
-		.load_pri = AST_MODPRI_CHANNEL_DEPEND
-	);
+	.support_level = AST_MODULE_SUPPORT_CORE,
+	.load = load_module,
+	.unload = unload_module,
+	.reload = reload,
+	.load_pri = AST_MODPRI_CHANNEL_DEPEND
+);
diff --git a/res/res_timing_dahdi.c b/res/res_timing_dahdi.c
index 4f96959c1fb4e7a06cdc852d1e06232bdf65e797..23fb8e35860575ae1a0169daa5c8fb6b4a0b7987 100644
--- a/res/res_timing_dahdi.c
+++ b/res/res_timing_dahdi.c
@@ -235,8 +235,8 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "DAHDI Timing Interface",
-		.support_level = AST_MODULE_SUPPORT_CORE,
-		.load = load_module,
-		.unload = unload_module,
-		.load_pri = AST_MODPRI_TIMING,
-		);
+	.support_level = AST_MODULE_SUPPORT_CORE,
+	.load = load_module,
+	.unload = unload_module,
+	.load_pri = AST_MODPRI_TIMING,
+);
diff --git a/res/res_timing_kqueue.c b/res/res_timing_kqueue.c
index 17f98360ee309a2441116d1a15af9d4e4e90f724..dd2a8397c8032d5f52c387359fd4a1b991233b2e 100644
--- a/res/res_timing_kqueue.c
+++ b/res/res_timing_kqueue.c
@@ -499,8 +499,8 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "KQueue Timing Interface",
-		.support_level = AST_MODULE_SUPPORT_EXTENDED,
-		.load = load_module,
-		.unload = unload_module,
-		.load_pri = AST_MODPRI_CHANNEL_DEPEND,
-		);
+	.support_level = AST_MODULE_SUPPORT_EXTENDED,
+	.load = load_module,
+	.unload = unload_module,
+	.load_pri = AST_MODPRI_CHANNEL_DEPEND,
+);
diff --git a/res/res_timing_pthread.c b/res/res_timing_pthread.c
index dc7d0918b5b005706f59cee64cd80873cb60e439..6476e74fb0c22ddcd0f51ed58dc7dfbf1fffacbc 100644
--- a/res/res_timing_pthread.c
+++ b/res/res_timing_pthread.c
@@ -477,8 +477,8 @@ static int unload_module(void)
 	return res;
 }
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "pthread Timing Interface",
-		.support_level = AST_MODULE_SUPPORT_EXTENDED,
-		.load = load_module,
-		.unload = unload_module,
-		.load_pri = AST_MODPRI_TIMING,
-		);
+	.support_level = AST_MODULE_SUPPORT_EXTENDED,
+	.load = load_module,
+	.unload = unload_module,
+	.load_pri = AST_MODPRI_TIMING,
+);
diff --git a/res/res_timing_timerfd.c b/res/res_timing_timerfd.c
index 6d5400bc3c50389014805ec5185865a5097ce352..5ee21fcc0402475dda2939b3d774674aa50a7629 100644
--- a/res/res_timing_timerfd.c
+++ b/res/res_timing_timerfd.c
@@ -272,8 +272,8 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Timerfd Timing Interface",
-		.support_level = AST_MODULE_SUPPORT_CORE,
-		.load = load_module,
-		.unload = unload_module,
-		.load_pri = AST_MODPRI_TIMING,
-		);
+	.support_level = AST_MODULE_SUPPORT_CORE,
+	.load = load_module,
+	.unload = unload_module,
+	.load_pri = AST_MODPRI_TIMING,
+);
diff --git a/res/res_xmpp.c b/res/res_xmpp.c
index 59b59e69dbedfda4a94719adf1456c49c29025db..5a3670e7d63a1952b5cf396c94a1887ecdedd41f 100644
--- a/res/res_xmpp.c
+++ b/res/res_xmpp.c
@@ -4661,9 +4661,9 @@ static int reload(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS | AST_MODFLAG_LOAD_ORDER, "Asterisk XMPP Interface",
-		.support_level = AST_MODULE_SUPPORT_CORE,
-		.load = load_module,
-		.unload = unload_module,
-		.reload = reload,
-		.load_pri = AST_MODPRI_CHANNEL_DEPEND,
-	       );
+	.support_level = AST_MODULE_SUPPORT_CORE,
+	.load = load_module,
+	.unload = unload_module,
+	.reload = reload,
+	.load_pri = AST_MODPRI_CHANNEL_DEPEND,
+);
diff --git a/rest-api-templates/res_ari_resource.c.mustache b/rest-api-templates/res_ari_resource.c.mustache
index d9ca39d6a7e3ebafe8c48c2eda648e9c9458cfeb..7d138b7af25b2e48f71e065db26cd77fd4d8897f 100644
--- a/rest-api-templates/res_ari_resource.c.mustache
+++ b/rest-api-templates/res_ari_resource.c.mustache
@@ -247,5 +247,5 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "RESTful API module - {{{
 	.load = load_module,
 	.unload = unload_module,
 	.nonoptreq = "res_ari,res_stasis",
-	);
+);
 {{/api_declaration}}
diff --git a/tests/test_ari.c b/tests/test_ari.c
index 7da98f2cf04dddb4b57f54738c9b3c5524a045bd..55f44321a32dba6a72c146eaa55d8a793b804431 100644
--- a/tests/test_ari.c
+++ b/tests/test_ari.c
@@ -567,4 +567,4 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "ARI testing",
 	.load = load_module,
 	.unload = unload_module,
 	.nonoptreq = "res_ari",
-	);
+);
diff --git a/tests/test_endpoints.c b/tests/test_endpoints.c
index b7a2efd57b7be4218545888453d8fb1c20ed2b61..d90cd3a05cbf94401ec2df771610c5b6c0c4c177 100644
--- a/tests/test_endpoints.c
+++ b/tests/test_endpoints.c
@@ -154,4 +154,4 @@ static int load_module(void)
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Endpoint testing",
 	.load = load_module,
 	.unload = unload_module,
-	);
+);
diff --git a/tests/test_json.c b/tests/test_json.c
index b8489947506a46fbe354b6ffb004194246441818..7080face27f7ad9be0787649f4acf255f4df6c78 100644
--- a/tests/test_json.c
+++ b/tests/test_json.c
@@ -1806,5 +1806,6 @@ static int load_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, 0, "JSON testing",
-		.load = load_module,
-		.unload = unload_module);
+	.load = load_module,
+	.unload = unload_module
+);
diff --git a/tests/test_optional_api.c b/tests/test_optional_api.c
index 3867a557965f9aa5041ec59ceb2b5dd94e484c31..a89b46159b64c4468b5e2c33d210204db91f7901 100644
--- a/tests/test_optional_api.c
+++ b/tests/test_optional_api.c
@@ -184,4 +184,4 @@ static int load_module(void)
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "ARI testing",
 	.load = load_module,
 	.unload = unload_module,
-	);
+);
diff --git a/tests/test_res_stasis.c b/tests/test_res_stasis.c
index 45e8f5ddd2b9097366d8322d6b66c0e9d16a4187..7edc985e87bee9ed7cdc9133c4a6b7ce59fe060e 100644
--- a/tests/test_res_stasis.c
+++ b/tests/test_res_stasis.c
@@ -195,4 +195,4 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Stasis Core testing",
 	.load = load_module,
 	.unload = unload_module,
 	.nonoptreq = "res_stasis",
-	);
+);
diff --git a/tests/test_stasis.c b/tests/test_stasis.c
index f5d74a806e338c5c2756150c78187c39f5f15bf9..7061b97b6c41d90c8fc8dddd44119b02700a8d6c 100644
--- a/tests/test_stasis.c
+++ b/tests/test_stasis.c
@@ -2104,6 +2104,6 @@ static int load_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, 0, "Stasis testing",
-		.load = load_module,
-		.unload = unload_module
-	);
+	.load = load_module,
+	.unload = unload_module
+);
diff --git a/tests/test_stasis_channels.c b/tests/test_stasis_channels.c
index 91dfe09c6f3b74726421b860e94a27a3b1e651a2..f9bbb96211e338344300faae1841edd1a49882c5 100644
--- a/tests/test_stasis_channels.c
+++ b/tests/test_stasis_channels.c
@@ -328,6 +328,6 @@ static int load_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, 0, "Stasis Channel Testing",
-		.load = load_module,
-		.unload = unload_module
-	);
+	.load = load_module,
+	.unload = unload_module
+);
diff --git a/tests/test_stasis_endpoints.c b/tests/test_stasis_endpoints.c
index 2059c60b1cbaf425ead81a3ee3dd4dd294c14af2..8e3907ffeadc9b6d2c5326da3deda2360004353c 100644
--- a/tests/test_stasis_endpoints.c
+++ b/tests/test_stasis_endpoints.c
@@ -307,4 +307,4 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Endpoint stasis-related
 	.load = load_module,
 	.unload = unload_module,
 	.nonoptreq = "res_stasis_test",
-	);
+);