diff --git a/apps/app_adsiprog.c b/apps/app_adsiprog.c
index 518a02113b1c0e7e859f9e542aec97be1b49b4f1..003b0ca315f8a9b052f0f29896f9b1fc412e138c 100644
--- a/apps/app_adsiprog.c
+++ b/apps/app_adsiprog.c
@@ -28,6 +28,7 @@
 /*** MODULEINFO
 	<depend>res_adsi</depend>
 	<support_level>extended</support_level>
+	<defaultenabled>no</defaultenabled>
  ***/
 
 #include "asterisk.h"
diff --git a/apps/app_alarmreceiver.c b/apps/app_alarmreceiver.c
index 53dac302e3b15e61d1ddfc722c3e897c4857e9ad..b7c0a76297de17c18e54ca4ca32420369d146251 100644
--- a/apps/app_alarmreceiver.c
+++ b/apps/app_alarmreceiver.c
@@ -31,6 +31,7 @@
 
 /*** MODULEINFO
 	<support_level>extended</support_level>
+	<defaultenabled>no</defaultenabled>
  ***/
 
 #include "asterisk.h"
diff --git a/apps/app_amd.c b/apps/app_amd.c
index 597aac39ce1593647fb746af6ee11a3c6abd455b..44a7251d7f322762d683e96e270b8b73b92b604a 100644
--- a/apps/app_amd.c
+++ b/apps/app_amd.c
@@ -28,6 +28,7 @@
 
 /*** MODULEINFO
 	<support_level>extended</support_level>
+	<defaultenabled>no</defaultenabled>
  ***/
 
 #include "asterisk.h"
diff --git a/apps/app_chanisavail.c b/apps/app_chanisavail.c
index 8eef4caaa8fb7839fc95e53791dffd14fbbe0cb8..33e1837359224b1918b2229cdcd562a52dae7d38 100644
--- a/apps/app_chanisavail.c
+++ b/apps/app_chanisavail.c
@@ -29,6 +29,7 @@
 
 /*** MODULEINFO
 	<support_level>extended</support_level>
+	<defaultenabled>no</defaultenabled>
  ***/
 
 #include "asterisk.h"
diff --git a/apps/app_dahdiras.c b/apps/app_dahdiras.c
index 3724f0375667d44d999c785e533928ea574eb4d3..a5c71bb293534e29da5de500871b69e2be7c5d10 100644
--- a/apps/app_dahdiras.c
+++ b/apps/app_dahdiras.c
@@ -28,6 +28,7 @@
 /*** MODULEINFO
 	<depend>dahdi</depend>
 	<support_level>extended</support_level>
+	<defaultenabled>no</defaultenabled>
  ***/
 
 #include "asterisk.h"
diff --git a/apps/app_dictate.c b/apps/app_dictate.c
index 1820a1f83093dc87f882997a33688b04cbe94c84..dab0c4c0682bbf6cbbde2f79ae991e2597b35e2f 100644
--- a/apps/app_dictate.c
+++ b/apps/app_dictate.c
@@ -29,6 +29,7 @@
 
 /*** MODULEINFO
 	<support_level>extended</support_level>
+	<defaultenabled>no</defaultenabled>
  ***/
 
 #include "asterisk.h"
diff --git a/apps/app_externalivr.c b/apps/app_externalivr.c
index 0212e09d0eda81591d602ffe49a1144379a509b9..6e452f3dbe363f2a7b58f60e549126d2e11e0565 100644
--- a/apps/app_externalivr.c
+++ b/apps/app_externalivr.c
@@ -33,6 +33,7 @@
 
 /*** MODULEINFO
 	<support_level>extended</support_level>
+	<defaultenabled>no</defaultenabled>
  ***/
 
 #include "asterisk.h"
diff --git a/apps/app_festival.c b/apps/app_festival.c
index d875b7acb7f048ee577d0430d6bde516a2aa4d22..6af8eefb11e8ada58d1f4df97455f185c4767337 100644
--- a/apps/app_festival.c
+++ b/apps/app_festival.c
@@ -29,6 +29,7 @@
 
 /*** MODULEINFO
 	<support_level>extended</support_level>
+	<defaultenabled>no</defaultenabled>
  ***/
 
 #include "asterisk.h"
diff --git a/apps/app_getcpeid.c b/apps/app_getcpeid.c
index 5cdeca1133d79e5d3d96b047186ebebb3a6cd35d..ba3dee4aba27b954368a831573c43bdf9f2887a9 100644
--- a/apps/app_getcpeid.c
+++ b/apps/app_getcpeid.c
@@ -27,6 +27,7 @@
 
 /*** MODULEINFO
 	<support_level>extended</support_level>
+	<defaultenabled>no</defaultenabled>
  ***/
 
 #include "asterisk.h"
diff --git a/apps/app_ices.c b/apps/app_ices.c
index 3ed52273d854e0b5252614be7ed7ec8303c69e2c..e1f07bca0e58de22e4faac2ba38a540389e1cda9 100644
--- a/apps/app_ices.c
+++ b/apps/app_ices.c
@@ -29,6 +29,7 @@
 
 /*** MODULEINFO
 	<support_level>extended</support_level>
+	<defaultenabled>no</defaultenabled>
  ***/
  
 #include "asterisk.h"
diff --git a/apps/app_image.c b/apps/app_image.c
index 160a28569701155aa89d8c3a062724cd8de6c5a8..0c127870d7445e365dd7ea098542791e421f2b20 100644
--- a/apps/app_image.c
+++ b/apps/app_image.c
@@ -27,6 +27,7 @@
 
 /*** MODULEINFO
 	<support_level>extended</support_level>
+	<defaultenabled>no</defaultenabled>
  ***/
  
 #include "asterisk.h"
diff --git a/apps/app_jack.c b/apps/app_jack.c
index d1bdfa38f052f4143016332054e114aacdfe201b..1a90204e65ee32c518d1e47bee613d99a4575e86 100644
--- a/apps/app_jack.c
+++ b/apps/app_jack.c
@@ -38,6 +38,7 @@
 	<depend>jack</depend>
 	<depend>resample</depend>
 	<support_level>extended</support_level>
+	<defaultenabled>no</defaultenabled>
  ***/
 
 #include "asterisk.h"
diff --git a/apps/app_minivm.c b/apps/app_minivm.c
index 5f8a9cb4350ca568678f289e704db1ef7127ecbf..011807114fd541afd7aff42580a77ee653e761df 100644
--- a/apps/app_minivm.c
+++ b/apps/app_minivm.c
@@ -143,6 +143,7 @@
 
 /*** MODULEINFO
 	<support_level>extended</support_level>
+	<defaultenabled>no</defaultenabled>
  ***/
 
 #include "asterisk.h"
diff --git a/apps/app_morsecode.c b/apps/app_morsecode.c
index 2d7c117d19b6bd6ad5aa6fb58bb9c2a3922cbad5..38acc6e509b355cf9dd43c7d82209ef2c0e6e32b 100644
--- a/apps/app_morsecode.c
+++ b/apps/app_morsecode.c
@@ -26,6 +26,7 @@
 
 /*** MODULEINFO
 	<support_level>extended</support_level>
+	<defaultenabled>no</defaultenabled>
  ***/
 
 #include "asterisk.h"
diff --git a/apps/app_mp3.c b/apps/app_mp3.c
index 463a91906f849cf3ebeed1b773655aa07bf88acf..a98a421b9bd4946b4bf64bf4fc7cd8ace4a448f0 100644
--- a/apps/app_mp3.c
+++ b/apps/app_mp3.c
@@ -30,6 +30,7 @@
 
 /*** MODULEINFO
 	<support_level>extended</support_level>
+	<defaultenabled>no</defaultenabled>
  ***/
  
 #include "asterisk.h"
diff --git a/apps/app_nbscat.c b/apps/app_nbscat.c
index 8cf02b369906bc2659ca641ae169f98170629ed4..4a1a48eed4372e227c3e1d19c6fc885bc0bcaf94 100644
--- a/apps/app_nbscat.c
+++ b/apps/app_nbscat.c
@@ -27,6 +27,7 @@
 
 /*** MODULEINFO
 	<support_level>extended</support_level>
+	<defaultenabled>no</defaultenabled>
  ***/
  
 #include "asterisk.h"
diff --git a/apps/app_osplookup.c b/apps/app_osplookup.c
index 88edbd51a04d3d1eb10f0a40c500a6b444d15f44..f851f87f341a27c2227fd456e04a460af8a77299 100644
--- a/apps/app_osplookup.c
+++ b/apps/app_osplookup.c
@@ -32,6 +32,7 @@
 	<depend>osptk</depend>
 	<depend>openssl</depend>
 	<support_level>extended</support_level>
+	<defaultenabled>no</defaultenabled>
  ***/
 
 #include "asterisk.h"
diff --git a/apps/app_sms.c b/apps/app_sms.c
index f693a209edfc049ec699de49b79e7223a74af26b..da601629aefaf15becc37ab3500f980573a5e356 100644
--- a/apps/app_sms.c
+++ b/apps/app_sms.c
@@ -36,6 +36,7 @@
 
 /*** MODULEINFO
 	<support_level>extended</support_level>
+	<defaultenabled>no</defaultenabled>
  ***/
 
 #include "asterisk.h"
diff --git a/apps/app_talkdetect.c b/apps/app_talkdetect.c
index 5ef80c33c0ce2149fad3d60b41ff71ea3dd9cc5a..6853559c10a85a6a483e4502e5b989cb39ebb898 100644
--- a/apps/app_talkdetect.c
+++ b/apps/app_talkdetect.c
@@ -27,6 +27,7 @@
 
 /*** MODULEINFO
 	<support_level>extended</support_level>
+	<defaultenabled>no</defaultenabled>
  ***/
 
 #include "asterisk.h"
diff --git a/apps/app_test.c b/apps/app_test.c
index 5b7b979e6f87ed1d1d7eb89d06c3de28d12cc8fe..66171c1857b933a0eeafdb6164f551da1f13a172 100644
--- a/apps/app_test.c
+++ b/apps/app_test.c
@@ -29,6 +29,7 @@
 
 /*** MODULEINFO
 	<support_level>extended</support_level>
+	<defaultenabled>no</defaultenabled>
  ***/
 
 #include "asterisk.h"
diff --git a/apps/app_url.c b/apps/app_url.c
index 00ea720472dc3963e6319021333fcd4fedff1efb..faaa6f6de9bf97751532485e9777c881f3e68b07 100644
--- a/apps/app_url.c
+++ b/apps/app_url.c
@@ -27,6 +27,7 @@
 
 /*** MODULEINFO
 	<support_level>extended</support_level>
+	<defaultenabled>no</defaultenabled>
  ***/
  
 #include "asterisk.h"
diff --git a/apps/app_waitforring.c b/apps/app_waitforring.c
index fc02de303ede0b752c252497a748d4d524862ba1..213a2c0a16f44d09321f826ead7cb953dedee6bd 100644
--- a/apps/app_waitforring.c
+++ b/apps/app_waitforring.c
@@ -27,6 +27,7 @@
 
 /*** MODULEINFO
 	<support_level>extended</support_level>
+	<defaultenabled>no</defaultenabled>
  ***/
 
 #include "asterisk.h"
diff --git a/apps/app_waitforsilence.c b/apps/app_waitforsilence.c
index f79247274f678d00166f3d085ebf83282f55a677..727b98dd04ed2401b8d01d11b35a08490823f3e7 100644
--- a/apps/app_waitforsilence.c
+++ b/apps/app_waitforsilence.c
@@ -40,6 +40,7 @@
 
 /*** MODULEINFO
 	<support_level>extended</support_level>
+	<defaultenabled>no</defaultenabled>
  ***/
 
 #include "asterisk.h"
diff --git a/apps/app_zapateller.c b/apps/app_zapateller.c
index 00166978f84b258477fff689f759c28d4f503f8e..2f98f993d0d8b3df660707343fba8e63dee96014 100644
--- a/apps/app_zapateller.c
+++ b/apps/app_zapateller.c
@@ -27,6 +27,7 @@
 
 /*** MODULEINFO
 	<support_level>extended</support_level>
+	<defaultenabled>no</defaultenabled>
  ***/
  
 #include "asterisk.h"
diff --git a/build_tools/cflags-devmode.xml b/build_tools/cflags-devmode.xml
index cfcc26c2078c846cacb23ed390c53a95ef8edce2..5b2ac316840c186b24a35933449eab627cd3487d 100644
--- a/build_tools/cflags-devmode.xml
+++ b/build_tools/cflags-devmode.xml
@@ -1,33 +1,43 @@
 	<category name="MENUSELECT_CFLAGS" displayname="Compiler Flags - Development">
 		<member name="MTX_PROFILE" displayname="Enable Code Profiling Using TSC Counters">
 			<support_level>extended</support_level>
+			<defaultenabled>no</defaultenabled>
 		</member>
 		<member name="DEBUG_SCHEDULER" displayname="Enable Scheduler Debugging Output">
 			<support_level>extended</support_level>
+			<defaultenabled>no</defaultenabled>
 		</member>
 		<member name="DEBUG_THREADLOCALS" displayname="Enable Thread-Local-Storage Debugging">
 			<support_level>extended</support_level>
+			<defaultenabled>no</defaultenabled>
 		</member>
 		<member name="DETECT_DEADLOCKS" displayname="Detect Deadlocks">
 			<depend>DEBUG_THREADS</depend>
 			<support_level>extended</support_level>
+			<defaultenabled>no</defaultenabled>
 		</member>
 		<member name="DUMP_SCHEDULER" displayname="Dump Scheduler Contents for Debugging">
 			<support_level>extended</support_level>
+			<defaultenabled>no</defaultenabled>
 		</member>
 		<member name="TRACE_FRAMES" displayname="Trace Frame Allocations">
 			<support_level>extended</support_level>
+			<defaultenabled>no</defaultenabled>
 		</member>
 		<member name="DO_CRASH" displayname="Crash on fatal errors">
 			<support_level>extended</support_level>
+			<defaultenabled>no</defaultenabled>
 		</member>
 		<member name="THREAD_CRASH" displayname="Crash on mutex errors">
 			<support_level>extended</support_level>
+			<defaultenabled>no</defaultenabled>
 		</member>
 		<member name="CHANNEL_TRACE" displayname="Enable CHANNEL(trace) function">
 			<support_level>extended</support_level>
+			<defaultenabled>no</defaultenabled>
 		</member>
 		<member name="TEST_FRAMEWORK" displayname="Enable Test Framework API">
 			<support_level>extended</support_level>
+			<defaultenabled>no</defaultenabled>
 		</member>
 	</category>
diff --git a/build_tools/cflags.xml b/build_tools/cflags.xml
index 7e3e9eeb767abb2da381258a7420424d04d9dad3..f6ffc03b3759adad5fe09dd22b3abc0cbc3bee6f 100644
--- a/build_tools/cflags.xml
+++ b/build_tools/cflags.xml
@@ -7,6 +7,7 @@
 		</member>
 		<member name="STATIC_BUILD" displayname="Build static binaries">
 			<support_level>extended</support_level>
+			<defaultenabled>no</defaultenabled>
 		</member>
 		<member name="LOADABLE_MODULES" displayname="Runtime module loading">
 			<defaultenabled>yes</defaultenabled>
@@ -23,6 +24,7 @@
 		</member>
 		<member name="LOW_MEMORY" displayname="Optimize for Low Memory Usage">
 			<support_level>extended</support_level>
+			<defaultenabled>no</defaultenabled>
 		</member>
 		<member name="BETTER_BACKTRACES" displayname="Use libbfd (GPL) to generate better inline backtraces">
 			<depend>BFD</depend>
@@ -40,6 +42,7 @@
 		</member>
 		<member name="RADIO_RELAX" displayname="Relax DTMF for Radio Applications">
 			<support_level>extended</support_level>
+			<defaultenabled>no</defaultenabled>
 		</member>
 		<member name="G711_NEW_ALGORITHM" displayname="Use the NEW ulaw/alaw codecs (slower, but cleaner)">
 			<defaultenabled>no</defaultenabled>
@@ -48,14 +51,17 @@
 		<member name="G711_REDUCED_BRANCHING" displayname="New ulaw/alaw codec, reduced branching (might help it run faster in some architectures)">
 			<depend>G711_NEW_ALGORITHM</depend>
 			<support_level>extended</support_level>
+			<defaultenabled>no</defaultenabled>
 		</member>
 		<member name="TEST_CODING_TABLES" displayname="New ulaw/alaw codec, turn on table tests on init">
 			<depend>G711_NEW_ALGORITHM</depend>
 			<support_level>extended</support_level>
+			<defaultenabled>no</defaultenabled>
 		</member>
 		<member name="TEST_TANDEM_TRANSCODING" displayname="New ulaw/alaw codec, turn on transcoding tests on init">
 			<depend>G711_NEW_ALGORITHM</depend>
 			<support_level>extended</support_level>
+			<defaultenabled>no</defaultenabled>
 		</member>
 		<member name="MALLOC_DEBUG" displayname="Keep Track of Memory Allocations">
 			<support_level>core</support_level>
@@ -76,6 +82,7 @@
 		</member>
 		<member name="INTEGER_CALLERID" displayname="Use the (less accurate) integer-based method for decoding FSK tones (for embedded systems)">
 			<support_level>extended</support_level>
+			<defaultenabled>no</defaultenabled>
 		</member>
 		<member name="BUILD_NATIVE" displayname="Allow compiler to generate code optimized for the CPU on which the build is performed.">
 			<support_level>core</support_level>
diff --git a/build_tools/embed_modules.xml b/build_tools/embed_modules.xml
index a7e4cfd5d01be2e84e60c3edc50ffedd3db98057..44a1e0fb626afad4f1b438de38c1171796038705 100644
--- a/build_tools/embed_modules.xml
+++ b/build_tools/embed_modules.xml
@@ -2,45 +2,56 @@
 		<member name="EMBED_ADDONS" displayname="Add-ons" remove_on_change="addons/*.o addons/*.oo">
 			<depend>gnu_ld</depend>
 			<support_level>extended</support_level>
+			<defaultenabled>no</defaultenabled>
 		</member>
 		<member name="EMBED_APPS" displayname="Applications" remove_on_change="apps/*.o apps/*.oo">
 			<depend>gnu_ld</depend>
 			<support_level>extended</support_level>
+			<defaultenabled>no</defaultenabled>
 		</member>
 		<member name="EMBED_BRIDGES" displayname="Bridging Technologies" remove_on_change="bridges/*.o bridges/*.oo">
 			<depend>gnu_ld</depend>
 			<support_level>extended</support_level>
+			<defaultenabled>no</defaultenabled>
 		</member>
 		<member name="EMBED_CDR" displayname="Call Detail Recording" remove_on_change="cdr/*.o cdr/*.oo">
 			<depend>gnu_ld</depend>
 			<support_level>extended</support_level>
+			<defaultenabled>no</defaultenabled>
 		</member>
 		<member name="EMBED_CHANNELS" displayname="Channels" remove_on_change="channels/*.o channels/*/*.o channels/*.oo channels/*/*.oo">
 			<depend>gnu_ld</depend>
 			<support_level>extended</support_level>
+			<defaultenabled>no</defaultenabled>
 		</member>
 		<member name="EMBED_CODECS" displayname="Coders/Decoders" remove_on_change="codecs/*.o codecs/*/*.o codecs/*/*/*.o codecs/*/*.a codecs/*/*/*.a codecs/*.oo codecs/*/*.oo">
 			<depend>gnu_ld</depend>
 			<support_level>extended</support_level>
+			<defaultenabled>no</defaultenabled>
 		</member>
 		<member name="EMBED_FORMATS" displayname="File Formats" remove_on_change="formats/*.o formats/*.oo">
 			<depend>gnu_ld</depend>
 			<support_level>extended</support_level>
+			<defaultenabled>no</defaultenabled>
 		</member>
 		<member name="EMBED_FUNCS" displayname="Dialplan Functions" remove_on_change="funcs/*.o funcs/*.oo">
 			<depend>gnu_ld</depend>
 			<support_level>extended</support_level>
+			<defaultenabled>no</defaultenabled>
 		</member>
 		<member name="EMBED_PBX" displayname="PBX Functionality" remove_on_change="pbx/*.o pbx/*/*.o pbx/*.oo pbx/*/*.oo">
 			<depend>gnu_ld</depend>
 			<support_level>extended</support_level>
+			<defaultenabled>no</defaultenabled>
 		</member>
 		<member name="EMBED_RES" displayname="Resource Modules" remove_on_change="res/*.o res/*/*.o res/*.oo res/*/*.oo">
 			<depend>gnu_ld</depend>
 			<support_level>extended</support_level>
+			<defaultenabled>no</defaultenabled>
 		</member>
 		<member name="EMBED_TEST" displayname="Test Modules" remove_on_change="tests/*.o tests/*.oo">
 			<depend>gnu_ld</depend>
 			<support_level>extended</support_level>
+			<defaultenabled>no</defaultenabled>
 		</member>
 	</category>
diff --git a/cdr/cdr_csv.c b/cdr/cdr_csv.c
index b629290ebe444d1fb83d6ddc3465800eb94a94df..c80e73853e0ba0938e24efb6b6bf61866cb046b4 100644
--- a/cdr/cdr_csv.c
+++ b/cdr/cdr_csv.c
@@ -30,6 +30,7 @@
 
 /*** MODULEINFO
 	<support_level>extended</support_level>
+	<defaultenabled>no</defaultenabled>
  ***/
 
 #include "asterisk.h"
diff --git a/cdr/cdr_odbc.c b/cdr/cdr_odbc.c
index e940b9353b0d3be7ad9d27c0e1d7f0b9022d27d4..79c989c902bb4881f909d6a2026d38bbf9d563e2 100644
--- a/cdr/cdr_odbc.c
+++ b/cdr/cdr_odbc.c
@@ -31,6 +31,7 @@
 /*** MODULEINFO
 	<depend>res_odbc</depend>
 	<support_level>extended</support_level>
+	<defaultenabled>no</defaultenabled>
  ***/
 
 #include "asterisk.h"
diff --git a/cdr/cdr_pgsql.c b/cdr/cdr_pgsql.c
index 4b536abcc8122a9daec0917d631ac19bc3182d2c..8372ab42eb820c0494d89411df13299aff5753bd 100644
--- a/cdr/cdr_pgsql.c
+++ b/cdr/cdr_pgsql.c
@@ -36,6 +36,7 @@
 /*** MODULEINFO
 	<depend>pgsql</depend>
 	<support_level>extended</support_level>
+	<defaultenabled>no</defaultenabled>
  ***/
 
 #include "asterisk.h"
diff --git a/cdr/cdr_radius.c b/cdr/cdr_radius.c
index 140e7a01c0fd3e569c1937cdc9c92e066bdf2b83..e974c62bd43be01fd584e1c56e313a8252d45d40 100644
--- a/cdr/cdr_radius.c
+++ b/cdr/cdr_radius.c
@@ -30,6 +30,7 @@
 /*** MODULEINFO
 	<depend>radius</depend>
 	<support_level>extended</support_level>
+	<defaultenabled>no</defaultenabled>
  ***/
 
 #include "asterisk.h"
diff --git a/cdr/cdr_sqlite3_custom.c b/cdr/cdr_sqlite3_custom.c
index 601234604298ea884b8479e02dc4d1dc42d8707f..23f04578c53e5488ed587e11b02eb8f7e806fcac 100644
--- a/cdr/cdr_sqlite3_custom.c
+++ b/cdr/cdr_sqlite3_custom.c
@@ -35,6 +35,7 @@
 /*** MODULEINFO
 	<depend>sqlite3</depend>
 	<support_level>extended</support_level>
+	<defaultenabled>no</defaultenabled>
  ***/
 
 #include "asterisk.h"
diff --git a/cdr/cdr_tds.c b/cdr/cdr_tds.c
index dd75dbb464741f4da1ffa3f3ae9c35eced32f765..5e45267aa3a877e93dfcaae11869820f8c1b636f 100644
--- a/cdr/cdr_tds.c
+++ b/cdr/cdr_tds.c
@@ -60,6 +60,7 @@ CREATE TABLE [dbo].[cdr] (
 /*** MODULEINFO
 	<depend>freetds</depend>
 	<support_level>extended</support_level>
+	<defaultenabled>no</defaultenabled>
  ***/
 
 #include "asterisk.h"
diff --git a/cel/cel_pgsql.c b/cel/cel_pgsql.c
index 5885a1d32be248c5f0bbc8ace49412bc9b7f2adc..9e51ff136aa963bf60463f17ec4d2bf7d44e0e32 100644
--- a/cel/cel_pgsql.c
+++ b/cel/cel_pgsql.c
@@ -40,6 +40,7 @@
 /*** MODULEINFO
 	<depend>pgsql</depend>
 	<support_level>extended</support_level>
+	<defaultenabled>no</defaultenabled>
  ***/
 
 #include "asterisk.h"
diff --git a/cel/cel_radius.c b/cel/cel_radius.c
index 7cd7726e1fe653c7c589aa6cd6fb88d4b1dbc8b5..2b78c297208381b8ae87341128b826498c2f0d5e 100644
--- a/cel/cel_radius.c
+++ b/cel/cel_radius.c
@@ -29,6 +29,7 @@
 /*** MODULEINFO
 	<depend>radius</depend>
 	<support_level>extended</support_level>
+	<defaultenabled>no</defaultenabled>
  ***/
 
 #include "asterisk.h"
diff --git a/cel/cel_sqlite3_custom.c b/cel/cel_sqlite3_custom.c
index 444df77d3154f26bf77a51e3c9ec26ce2588c58c..87f5f552743897867b44fbd20f2ac09053743fbc 100644
--- a/cel/cel_sqlite3_custom.c
+++ b/cel/cel_sqlite3_custom.c
@@ -37,6 +37,7 @@
 /*** MODULEINFO
 	<depend>sqlite3</depend>
 	<support_level>extended</support_level>
+	<defaultenabled>no</defaultenabled>
  ***/
 
 #include "asterisk.h"
diff --git a/cel/cel_tds.c b/cel/cel_tds.c
index df2b573bf252c7cd61ab10b3b158581bc0e91981..bf2341a015b1a71b471d90e0c3f4c3afd9d05e97 100644
--- a/cel/cel_tds.c
+++ b/cel/cel_tds.c
@@ -57,6 +57,7 @@ CREATE TABLE [dbo].[cel] (
 /*** MODULEINFO
 	<depend>freetds</depend>
 	<support_level>extended</support_level>
+	<defaultenabled>no</defaultenabled>
  ***/
 
 #include "asterisk.h"
diff --git a/channels/chan_alsa.c b/channels/chan_alsa.c
index 41c8a3a39e1f8f8e69063daf8841931de56931fc..91bbedbefda365a474c60298abe0c2da473597f9 100644
--- a/channels/chan_alsa.c
+++ b/channels/chan_alsa.c
@@ -30,6 +30,7 @@
 /*** MODULEINFO
 	<depend>alsa</depend>
 	<support_level>extended</support_level>
+	<defaultenabled>no</defaultenabled>
  ***/
 
 #include "asterisk.h"
diff --git a/channels/chan_console.c b/channels/chan_console.c
index dce9f01bbc77a1f8e91532843538ce79d42da956..06c3c300c048585f6d06ebbb89d4f10ea793f243 100644
--- a/channels/chan_console.c
+++ b/channels/chan_console.c
@@ -50,6 +50,7 @@
 /*** MODULEINFO
 	<depend>portaudio</depend>
 	<support_level>extended</support_level>
+	<defaultenabled>no</defaultenabled>
  ***/
 
 #include "asterisk.h"
diff --git a/channels/chan_gtalk.c b/channels/chan_gtalk.c
index f30a3413b22a1a1dc3807f58b504bdc185e174d5..bced8f391a26d11a292c1ef3553f89091cc54fad 100644
--- a/channels/chan_gtalk.c
+++ b/channels/chan_gtalk.c
@@ -38,6 +38,7 @@
 	<use type="external">openssl</use>
 	<support_level>deprecated</support_level>
 	<replacement>chan_motif</replacement>
+	<defaultenabled>no</defaultenabled>
  ***/
 
 #include "asterisk.h"
diff --git a/channels/chan_jingle.c b/channels/chan_jingle.c
index 661477ec7eb9ad9272d42a055388e99117d1d007..dcceac3f6fd3c5df52db55551751a72385eacfd4 100644
--- a/channels/chan_jingle.c
+++ b/channels/chan_jingle.c
@@ -34,6 +34,7 @@
 	<defaultenabled>no</defaultenabled>
 	<support_level>deprecated</support_level>
 	<replacement>chan_motif</replacement>
+	<defaultenabled>no</defaultenabled>
  ***/
 
 #include "asterisk.h"
diff --git a/channels/chan_mgcp.c b/channels/chan_mgcp.c
index c3a5c58f4374954ee49f867a40ce99b8bc02a8ea..be4e00efd7719958c55b08bd905c818ad608cb4f 100644
--- a/channels/chan_mgcp.c
+++ b/channels/chan_mgcp.c
@@ -32,6 +32,7 @@
 /*** MODULEINFO
         <use type="module">res_pktccops</use>
 	<support_level>extended</support_level>
+	<defaultenabled>no</defaultenabled>
  ***/
 
 #include "asterisk.h"
diff --git a/channels/chan_misdn.c b/channels/chan_misdn.c
index 548685aad5e2728ed1e2ad8dc0f8cec441211100..c0cd9542752cf52441633f57fe753544b944b975 100644
--- a/channels/chan_misdn.c
+++ b/channels/chan_misdn.c
@@ -54,6 +54,7 @@
 	<depend>misdn</depend>
 	<depend>suppserv</depend>
 	<support_level>extended</support_level>
+	<defaultenabled>no</defaultenabled>
  ***/
 
 #include "asterisk.h"
diff --git a/channels/chan_nbs.c b/channels/chan_nbs.c
index e6384872ee1e48440d8f164a79572355ab117941..a931d50a6f034826229d70743d880a52460eaad8 100644
--- a/channels/chan_nbs.c
+++ b/channels/chan_nbs.c
@@ -27,7 +27,8 @@
 
 /*** MODULEINFO
 	<depend>nbs</depend>
-	<support_level>extended</support_level>	
+	<support_level>extended</support_level>
+	<defaultenabled>no</defaultenabled>
  ***/
 
 #include "asterisk.h"
diff --git a/channels/chan_oss.c b/channels/chan_oss.c
index 0e3b02b692a277142e5047bc98d0807af54e6bc2..ad1380e76a091eb9433266063ce9456ec8f7f11c 100644
--- a/channels/chan_oss.c
+++ b/channels/chan_oss.c
@@ -36,6 +36,7 @@
 /*** MODULEINFO
 	<depend>oss</depend>
 	<support_level>extended</support_level>
+	<defaultenabled>no</defaultenabled>
  ***/
 
 #include "asterisk.h"
diff --git a/channels/chan_phone.c b/channels/chan_phone.c
index 0f050f6c9ec09e956882585187161fe0783b45cc..c566fd0bfe7bd994c925bf98084184591e980a79 100644
--- a/channels/chan_phone.c
+++ b/channels/chan_phone.c
@@ -28,6 +28,7 @@
 /*** MODULEINFO
 	<depend>ixjuser</depend>
 	<support_level>extended</support_level>
+	<defaultenabled>no</defaultenabled>
  ***/
 
 #include "asterisk.h"
diff --git a/channels/chan_skinny.c b/channels/chan_skinny.c
index c1de81a631ed6b3ff63207babfb793adf0f0d11d..874eedd972db69fda1e1603995204c78a4af9de5 100644
--- a/channels/chan_skinny.c
+++ b/channels/chan_skinny.c
@@ -27,6 +27,7 @@
 
 /*** MODULEINFO
 	<support_level>extended</support_level>
+	<defaultenabled>no</defaultenabled>
  ***/
 
 #include "asterisk.h"
diff --git a/channels/chan_unistim.c b/channels/chan_unistim.c
index 50388dc3db265c66931be15282c762c734bba18f..cb786eb4dae6eb568db4b6a3816aaf8306ef86dd 100644
--- a/channels/chan_unistim.c
+++ b/channels/chan_unistim.c
@@ -34,6 +34,7 @@
 
 /*** MODULEINFO
 	<support_level>extended</support_level>
+	<defaultenabled>no</defaultenabled>
  ***/
 
 #include "asterisk.h"
diff --git a/channels/console_board.c b/channels/console_board.c
index 6c920a944c3ee0e501381ac26692c566f0efe692..5f01d696e20cc006b0754e7a73cc1a9779f998ca 100644
--- a/channels/console_board.c
+++ b/channels/console_board.c
@@ -39,6 +39,7 @@
 
 /*** MODULEINFO
 	<support_level>extended</support_level>
+	<defaultenabled>no</defaultenabled>
  ***/
 
 #include "asterisk.h"	/* ast_strdupa */
diff --git a/channels/console_gui.c b/channels/console_gui.c
index 916c4080138c2200a3aac1a0a5f6f5b83dffd689..c931a58b8078329c992249d020585497790fd91c 100644
--- a/channels/console_gui.c
+++ b/channels/console_gui.c
@@ -80,6 +80,7 @@ new regions inside the keypad pictureas comments
 
 /*** MODULEINFO
 	<support_level>extended</support_level>
+	<defaultenabled>no</defaultenabled>
  ***/
 
 #include "asterisk.h"
diff --git a/channels/console_video.c b/channels/console_video.c
index a1db5cd773605bf7bfca77c7e76c417b57e21145..28dd68b205bcafe88dc6ece2d14f99f36e88601d 100644
--- a/channels/console_video.c
+++ b/channels/console_video.c
@@ -38,6 +38,7 @@
 
 /*** MODULEINFO
 	<support_level>extended</support_level>
+	<defaultenabled>no</defaultenabled>
  ***/
 
 #include "asterisk.h"
diff --git a/formats/format_jpeg.c b/formats/format_jpeg.c
index d6733020ec61ba3a5da6b112ee5faa8cbe4f00b3..f3537c6b473164295f45c7f1929cd411a56f1536 100644
--- a/formats/format_jpeg.c
+++ b/formats/format_jpeg.c
@@ -26,6 +26,7 @@
 
 /*** MODULEINFO
 	<support_level>extended</support_level>
+	<defaultenabled>no</defaultenabled>
  ***/
  
 #include "asterisk.h"
diff --git a/formats/format_vox.c b/formats/format_vox.c
index f640021d8b23dee685b4401cf49e03648fa09ed5..33005d1ef9e1e6457547a8aa42082c32f8e8e3b4 100644
--- a/formats/format_vox.c
+++ b/formats/format_vox.c
@@ -26,6 +26,7 @@
 
 /*** MODULEINFO
 	<support_level>extended</support_level>
+	<defaultenabled>no</defaultenabled>
  ***/
  
 #include "asterisk.h"
diff --git a/funcs/func_frame_trace.c b/funcs/func_frame_trace.c
index 8e12aafb3547e609359d1fde41d85b074383d536..eb6d63ffb0e91e32022b07ba40a68004bbd5e090 100644
--- a/funcs/func_frame_trace.c
+++ b/funcs/func_frame_trace.c
@@ -27,6 +27,7 @@
 
 /*** MODULEINFO
 	<support_level>extended</support_level>
+	<defaultenabled>no</defaultenabled>
  ***/
 
 #include "asterisk.h"
diff --git a/funcs/func_pitchshift.c b/funcs/func_pitchshift.c
index ca441f985079d9385f6cb655012c9e7c02a9aab8..c8735ac36ac421115a78bf2b7c9bd350b385d4e5 100644
--- a/funcs/func_pitchshift.c
+++ b/funcs/func_pitchshift.c
@@ -60,6 +60,7 @@
 
 /*** MODULEINFO
 	<support_level>extended</support_level>
+	<defaultenabled>no</defaultenabled>
  ***/
 
 #include "asterisk.h"
diff --git a/pbx/pbx_ael.c b/pbx/pbx_ael.c
index 5c42732bf93cda7a08bd8c09c66e415e509bd211..27b4ab99e14c3a41a8a7a97f1cbcc3dfafa90784 100644
--- a/pbx/pbx_ael.c
+++ b/pbx/pbx_ael.c
@@ -25,6 +25,7 @@
 /*** MODULEINFO
 	<depend>res_ael_share</depend>
 	<support_level>extended</support_level>
+	<defaultenabled>no</defaultenabled>
  ***/
 
 #include "asterisk.h"
diff --git a/pbx/pbx_dundi.c b/pbx/pbx_dundi.c
index 9946a7d36291c1fe2e0a80555655c896ecf29fc7..ba1e8e5b8896f8bb534fdb8a4d1d51322e1b96db 100644
--- a/pbx/pbx_dundi.c
+++ b/pbx/pbx_dundi.c
@@ -25,6 +25,7 @@
 	<depend>zlib</depend>
 	<use type="external">crypto</use>
 	<support_level>extended</support_level>
+	<defaultenabled>no</defaultenabled>
  ***/
 
 #include "asterisk.h"
diff --git a/pbx/pbx_lua.c b/pbx/pbx_lua.c
index 1b918279450531b8e159532c1e3562fd0558c169..64a04e8b28058ed389355ee3c9f4d0c346f3eed7 100644
--- a/pbx/pbx_lua.c
+++ b/pbx/pbx_lua.c
@@ -27,6 +27,7 @@
 /*** MODULEINFO
 	<depend>lua</depend>
 	<support_level>extended</support_level>
+	<defaultenabled>no</defaultenabled>
  ***/
 
 #include "asterisk.h"
diff --git a/pbx/pbx_realtime.c b/pbx/pbx_realtime.c
index 3808483ad972f2a947da685ef9ae2db1296bc228..709432ec93dec86ee91127f7f7460e01103377d7 100644
--- a/pbx/pbx_realtime.c
+++ b/pbx/pbx_realtime.c
@@ -25,6 +25,7 @@
 
 /*** MODULEINFO
 	<support_level>extended</support_level>
+	<defaultenabled>no</defaultenabled>
  ***/
 
 #include "asterisk.h"
diff --git a/res/res_ael_share.c b/res/res_ael_share.c
index f1ae9f33f548cddd86ff182764c25a72a6c090f5..713f46b02582be000548118016842ae3e452e823 100644
--- a/res/res_ael_share.c
+++ b/res/res_ael_share.c
@@ -27,6 +27,7 @@
 
 /*** MODULEINFO
 	<support_level>extended</support_level>
+	<defaultenabled>no</defaultenabled>
  ***/
 
 #include "asterisk.h"
diff --git a/res/res_config_ldap.c b/res/res_config_ldap.c
index 0e50de35729df97bbb1deb4b8ebf5326590cdfe4..d1c51ed3ffbdf050446706cd775b4503438410d0 100644
--- a/res/res_config_ldap.c
+++ b/res/res_config_ldap.c
@@ -34,6 +34,7 @@
 /*** MODULEINFO
 	<depend>ldap</depend>
 	<support_level>extended</support_level>
+	<defaultenabled>no</defaultenabled>
  ***/
 
 #include "asterisk.h"
diff --git a/res/res_config_pgsql.c b/res/res_config_pgsql.c
index 252e599d04c86becdedf79668663c6eeccf2217a..f57fc8ccb68789c30800736dd8c1ae5fdeb5f461 100644
--- a/res/res_config_pgsql.c
+++ b/res/res_config_pgsql.c
@@ -25,6 +25,7 @@
 /*** MODULEINFO
 	<depend>pgsql</depend>
 	<support_level>extended</support_level>
+	<defaultenabled>no</defaultenabled>
  ***/
 
 #include "asterisk.h"
diff --git a/res/res_config_sqlite.c b/res/res_config_sqlite.c
index 4177586d918e1025c01243cc09fce62256322a54..9dd967aa531828e394fadb90c1966078d774c238 100644
--- a/res/res_config_sqlite.c
+++ b/res/res_config_sqlite.c
@@ -74,6 +74,7 @@
 /*** MODULEINFO
 	<depend>sqlite</depend>
 	<support_level>extended</support_level>
+	<defaultenabled>no</defaultenabled>
  ***/
 
 #include "asterisk.h"
diff --git a/res/res_corosync.c b/res/res_corosync.c
index e6044c30557eaeccb7b8a6e82185093d6b34210b..e6ab4ca0484127377ed5eeaee0355e50ae7f6a48 100644
--- a/res/res_corosync.c
+++ b/res/res_corosync.c
@@ -27,6 +27,7 @@
 /*** MODULEINFO
 	<depend>corosync</depend>
 	<support_level>extended</support_level>
+	<defaultenabled>no</defaultenabled>
  ***/
 
 #include "asterisk.h"
diff --git a/res/res_fax_spandsp.c b/res/res_fax_spandsp.c
index bc51f28c9627c1c23d5a42bddd2426bc6bc1801c..fda29a1828438de848b664b67b025caefd41102b 100644
--- a/res/res_fax_spandsp.c
+++ b/res/res_fax_spandsp.c
@@ -46,6 +46,7 @@
 	<depend>spandsp</depend>
 	<depend>res_fax</depend>
 	<support_level>extended</support_level>
+	<defaultenabled>no</defaultenabled>
 ***/
 
 #include "asterisk.h"
diff --git a/res/res_http_websocket.c b/res/res_http_websocket.c
index 5ed4b6fceb11a1501ad42675660952ff5e4c2b64..b3077a6a3da04e3e5bf2c38b78b84316c93e019a 100644
--- a/res/res_http_websocket.c
+++ b/res/res_http_websocket.c
@@ -25,6 +25,7 @@
 
 /*** MODULEINFO
 	<support_level>extended</support_level>
+	<defaultenabled>no</defaultenabled>
  ***/
 
 #include "asterisk.h"
diff --git a/res/res_phoneprov.c b/res/res_phoneprov.c
index 4ae7efe8fed1e4907e17016bb0e2dd11a0ef12ae..8f972004dae26a58d29bb58bb67ce6d8d3cd24db 100644
--- a/res/res_phoneprov.c
+++ b/res/res_phoneprov.c
@@ -28,6 +28,7 @@
 
 /*** MODULEINFO
 	<support_level>extended</support_level>
+	<defaultenabled>no</defaultenabled>
  ***/
 
 #include "asterisk.h"
diff --git a/res/res_pktccops.c b/res/res_pktccops.c
index e3e1625872637dcb29b48d87487e1e0151e44780..0bca5e989253184f9e2f8caa3c132c875476ca5d 100644
--- a/res/res_pktccops.c
+++ b/res/res_pktccops.c
@@ -33,6 +33,7 @@
 /*** MODULEINFO
         <defaultenabled>no</defaultenabled>
 	<support_level>extended</support_level>
+	<defaultenabled>no</defaultenabled>
  ***/
 
 #include "asterisk.h"
diff --git a/res/res_snmp.c b/res/res_snmp.c
index f717cead0ed753360c49d50f575dd2158db11068..811e479da1721f1626b179f656c208fbc4f98574 100644
--- a/res/res_snmp.c
+++ b/res/res_snmp.c
@@ -20,6 +20,7 @@
 /*** MODULEINFO
 	<depend>netsnmp</depend>
 	<support_level>extended</support_level>
+	<defaultenabled>no</defaultenabled>
  ***/
 
 #include "asterisk.h"
diff --git a/res/res_timing_kqueue.c b/res/res_timing_kqueue.c
index 8ac2714740c23029b3b3c04f382dfbf0ad31455e..2e4fcaee2c80ab896ca638b9186408eb27063fb7 100644
--- a/res/res_timing_kqueue.c
+++ b/res/res_timing_kqueue.c
@@ -27,6 +27,7 @@
 	<depend>kqueue</depend>
 	<conflict>launchd</conflict>
 	<support_level>extended</support_level>
+	<defaultenabled>no</defaultenabled>
  ***/
 
 #include "asterisk.h"
diff --git a/res/res_timing_pthread.c b/res/res_timing_pthread.c
index 55ed6acfb2a3b15a7f9626cf21bb1e18ce98ea8e..3a2ca73664cf12fcdb2fc7f0ab495904c36019f6 100644
--- a/res/res_timing_pthread.c
+++ b/res/res_timing_pthread.c
@@ -25,6 +25,7 @@
 
 /*** MODULEINFO
 	<support_level>extended</support_level>
+	<defaultenabled>no</defaultenabled>
  ***/
 
 #include "asterisk.h"
diff --git a/utils/ael_main.c b/utils/ael_main.c
index 64f4d8e3f60e367445a723f7ad1eb92a5915dc5a..c505125d5127c04055395f7e321ad088f65e07ce 100644
--- a/utils/ael_main.c
+++ b/utils/ael_main.c
@@ -9,6 +9,7 @@
 
 /*** MODULEINFO
 	<support_level>extended</support_level>
+	<defaultenabled>no</defaultenabled>
  ***/
 
 #include "asterisk.h"
diff --git a/utils/astman.c b/utils/astman.c
index e61ce2388cf62871ff3907ff6c3677b3bb9c539d..fa3a4fa08d62e0be5d288332e9ce5c26f933dfe6 100644
--- a/utils/astman.c
+++ b/utils/astman.c
@@ -24,6 +24,7 @@
 
 /*** MODULEINFO
 	<support_level>extended</support_level>
+	<defaultenabled>no</defaultenabled>
  ***/
 
 #include "asterisk.h"
diff --git a/utils/check_expr.c b/utils/check_expr.c
index 3c1afde2903fe4ab10cc5ae37a70872bebb99e84..02bafa94be2891fa6dd6e683050ac48de3045a53 100644
--- a/utils/check_expr.c
+++ b/utils/check_expr.c
@@ -18,6 +18,7 @@
 
 /*** MODULEINFO
 	<support_level>extended</support_level>
+	<defaultenabled>no</defaultenabled>
  ***/
 
 #include "asterisk.h"
diff --git a/utils/conf2ael.c b/utils/conf2ael.c
index ee46812376f80d1fb1d13ecec7a0c2f2f0fa0541..232b78c35b94edbe3aeebaca8d747fc0ac4f3a54 100644
--- a/utils/conf2ael.c
+++ b/utils/conf2ael.c
@@ -25,6 +25,7 @@
 /*** MODULEINFO
 	<depend>res_ael_share</depend>
 	<support_level>extended</support_level>
+	<defaultenabled>no</defaultenabled>
  ***/
 
 #include "asterisk.h"
diff --git a/utils/extconf.c b/utils/extconf.c
index 99df9e9ec1e59caf4f3ff3378b4d1f841f26225b..1ff373aacece50e0e98ff826d5097c9c83d4c04d 100644
--- a/utils/extconf.c
+++ b/utils/extconf.c
@@ -26,6 +26,7 @@
 
 /*** MODULEINFO
 	<support_level>extended</support_level>
+	<defaultenabled>no</defaultenabled>
  ***/
 
 #include "asterisk.h"
diff --git a/utils/muted.c b/utils/muted.c
index 18f55d73f879d81fda803216765c790c41c94fd0..e7e2d57dc429452216a0aaea64280823f684a8f6 100644
--- a/utils/muted.c
+++ b/utils/muted.c
@@ -37,6 +37,7 @@
 
 /*** MODULEINFO
 	<support_level>extended</support_level>
+	<defaultenabled>no</defaultenabled>
  ***/
 
 #include "asterisk/autoconfig.h"
diff --git a/utils/refcounter.c b/utils/refcounter.c
index 58cfa0de2ae487a1f75644dae4819a9cc5afdfeb..07a9dd061b9c2080d4bc350960ad18085911ba5b 100644
--- a/utils/refcounter.c
+++ b/utils/refcounter.c
@@ -41,6 +41,7 @@
 
 /*** MODULEINFO
 	<support_level>extended</support_level>
+	<defaultenabled>no</defaultenabled>
  ***/
 
 #include "asterisk.h"
diff --git a/utils/smsq.c b/utils/smsq.c
index fab32f086254df45bb2329c380e99057131c345f..571364b1a43472a728112855fac7e470f224a9b4 100644
--- a/utils/smsq.c
+++ b/utils/smsq.c
@@ -19,6 +19,7 @@
 
 /*** MODULEINFO
 	<support_level>extended</support_level>
+	<defaultenabled>no</defaultenabled>
  ***/
 
 #include "asterisk.h"
diff --git a/utils/stereorize.c b/utils/stereorize.c
index 4843040373a81973dd1ca2d776c5938494733374..7d8f279841c1d7f518416d7c3c9df5ca17e19334 100644
--- a/utils/stereorize.c
+++ b/utils/stereorize.c
@@ -12,6 +12,7 @@
 
 /*** MODULEINFO
 	<support_level>extended</support_level>
+	<defaultenabled>no</defaultenabled>
  ***/
 
 #include <stdio.h>
diff --git a/utils/streamplayer.c b/utils/streamplayer.c
index 6c70b0840a0751298edb93f079661360be941e20..ab0f29c2260add47f540338b726dc50a56b1b8fc 100644
--- a/utils/streamplayer.c
+++ b/utils/streamplayer.c
@@ -44,6 +44,7 @@
 
 /*** MODULEINFO
 	<support_level>extended</support_level>
+	<defaultenabled>no</defaultenabled>
  ***/
 
 #include <stdlib.h>