diff --git a/addons/app_mysql.c b/addons/app_mysql.c
index 1a79afebdb..6e35a7c5fa 100644
--- a/addons/app_mysql.c
+++ b/addons/app_mysql.c
@@ -37,6 +37,8 @@
no
deprecated
func_odbc
+ 1.8
+ 19
***/
#include "asterisk.h"
diff --git a/addons/cdr_mysql.c b/addons/cdr_mysql.c
index c05b86a25f..25f8762c61 100644
--- a/addons/cdr_mysql.c
+++ b/addons/cdr_mysql.c
@@ -38,6 +38,8 @@
no
deprecated
cdr_adaptive_odbc
+ 1.8
+ 19
***/
#include "asterisk.h"
diff --git a/apps/app_dahdiras.c b/apps/app_dahdiras.c
index b5b1ae91c4..d2ec137b4f 100644
--- a/apps/app_dahdiras.c
+++ b/apps/app_dahdiras.c
@@ -28,6 +28,8 @@
/*** MODULEINFO
dahdi
deprecated
+ 16
+ 19
***/
#include "asterisk.h"
diff --git a/apps/app_fax.c b/apps/app_fax.c
index 2404773d0d..442df6666b 100644
--- a/apps/app_fax.c
+++ b/apps/app_fax.c
@@ -18,6 +18,8 @@
no
deprecated
res_fax
+ 16
+ 19
***/
/* Needed for spandsp headers */
diff --git a/apps/app_ices.c b/apps/app_ices.c
index 29127fc303..38c68c0cae 100644
--- a/apps/app_ices.c
+++ b/apps/app_ices.c
@@ -29,6 +29,8 @@
/*** MODULEINFO
deprecated
+ 16
+ 19
***/
#include "asterisk.h"
diff --git a/apps/app_image.c b/apps/app_image.c
index 5d70c8cd30..53754eda64 100644
--- a/apps/app_image.c
+++ b/apps/app_image.c
@@ -27,6 +27,8 @@
/*** MODULEINFO
deprecated
+ 16
+ 19
***/
#include "asterisk.h"
diff --git a/apps/app_macro.c b/apps/app_macro.c
index 36632dc4c7..3f7632a86d 100644
--- a/apps/app_macro.c
+++ b/apps/app_macro.c
@@ -29,6 +29,8 @@
no
deprecated
app_stack (GoSub)
+ 16
+ 21
***/
#include "asterisk.h"
diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index cf56c9d308..9b2024db4c 100644
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -43,6 +43,8 @@
no
extended
app_confbridge
+ 19
+ 21
***/
#include "asterisk.h"
diff --git a/apps/app_nbscat.c b/apps/app_nbscat.c
index a7fccaf0d9..c714cbb64b 100644
--- a/apps/app_nbscat.c
+++ b/apps/app_nbscat.c
@@ -27,6 +27,8 @@
/*** MODULEINFO
deprecated
+ 16
+ 19
***/
#include "asterisk.h"
diff --git a/apps/app_osplookup.c b/apps/app_osplookup.c
index 4e6e5df2b4..28d492255f 100644
--- a/apps/app_osplookup.c
+++ b/apps/app_osplookup.c
@@ -32,6 +32,8 @@
osptk
openssl
extended
+ 19
+ 21
***/
#include "asterisk.h"
diff --git a/apps/app_url.c b/apps/app_url.c
index aced49e839..08e1ec54c6 100644
--- a/apps/app_url.c
+++ b/apps/app_url.c
@@ -27,6 +27,8 @@
/*** MODULEINFO
deprecated
+ 16
+ 19
***/
#include "asterisk.h"
diff --git a/cdr/cdr_syslog.c b/cdr/cdr_syslog.c
index 932d98f5f4..84e19b9622 100644
--- a/cdr/cdr_syslog.c
+++ b/cdr/cdr_syslog.c
@@ -40,6 +40,8 @@
syslog
no
deprecated
+ 16
+ 19
***/
#include "asterisk.h"
diff --git a/channels/chan_alsa.c b/channels/chan_alsa.c
index a5dead1a2e..3bfa5c924d 100644
--- a/channels/chan_alsa.c
+++ b/channels/chan_alsa.c
@@ -35,6 +35,8 @@
/*** MODULEINFO
alsa
extended
+ 19
+ 21
***/
#include "asterisk.h"
diff --git a/channels/chan_mgcp.c b/channels/chan_mgcp.c
index fa3a081469..8669d2f416 100644
--- a/channels/chan_mgcp.c
+++ b/channels/chan_mgcp.c
@@ -36,6 +36,8 @@
/*** MODULEINFO
extended
+ 19
+ 21
***/
#include "asterisk.h"
diff --git a/channels/chan_misdn.c b/channels/chan_misdn.c
index d17c4ad32e..546bb2be94 100644
--- a/channels/chan_misdn.c
+++ b/channels/chan_misdn.c
@@ -78,6 +78,8 @@
suppserv
deprecated
chan_dahdi
+ 16
+ 19
***/
#include "asterisk.h"
diff --git a/channels/chan_nbs.c b/channels/chan_nbs.c
index 9a9e2669f8..c7c842ae34 100644
--- a/channels/chan_nbs.c
+++ b/channels/chan_nbs.c
@@ -28,6 +28,8 @@
/*** MODULEINFO
nbs
deprecated
+ 16
+ 19
***/
#include "asterisk.h"
diff --git a/channels/chan_oss.c b/channels/chan_oss.c
index 7dde84fe66..69dd71f1ee 100644
--- a/channels/chan_oss.c
+++ b/channels/chan_oss.c
@@ -41,6 +41,8 @@
/*** MODULEINFO
oss
deprecated
+ 16
+ 19
***/
#include "asterisk.h"
diff --git a/channels/chan_phone.c b/channels/chan_phone.c
index 9c7703751a..66c911b301 100644
--- a/channels/chan_phone.c
+++ b/channels/chan_phone.c
@@ -36,6 +36,8 @@
/*** MODULEINFO
ixjuser
deprecated
+ 16
+ 19
***/
#include "asterisk.h"
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 94eeeacaca..4501253bbb 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -177,6 +177,8 @@
extended
+ 17
+ 21
***/
/*! \page sip_session_timers SIP Session Timers in Asterisk Chan_sip
diff --git a/channels/chan_skinny.c b/channels/chan_skinny.c
index fb31c9ffd0..7ee65c95d1 100644
--- a/channels/chan_skinny.c
+++ b/channels/chan_skinny.c
@@ -35,6 +35,8 @@
/*** MODULEINFO
extended
+ 19
+ 21
***/
#include "asterisk.h"
diff --git a/channels/chan_vpb.cc b/channels/chan_vpb.cc
index fe99d5df0b..d11c6e25b0 100644
--- a/channels/chan_vpb.cc
+++ b/channels/chan_vpb.cc
@@ -51,6 +51,8 @@
vpb
no
deprecated
+ 16
+ 19
***/
#include
diff --git a/res/res_config_sqlite.c b/res/res_config_sqlite.c
index 323d2249b2..232600018c 100644
--- a/res/res_config_sqlite.c
+++ b/res/res_config_sqlite.c
@@ -83,6 +83,8 @@
/*** MODULEINFO
sqlite
deprecated
+ 16
+ 19
***/
#include "asterisk.h"
diff --git a/res/res_monitor.c b/res/res_monitor.c
index efedab7c37..235dc2d587 100644
--- a/res/res_monitor.c
+++ b/res/res_monitor.c
@@ -27,6 +27,8 @@
deprecated
app_mixmonitor
+ 16
+ 21
***/
#include "asterisk.h"
diff --git a/res/res_pktccops.c b/res/res_pktccops.c
index 9beabfb3d5..a9deadbd6d 100644
--- a/res/res_pktccops.c
+++ b/res/res_pktccops.c
@@ -33,6 +33,8 @@
/*** MODULEINFO
no
extended
+ 19
+ 21
***/
#include "asterisk.h"
diff --git a/utils/conf2ael.c b/utils/conf2ael.c
index 0a327ececd..f668c3f3c8 100644
--- a/utils/conf2ael.c
+++ b/utils/conf2ael.c
@@ -25,6 +25,8 @@
/*** MODULEINFO
res_ael_share
deprecated
+ 16
+ 19
***/
#define ASTMM_LIBC ASTMM_IGNORE
diff --git a/utils/muted.c b/utils/muted.c
index 87a678f311..5376ba7d44 100644
--- a/utils/muted.c
+++ b/utils/muted.c
@@ -46,6 +46,8 @@
/*** MODULEINFO
deprecated
+ 16
+ 19
***/
#include "asterisk/autoconfig.h"