diff --git a/channels/chan_misdn.c b/channels/chan_misdn.c
index 0c74ef4da1..7bcda32c42 100644
--- a/channels/chan_misdn.c
+++ b/channels/chan_misdn.c
@@ -55,6 +55,7 @@
 	<depend>suppserv</depend>
 	<support_level>extended</support_level>
  ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/channels/console_board.c b/channels/console_board.c
index e80247c5fb..6c920a944c 100644
--- a/channels/console_board.c
+++ b/channels/console_board.c
@@ -37,6 +37,10 @@
  * configuration file).
  */
 
+/*** MODULEINFO
+	<support_level>extended</support_level>
+ ***/
+
 #include "asterisk.h"	/* ast_strdupa */
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/utils.h"	/* ast_strdupa */
diff --git a/channels/console_gui.c b/channels/console_gui.c
index f49152a732..916c408013 100644
--- a/channels/console_gui.c
+++ b/channels/console_gui.c
@@ -78,6 +78,10 @@ new regions inside the keypad pictureas comments
  *
  */
 
+/*** MODULEINFO
+	<support_level>extended</support_level>
+ ***/
+
 #include "asterisk.h"
 #include "console_video.h"
 #include "asterisk/lock.h"
diff --git a/channels/console_video.c b/channels/console_video.c
index ba12f83c99..e78b8c3a30 100644
--- a/channels/console_video.c
+++ b/channels/console_video.c
@@ -36,6 +36,10 @@
 //#define DROP_PACKETS 5       /* if set, drop this % of video packets */
 //#define OLD_FFMPEG	1	/* set for old ffmpeg with no swscale */
 
+/*** MODULEINFO
+	<support_level>extended</support_level>
+ ***/
+
 #include "asterisk.h"
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <sys/ioctl.h>
diff --git a/channels/iax2-parser.c b/channels/iax2-parser.c
index e217d87c0f..e8e25b512a 100644
--- a/channels/iax2-parser.c
+++ b/channels/iax2-parser.c
@@ -23,6 +23,10 @@
  * \author Mark Spencer <markster@digium.com> 
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/channels/iax2-provision.c b/channels/iax2-provision.c
index 2a75c2273a..a18d63a24b 100644
--- a/channels/iax2-provision.c
+++ b/channels/iax2-provision.c
@@ -23,6 +23,10 @@
  * \author Mark Spencer <markster@digium.com>
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/channels/misdn/ie.c b/channels/misdn/ie.c
index e88c58f5af..74ae897de7 100644
--- a/channels/misdn/ie.c
+++ b/channels/misdn/ie.c
@@ -24,6 +24,10 @@
   if qi is not NULL (TE-mode), offset is set
 */
 
+/*** MODULEINFO
+	<support_level>extended</support_level>
+ ***/
+
 #include "asterisk.h"
 
 #include <string.h>
diff --git a/channels/misdn/isdn_lib.c b/channels/misdn/isdn_lib.c
index b8aec01383..b599718e25 100644
--- a/channels/misdn/isdn_lib.c
+++ b/channels/misdn/isdn_lib.c
@@ -16,7 +16,9 @@
  * \author Christian Richter <crich@beronet.com>
  */
 
-
+/*** MODULEINFO
+	<support_level>extended</support_level>
+ ***/
 
 #include <syslog.h>
 #include <sys/time.h>
diff --git a/channels/misdn/isdn_msg_parser.c b/channels/misdn/isdn_msg_parser.c
index 73e5e8dc3e..1febfa0c19 100644
--- a/channels/misdn/isdn_msg_parser.c
+++ b/channels/misdn/isdn_msg_parser.c
@@ -16,7 +16,9 @@
  * \author Christian Richter <crich@beronet.com>
  */
 
-
+/*** MODULEINFO
+	<support_level>extended</support_level>
+ ***/
 
 #include "isdn_lib_intern.h"
 
diff --git a/channels/misdn/portinfo.c b/channels/misdn/portinfo.c
index 9e9cce86be..f6af3982a4 100644
--- a/channels/misdn/portinfo.c
+++ b/channels/misdn/portinfo.c
@@ -3,6 +3,9 @@
  * \author Christian Richter <crich@beronet.com>
  */
 
+/*** MODULEINFO
+	<support_level>extended</support_level>
+ ***/
 
 #include "isdn_lib.h"
 #include "isdn_lib_intern.h"
diff --git a/channels/misdn_config.c b/channels/misdn_config.c
index 23c2c6d80e..30e96eca4b 100644
--- a/channels/misdn_config.c
+++ b/channels/misdn_config.c
@@ -26,6 +26,10 @@
  * \ingroup channel_drivers
  */
 
+/*** MODULEINFO
+	<support_level>extended</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/channels/sig_analog.c b/channels/sig_analog.c
index 6085cb524c..0a336b313d 100644
--- a/channels/sig_analog.c
+++ b/channels/sig_analog.c
@@ -23,6 +23,10 @@
  * \author Matthew Fredrickson <creslin@digium.com>
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 #include <errno.h>
diff --git a/channels/sig_pri.c b/channels/sig_pri.c
index 8f36a48376..22ddde042d 100644
--- a/channels/sig_pri.c
+++ b/channels/sig_pri.c
@@ -23,6 +23,9 @@
  * \author Matthew Fredrickson <creslin@digium.com>
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
 
 #include "asterisk.h"
 
diff --git a/channels/sig_ss7.c b/channels/sig_ss7.c
index e442007539..235bcf3467 100644
--- a/channels/sig_ss7.c
+++ b/channels/sig_ss7.c
@@ -27,6 +27,9 @@
  * \arg \ref AstCREDITS
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
 
 #include "asterisk.h"
 
diff --git a/channels/sip/config_parser.c b/channels/sip/config_parser.c
index 0093a23795..a5318a4b7a 100644
--- a/channels/sip/config_parser.c
+++ b/channels/sip/config_parser.c
@@ -19,6 +19,10 @@
  * \brief sip config parsing functions and unit tests
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/channels/sip/dialplan_functions.c b/channels/sip/dialplan_functions.c
index 7138de4bf4..d98fe7d661 100644
--- a/channels/sip/dialplan_functions.c
+++ b/channels/sip/dialplan_functions.c
@@ -19,6 +19,10 @@
  * \brief sip channel dialplan functions and unit tests
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/channels/sip/reqresp_parser.c b/channels/sip/reqresp_parser.c
index 6cd3d6a9e3..0e6d14887d 100644
--- a/channels/sip/reqresp_parser.c
+++ b/channels/sip/reqresp_parser.c
@@ -19,6 +19,10 @@
  * \brief sip request parsing functions and unit tests
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/channels/sip/sdp_crypto.c b/channels/sip/sdp_crypto.c
index fa0419e01f..3a95ce9a6c 100644
--- a/channels/sip/sdp_crypto.c
+++ b/channels/sip/sdp_crypto.c
@@ -25,6 +25,10 @@
  * \author Mikael Magnusson <mikma@users.sourceforge.net>
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/channels/sip/srtp.c b/channels/sip/srtp.c
index 3b55106ab2..049bffc587 100644
--- a/channels/sip/srtp.c
+++ b/channels/sip/srtp.c
@@ -25,6 +25,10 @@
  * \author Mikael Magnusson <mikma@users.sourceforge.net>
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/channels/vcodecs.c b/channels/vcodecs.c
index c667fdb134..b5dbf14e4b 100644
--- a/channels/vcodecs.c
+++ b/channels/vcodecs.c
@@ -19,6 +19,10 @@
  * $Revision$
  */
 
+/*** MODULEINFO
+	<support_level>extended</support_level>
+ ***/
+
 #include "asterisk.h"
 #include "console_video.h"
 #include "asterisk/frame.h"
diff --git a/channels/vgrabbers.c b/channels/vgrabbers.c
index 4afc12f61f..45dced4e1f 100644
--- a/channels/vgrabbers.c
+++ b/channels/vgrabbers.c
@@ -44,6 +44,10 @@
  *                        `->--[enc_out]
  */
 
+/*** MODULEINFO
+	<support_level>extended</support_level>
+ ***/
+
 #include "asterisk.h"
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <sys/ioctl.h>
diff --git a/main/abstract_jb.c b/main/abstract_jb.c
index fa45b880c5..1359031101 100644
--- a/main/abstract_jb.c
+++ b/main/abstract_jb.c
@@ -29,6 +29,10 @@
  *
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/main/acl.c b/main/acl.c
index 010f2ddb31..bcb9770adb 100644
--- a/main/acl.c
+++ b/main/acl.c
@@ -23,6 +23,10 @@
  * \author Mark Spencer <markster@digium.com>
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/main/alaw.c b/main/alaw.c
index 2a6c85c473..c5069f358e 100644
--- a/main/alaw.c
+++ b/main/alaw.c
@@ -23,6 +23,10 @@
  * \author Mark Spencer <markster@digium.com>
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/main/aoc.c b/main/aoc.c
index 733d322db3..817bb9225f 100644
--- a/main/aoc.c
+++ b/main/aoc.c
@@ -23,6 +23,10 @@
  * \author David Vossel <dvossel@digium.com>
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$");
 
diff --git a/main/app.c b/main/app.c
index 786fdc6e5e..e2881cfb51 100644
--- a/main/app.c
+++ b/main/app.c
@@ -23,6 +23,10 @@
  * \author Mark Spencer <markster@digium.com>
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/main/asterisk.c b/main/asterisk.c
index c0a9aab44a..d7c5e005a3 100644
--- a/main/asterisk.c
+++ b/main/asterisk.c
@@ -59,6 +59,10 @@
   
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/main/astfd.c b/main/astfd.c
index 8aead62fd2..79094840d6 100644
--- a/main/astfd.c
+++ b/main/astfd.c
@@ -23,6 +23,10 @@
  * \author Tilghman Lesher <tlesher@digium.com>
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 #ifdef DEBUG_FD_LEAKS
diff --git a/main/astmm.c b/main/astmm.c
index 2c9b464b5c..ae42335869 100644
--- a/main/astmm.c
+++ b/main/astmm.c
@@ -23,6 +23,10 @@
  * \author Mark Spencer <markster@digium.com>
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 #ifdef __AST_DEBUG_MALLOC
diff --git a/main/astobj2.c b/main/astobj2.c
index 1f936b5bbd..a63c2dc6cd 100644
--- a/main/astobj2.c
+++ b/main/astobj2.c
@@ -17,6 +17,11 @@
 /*
  * Function implementing astobj2 objects.
  */
+
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/main/audiohook.c b/main/audiohook.c
index ef717aaf20..ab6ce73740 100644
--- a/main/audiohook.c
+++ b/main/audiohook.c
@@ -23,6 +23,10 @@
  * \author Joshua Colp <jcolp@digium.com>
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/main/autochan.c b/main/autochan.c
index 4ad65a3713..d2ff9d035f 100644
--- a/main/autochan.c
+++ b/main/autochan.c
@@ -23,6 +23,10 @@
  * \author Mark Michelson <mmichelson@digium.com>
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/main/autoservice.c b/main/autoservice.c
index 35a66205a1..4293e0b455 100644
--- a/main/autoservice.c
+++ b/main/autoservice.c
@@ -25,6 +25,10 @@
  * \author Russell Bryant <russell@digium.com>
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/main/bridging.c b/main/bridging.c
index bce145ebcf..892ab05d5b 100644
--- a/main/bridging.c
+++ b/main/bridging.c
@@ -23,6 +23,10 @@
  * \author Joshua Colp <jcolp@digium.com>
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/main/callerid.c b/main/callerid.c
index 3af85b467b..525c853152 100644
--- a/main/callerid.c
+++ b/main/callerid.c
@@ -23,6 +23,10 @@
  * \author Mark Spencer <markster@digium.com> 
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/main/ccss.c b/main/ccss.c
index d20c8361cd..444bad4b7a 100644
--- a/main/ccss.c
+++ b/main/ccss.c
@@ -21,6 +21,10 @@
  * \author Mark Michelson <mmichelson@digium.com>
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/main/cdr.c b/main/cdr.c
index ef7b4222af..f6b89d7365 100644
--- a/main/cdr.c
+++ b/main/cdr.c
@@ -31,6 +31,10 @@
  */
 
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/main/cel.c b/main/cel.c
index ce9a15f97d..fa69b02513 100644
--- a/main/cel.c
+++ b/main/cel.c
@@ -27,6 +27,10 @@
  *       as expected.
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/main/channel.c b/main/channel.c
index cbabce5a90..4276d530d1 100644
--- a/main/channel.c
+++ b/main/channel.c
@@ -23,6 +23,10 @@
  * \author Mark Spencer <markster@digium.com>
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/main/chanvars.c b/main/chanvars.c
index 670858937a..b961ffd145 100644
--- a/main/chanvars.c
+++ b/main/chanvars.c
@@ -23,6 +23,10 @@
  * \author Mark Spencer <markster@digium.com> 
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/main/cli.c b/main/cli.c
index 709e71e519..066bf5c557 100644
--- a/main/cli.c
+++ b/main/cli.c
@@ -23,6 +23,10 @@
  * \author Mark Spencer <markster@digium.com> 
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/main/config.c b/main/config.c
index 7a8137457c..4c87142608 100644
--- a/main/config.c
+++ b/main/config.c
@@ -26,6 +26,10 @@
  * See http://wiki.asterisk.org
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/main/data.c b/main/data.c
index 9e1a97384b..9f7ef9a9da 100644
--- a/main/data.c
+++ b/main/data.c
@@ -22,6 +22,10 @@
  * \author Eliel C. Sardanons (LU1ALY) <eliels@gmail.com>
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/main/datastore.c b/main/datastore.c
index ee471551d1..d086d673ad 100644
--- a/main/datastore.c
+++ b/main/datastore.c
@@ -19,6 +19,10 @@
  * \brief Asterisk datastore objects
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/main/db.c b/main/db.c
index abf72ae4ca..cf455b69c6 100644
--- a/main/db.c
+++ b/main/db.c
@@ -27,6 +27,10 @@
  * licensing even further) we elect to use DB1 which is BSD licensed 
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/main/devicestate.c b/main/devicestate.c
index 2e801df88e..84eedc81c5 100644
--- a/main/devicestate.c
+++ b/main/devicestate.c
@@ -113,6 +113,10 @@
  *	
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/main/dial.c b/main/dial.c
index ab1ebf748e..c3b2fa77ec 100644
--- a/main/dial.c
+++ b/main/dial.c
@@ -23,6 +23,10 @@
  * \author Joshua Colp <jcolp@digium.com>
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/main/dns.c b/main/dns.c
index 159a7a7ab7..5f1c0b8bb9 100644
--- a/main/dns.c
+++ b/main/dns.c
@@ -29,6 +29,10 @@
  *
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/main/dnsmgr.c b/main/dnsmgr.c
index ea163b9a17..2c13dd0986 100644
--- a/main/dnsmgr.c
+++ b/main/dnsmgr.c
@@ -28,6 +28,10 @@
  * thread is in the middle of updating it to the new address.
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/main/dsp.c b/main/dsp.c
index cf3a5a8eb7..c930024dcd 100644
--- a/main/dsp.c
+++ b/main/dsp.c
@@ -40,6 +40,10 @@
 	detriment.
 */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/main/enum.c b/main/enum.c
index d590666519..065f4b947c 100644
--- a/main/enum.c
+++ b/main/enum.c
@@ -45,6 +45,10 @@
  * \todo The service type selection needs to be redone.
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/main/event.c b/main/event.c
index fb5021b0b4..7714ad107c 100644
--- a/main/event.c
+++ b/main/event.c
@@ -23,6 +23,10 @@
  * \author Russell Bryant <russell@digium.com>
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/main/file.c b/main/file.c
index 18ef8ca944..e978fab95c 100644
--- a/main/file.c
+++ b/main/file.c
@@ -23,6 +23,10 @@
  * \author Mark Spencer <markster@digium.com> 
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/main/fixedjitterbuf.c b/main/fixedjitterbuf.c
index 93c4cd205b..4d1032356c 100644
--- a/main/fixedjitterbuf.c
+++ b/main/fixedjitterbuf.c
@@ -25,6 +25,10 @@
  * \author Slav Klenov <slav@securax.org>
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/main/frame.c b/main/frame.c
index bf83511954..8cc81a8471 100644
--- a/main/frame.c
+++ b/main/frame.c
@@ -23,6 +23,10 @@
  * \author Mark Spencer <markster@digium.com> 
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/main/framehook.c b/main/framehook.c
index 2d5fd5a472..6f706fb9da 100644
--- a/main/framehook.c
+++ b/main/framehook.c
@@ -23,6 +23,10 @@
  * \author David Vossel <dvossel@digium.com>
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/main/fskmodem.c b/main/fskmodem.c
index 8d9628e0d2..dee5f5cf7f 100644
--- a/main/fskmodem.c
+++ b/main/fskmodem.c
@@ -21,6 +21,10 @@
  * \note Includes code and algorithms from the Zapata library.
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 #ifdef INTEGER_CALLERID
diff --git a/main/fskmodem_float.c b/main/fskmodem_float.c
index bc873eac5f..547d891c25 100644
--- a/main/fskmodem_float.c
+++ b/main/fskmodem_float.c
@@ -28,6 +28,10 @@
  *
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/main/fskmodem_int.c b/main/fskmodem_int.c
index 8f84f5800f..42edd01302 100644
--- a/main/fskmodem_int.c
+++ b/main/fskmodem_int.c
@@ -28,6 +28,10 @@
  *
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/main/global_datastores.c b/main/global_datastores.c
index cddad6ec1f..92c6bb4f7a 100644
--- a/main/global_datastores.c
+++ b/main/global_datastores.c
@@ -23,6 +23,10 @@
  * \author Mark Michelson <mmichelson@digium.com>
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/main/hashtab.c b/main/hashtab.c
index 78878260ff..4b765979f3 100644
--- a/main/hashtab.c
+++ b/main/hashtab.c
@@ -22,6 +22,10 @@
  *  \author Steve Murphy <murf@digium.com>
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/main/heap.c b/main/heap.c
index 9c4379abaa..b2c0d38359 100644
--- a/main/heap.c
+++ b/main/heap.c
@@ -23,6 +23,10 @@
  * \author Russell Bryant <russell@digium.com>
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/main/image.c b/main/image.c
index 5da07ce069..bc7110ccd5 100644
--- a/main/image.c
+++ b/main/image.c
@@ -23,6 +23,10 @@
  * \author Mark Spencer <markster@digium.com> 
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/main/indications.c b/main/indications.c
index 94e81049f4..94e25aaa06 100644
--- a/main/indications.c
+++ b/main/indications.c
@@ -23,6 +23,10 @@
  * \author Russell Bryant <russell@digium.com>
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/main/io.c b/main/io.c
index 8d51f4936f..1ab15e5fd9 100644
--- a/main/io.c
+++ b/main/io.c
@@ -23,6 +23,10 @@
  * \author Mark Spencer <markster@digium.com>
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/main/jitterbuf.c b/main/jitterbuf.c
index 40bbb554c6..36ebb27850 100644
--- a/main/jitterbuf.c
+++ b/main/jitterbuf.c
@@ -27,6 +27,10 @@
  *
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/main/loader.c b/main/loader.c
index ba66fed6f6..d643a7bd9d 100644
--- a/main/loader.c
+++ b/main/loader.c
@@ -27,6 +27,10 @@
  * - See ModMngMnt
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/main/lock.c b/main/lock.c
index df7940b6ff..c854b3d615 100644
--- a/main/lock.c
+++ b/main/lock.c
@@ -21,6 +21,10 @@
  * \brief General Asterisk locking.
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/main/logger.c b/main/logger.c
index d895b7af49..6ea1e2aab0 100644
--- a/main/logger.c
+++ b/main/logger.c
@@ -25,6 +25,10 @@
  * \author Mark Spencer <markster@digium.com>
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/main/netsock.c b/main/netsock.c
index a05e295b44..4f2a4add69 100644
--- a/main/netsock.c
+++ b/main/netsock.c
@@ -25,6 +25,10 @@
  * \author Mark Spencer <markster@digium.com>
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/main/netsock2.c b/main/netsock2.c
index 21a11634b0..8ba66eb2ea 100644
--- a/main/netsock2.c
+++ b/main/netsock2.c
@@ -23,6 +23,10 @@
  * \author Viagénie <asteriskv6@viagenie.ca>
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/main/pbx.c b/main/pbx.c
index 5f892686db..485ede6344 100644
--- a/main/pbx.c
+++ b/main/pbx.c
@@ -22,6 +22,11 @@
  *
  * \author Mark Spencer <markster@digium.com>
  */
+
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/main/plc.c b/main/plc.c
index ef21312157..a5c3992d6f 100644
--- a/main/plc.c
+++ b/main/plc.c
@@ -30,6 +30,10 @@
  * \author Steve Underwood <steveu@coppice.org>
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/main/privacy.c b/main/privacy.c
index dfb197f38e..2efcfdb0f1 100644
--- a/main/privacy.c
+++ b/main/privacy.c
@@ -23,6 +23,10 @@
  * \author Mark Spencer <markster@digium.com> 
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/main/rtp_engine.c b/main/rtp_engine.c
index d5b73fc296..45cc163047 100644
--- a/main/rtp_engine.c
+++ b/main/rtp_engine.c
@@ -23,6 +23,10 @@
  * \author Joshua Colp <jcolp@digium.com>
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/main/say.c b/main/say.c
index 77047223af..e902fcf795 100644
--- a/main/say.c
+++ b/main/say.c
@@ -31,6 +31,10 @@
  *  						IP Crossing Co., Ltd.
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/main/sched.c b/main/sched.c
index b27358c39a..afef6beb37 100644
--- a/main/sched.c
+++ b/main/sched.c
@@ -23,6 +23,10 @@
  * \author Mark Spencer <markster@digium.com>
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/main/security_events.c b/main/security_events.c
index d1e2ac0ccd..2c460d1034 100644
--- a/main/security_events.c
+++ b/main/security_events.c
@@ -24,6 +24,10 @@
  * \author Russell Bryant <russell@digium.com>
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/main/slinfactory.c b/main/slinfactory.c
index 4da443af58..e18230a54f 100644
--- a/main/slinfactory.c
+++ b/main/slinfactory.c
@@ -24,6 +24,10 @@
  * \author Anthony Minessale <anthmct@yahoo.com>
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/main/srv.c b/main/srv.c
index 5a0c7effbf..1a882a65fe 100644
--- a/main/srv.c
+++ b/main/srv.c
@@ -29,6 +29,10 @@
  * \note Funding provided by nic.at
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/main/ssl.c b/main/ssl.c
index 40129f84f5..ff202816ef 100644
--- a/main/ssl.c
+++ b/main/ssl.c
@@ -23,6 +23,10 @@
  * \author Russell Bryant <russell@digium.com>
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/main/stdtime/localtime.c b/main/stdtime/localtime.c
index bbbb5dbfdc..140c72f683 100644
--- a/main/stdtime/localtime.c
+++ b/main/stdtime/localtime.c
@@ -44,6 +44,10 @@
 
 /*LINTLIBRARY*/
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/main/strcompat.c b/main/strcompat.c
index 97faae73f4..8f93565497 100644
--- a/main/strcompat.c
+++ b/main/strcompat.c
@@ -19,6 +19,10 @@
  * \brief Compatibility functions for strsep and strtoq missing on Solaris 
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 #include <ctype.h>
diff --git a/main/strings.c b/main/strings.c
index 10c1c42f88..285ec92879 100644
--- a/main/strings.c
+++ b/main/strings.c
@@ -31,6 +31,10 @@
 </category>
  ***/
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/main/stun.c b/main/stun.c
index a1474156fb..ca3183839a 100644
--- a/main/stun.c
+++ b/main/stun.c
@@ -26,6 +26,10 @@
  * \note STUN is defined in RFC 3489.
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/main/syslog.c b/main/syslog.c
index 88f554e334..9171be40b4 100644
--- a/main/syslog.c
+++ b/main/syslog.c
@@ -22,6 +22,10 @@
  * \author Sean Bright <sean@malleable.com>
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 #include "asterisk/utils.h"
 #include "asterisk/syslog.h"
diff --git a/main/taskprocessor.c b/main/taskprocessor.c
index 1e977a6915..dd2a1c68c6 100644
--- a/main/taskprocessor.c
+++ b/main/taskprocessor.c
@@ -23,6 +23,10 @@
  * \author Dwayne Hubbard <dhubbard@digium.com>
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/main/tcptls.c b/main/tcptls.c
index 6d725fe0fd..797b5815a5 100644
--- a/main/tcptls.c
+++ b/main/tcptls.c
@@ -25,6 +25,10 @@
  * \author Brett Bryant <brettbryant@gmail.com>
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/main/tdd.c b/main/tdd.c
index d0334d1db4..271550e558 100644
--- a/main/tdd.c
+++ b/main/tdd.c
@@ -27,6 +27,10 @@
  * \note Includes code and algorithms from the Zapata library.
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/main/term.c b/main/term.c
index e757d9321f..8bafc6195c 100644
--- a/main/term.c
+++ b/main/term.c
@@ -23,6 +23,10 @@
  * \author Mark Spencer <markster@digium.com>
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/main/test.c b/main/test.c
index 07ddc4d786..d24ea42a65 100644
--- a/main/test.c
+++ b/main/test.c
@@ -25,6 +25,10 @@
  * \author Russell Bryant <russell@digium.com>
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$");
diff --git a/main/threadstorage.c b/main/threadstorage.c
index 83c9ebe30a..403045bd83 100644
--- a/main/threadstorage.c
+++ b/main/threadstorage.c
@@ -23,6 +23,10 @@
  * \author Kevin P. Fleming <kpfleming@digium.com>
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 #include "asterisk/_private.h"
 
diff --git a/main/timing.c b/main/timing.c
index 23d3cf8eef..02f51b8488 100644
--- a/main/timing.c
+++ b/main/timing.c
@@ -25,6 +25,10 @@
  * \author Russell Bryant <russell@digium.com>
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/main/translate.c b/main/translate.c
index 64caba0c42..b71cc69a37 100644
--- a/main/translate.c
+++ b/main/translate.c
@@ -23,6 +23,10 @@
  * \author Mark Spencer <markster@digium.com> 
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/main/udptl.c b/main/udptl.c
index 8cdf9147d8..da87b63ef0 100644
--- a/main/udptl.c
+++ b/main/udptl.c
@@ -48,6 +48,9 @@
  * - app_fax.c
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
 
 #include "asterisk.h"
 
diff --git a/main/ulaw.c b/main/ulaw.c
index 650b0da365..8caae9b85a 100644
--- a/main/ulaw.c
+++ b/main/ulaw.c
@@ -23,6 +23,10 @@
  * \author Mark Spencer <markster@digium.com> 
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/main/utils.c b/main/utils.c
index 44b4d661f8..36f864e89c 100644
--- a/main/utils.c
+++ b/main/utils.c
@@ -23,6 +23,10 @@
  * Please consult the CODING GUIDELINES for more information.
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/main/xml.c b/main/xml.c
index e28a989d84..bdf983e51c 100644
--- a/main/xml.c
+++ b/main/xml.c
@@ -21,6 +21,10 @@
  * \author Eliel C. Sardanons (LU1ALY) <eliels@gmail.com>
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 #include "asterisk/xml.h"
 #include "asterisk/logger.h"
diff --git a/main/xmldoc.c b/main/xmldoc.c
index 5c6c2b6fef..46f91453a8 100644
--- a/main/xmldoc.c
+++ b/main/xmldoc.c
@@ -23,6 +23,10 @@
  * \extref libxml2 http://www.xmlsoft.org/
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/pbx/dundi-parser.c b/pbx/dundi-parser.c
index 5a236a0a3c..0bf23e6061 100644
--- a/pbx/dundi-parser.c
+++ b/pbx/dundi-parser.c
@@ -22,6 +22,10 @@
  *
  */
 
+/*** MODULEINFO
+	<support_level>extended</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/res/ael/pval.c b/res/ael/pval.c
index 327dbffc7c..ff425f543f 100644
--- a/res/ael/pval.c
+++ b/res/ael/pval.c
@@ -23,6 +23,10 @@
  * 
  */
 
+/*** MODULEINFO
+	<support_level>extended</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/res/ais/clm.c b/res/ais/clm.c
index 640f212591..0e52bf7eea 100644
--- a/res/ais/clm.c
+++ b/res/ais/clm.c
@@ -28,6 +28,10 @@
  * (Cluster Membership) Service.
  */
 
+/*** MODULEINFO
+	<support_level>extended</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$");
diff --git a/res/ais/evt.c b/res/ais/evt.c
index 6d8fc07ffc..d383684238 100644
--- a/res/ais/evt.c
+++ b/res/ais/evt.c
@@ -28,6 +28,10 @@
  * (Event) Service.
  */
 
+/*** MODULEINFO
+	<support_level>extended</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$");
diff --git a/res/snmp/agent.c b/res/snmp/agent.c
index 6201d79b27..ed5459fe25 100644
--- a/res/snmp/agent.c
+++ b/res/snmp/agent.c
@@ -14,6 +14,10 @@
  * \author Thorsten Lockert <tholo@voop.as>
  */
 
+/*** MODULEINFO
+	<support_level>extended</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")