diff --git a/apps/app_dahdibarge.c b/apps/app_dahdibarge.c
index bbe2f5a5dd..d5e0329b93 100644
--- a/apps/app_dahdibarge.c
+++ b/apps/app_dahdibarge.c
@@ -33,7 +33,6 @@
/*** MODULEINFO
dahdi
- no
deprecated
app_chanspy
***/
diff --git a/apps/app_macro.c b/apps/app_macro.c
index 01e3de14f1..1615a660cc 100644
--- a/apps/app_macro.c
+++ b/apps/app_macro.c
@@ -26,10 +26,9 @@
*/
/*** MODULEINFO
- no
deprecated
app_stack (GoSub)
- */
+ ***/
#include "asterisk.h"
diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index e862831ccf..1d68e2617c 100644
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -31,7 +31,6 @@
/*** MODULEINFO
dahdi
- no
deprecated
app_confbridge
***/
diff --git a/apps/app_readfile.c b/apps/app_readfile.c
index d031406c20..3c7629e722 100644
--- a/apps/app_readfile.c
+++ b/apps/app_readfile.c
@@ -26,7 +26,6 @@
*/
/*** MODULEINFO
- no
deprecated
func_env (FILE())
***/
diff --git a/apps/app_setcallerid.c b/apps/app_setcallerid.c
index cfcd2b47de..f6b9036756 100644
--- a/apps/app_setcallerid.c
+++ b/apps/app_setcallerid.c
@@ -26,7 +26,6 @@
*/
/*** MODULEINFO
- no
deprecated
func_callerid
***/
diff --git a/cdr/cdr_sqlite.c b/cdr/cdr_sqlite.c
index 47d1a5192b..28c8577123 100644
--- a/cdr/cdr_sqlite.c
+++ b/cdr/cdr_sqlite.c
@@ -36,7 +36,6 @@
/*** MODULEINFO
sqlite
- no
deprecated
sqlite3_custom
***/
diff --git a/channels/chan_h323.c b/channels/chan_h323.c
index b099becf09..0d2a9ee86b 100644
--- a/channels/chan_h323.c
+++ b/channels/chan_h323.c
@@ -36,7 +36,7 @@
/*** MODULEINFO
openh323
- no
+ yes
deprecated
chan_ooh323
***/
diff --git a/channels/chan_jingle.c b/channels/chan_jingle.c
index 5933753af2..e481f8f2d2 100644
--- a/channels/chan_jingle.c
+++ b/channels/chan_jingle.c
@@ -31,7 +31,6 @@
iksemel
res_jabber
- no
extended
***/
diff --git a/channels/chan_vpb.cc b/channels/chan_vpb.cc
index a7ca85b7f4..5f4760341a 100644
--- a/channels/chan_vpb.cc
+++ b/channels/chan_vpb.cc
@@ -31,7 +31,6 @@
/*** MODULEINFO
vpb
- no
extended
***/