diff --git a/apps/app_queue.c b/apps/app_queue.c
index e45ea916973639e7b91ea4dd437731eaa9a8458a..9442ce6495e5f5d55c2c49c6e187ce2ba7b8a9a7 100644
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -57,7 +57,7 @@
  */
 
 /*** MODULEINFO
-	<use>res_monitor</use>
+	<use type="module">res_monitor</use>
  ***/
 
 #include "asterisk.h"
diff --git a/apps/app_stack.c b/apps/app_stack.c
index 29c37a20b078acb32c3705fdbdbf030dd94015fb..10a1af48d160416f5e6aa58ea86fd1da9722474f 100644
--- a/apps/app_stack.c
+++ b/apps/app_stack.c
@@ -26,7 +26,7 @@
  */
 
 /*** MODULEINFO
-	<use>res_agi</use>
+	<use type="module">res_agi</use>
  ***/
 
 #include "asterisk.h"
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 5e342bda08335f696880791f2bc358c1321c60ee..971e1879d0a2f9c27cd56780ad999610ccb3fbf8 100644
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -38,8 +38,8 @@
  */
 
 /*** MODULEINFO
-	<use>res_adsi</use>
-	<use>res_smdi</use>
+	<use type="module">res_adsi</use>
+	<use type="module">res_smdi</use>
  ***/
 
 /*** MAKEOPTS
@@ -60,7 +60,7 @@
 		<depend>imap_tk</depend>
 		<conflict>ODBC_STORAGE</conflict>
 		<conflict>FILE_STORAGE</conflict>
-		<use>openssl</use>
+		<use type="external">openssl</use>
 		<defaultenabled>no</defaultenabled>
 	</member>
 </category>
diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c
index 3a0260fbdfe152849ce5cc5312c081444a30dd66..321be66258dc4cdcc03475a96a3163cdb6d8b53d 100644
--- a/channels/chan_dahdi.c
+++ b/channels/chan_dahdi.c
@@ -38,12 +38,12 @@
  */
 
 /*** MODULEINFO
-	<use>res_smdi</use>
+	<use type="module">res_smdi</use>
 	<depend>dahdi</depend>
 	<depend>tonezone</depend>
-	<use>pri</use>
-	<use>ss7</use>
-	<use>openr2</use>
+	<use type="external">pri</use>
+	<use type="external">ss7</use>
+	<use type="external">openr2</use>
  ***/
 
 #include "asterisk.h"
diff --git a/channels/chan_gtalk.c b/channels/chan_gtalk.c
index d8dd736e40368f7a6f75728a717567616c8a8cea..3b08d8ce4e9b04b91923b7d7d2363ae80cf8982e 100644
--- a/channels/chan_gtalk.c
+++ b/channels/chan_gtalk.c
@@ -34,7 +34,7 @@
 /*** MODULEINFO
 	<depend>iksemel</depend>
 	<depend>res_jabber</depend>
-	<use>openssl</use>
+	<use type="external">openssl</use>
  ***/
 
 #include "asterisk.h"
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index f3a097e7d0e4c625b396749506b37282bdb8051c..9f5f32deb60db2bf48cfffbdd3a402f9e45bafcc 100644
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -32,7 +32,7 @@
  */
 
 /*** MODULEINFO
-	<use>crypto</use>
+	<use type="external">crypto</use>
  ***/
 
 #include "asterisk.h"
diff --git a/channels/chan_jingle.c b/channels/chan_jingle.c
index d0a027c3de70f31b71ec4e138a53db4e8bbfe003..53b1a85e40b396352867695da4a2dee555aafded 100644
--- a/channels/chan_jingle.c
+++ b/channels/chan_jingle.c
@@ -30,7 +30,7 @@
 /*** MODULEINFO
 	<depend>iksemel</depend>
 	<depend>res_jabber</depend>
-	<use>openssl</use>
+	<use type="external">openssl</use>
  ***/
 
 #include "asterisk.h"
diff --git a/channels/chan_mgcp.c b/channels/chan_mgcp.c
index 293a2c1feb9362527c18e32f5b2633ac0bcbc27c..bd92fe9b0eaf2ab337025876cdd2d1b0791a93ac 100644
--- a/channels/chan_mgcp.c
+++ b/channels/chan_mgcp.c
@@ -30,7 +30,7 @@
  */
 
 /*** MODULEINFO
-        <use>res_pktccops</use>
+        <use type="module">res_pktccops</use>
  ***/
 
 #include "asterisk.h"
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 3981425e90f5328e656042cf6e40dc8e505f3cd6..18eba23712ebc7743558c8cbfca35ff7d9814c7e 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -162,7 +162,7 @@
  */
 
 /*** MODULEINFO
-	<use>res_crypto</use>
+	<use type="module">res_crypto</use>
 	<depend>chan_local</depend>
  ***/
 
diff --git a/codecs/codec_speex.c b/codecs/codec_speex.c
index d48e21f28d98b3a0d5fbdcdf9b15e9cfb90062db..6554ee000ab20ed596d4930a0d08a9a7633ccc1d 100644
--- a/codecs/codec_speex.c
+++ b/codecs/codec_speex.c
@@ -33,7 +33,7 @@
 /*** MODULEINFO
 	<depend>speex</depend>
 	<depend>speex_preprocess</depend>
-	<use>speexdsp</use>
+	<use type="external">speexdsp</use>
  ***/
 
 #include "asterisk.h"
diff --git a/funcs/func_aes.c b/funcs/func_aes.c
index 64597a9b41ea9af98736cc52b6ec108bd736d612..891106b6f32ec049b0e9830227d4ae2690bf5fc2 100644
--- a/funcs/func_aes.c
+++ b/funcs/func_aes.c
@@ -23,7 +23,7 @@
  */
 
 /*** MODULEINFO
-	<use>crypto</use>
+	<use type="external">crypto</use>
  ***/
 
 #include "asterisk.h"
diff --git a/funcs/func_speex.c b/funcs/func_speex.c
index 51cea99e1df215eaf1f588e5c635e8e4e16e9340..e17e8ca9c00e74cc911d537da13b920ce4773d89 100644
--- a/funcs/func_speex.c
+++ b/funcs/func_speex.c
@@ -33,7 +33,7 @@
 /*** MODULEINFO
 	<depend>speex</depend>
 	<depend>speex_preprocess</depend>
-	<use>speexdsp</use>
+	<use type="external">speexdsp</use>
  ***/
 
 #include "asterisk.h"
diff --git a/pbx/pbx_dundi.c b/pbx/pbx_dundi.c
index 4c52d9d7c059098d7f09f95c32940d9f2dda71aa..26418d760e31b5c971c165e96235a07d3430c756 100644
--- a/pbx/pbx_dundi.c
+++ b/pbx/pbx_dundi.c
@@ -23,7 +23,7 @@
 
 /*** MODULEINFO
 	<depend>zlib</depend>
-	<use>crypto</use>
+	<use type="external">crypto</use>
  ***/
 
 #include "asterisk.h"
diff --git a/res/res_jabber.c b/res/res_jabber.c
index 2d0ffcb3a2f32c875181119ea2fb7aa0d0b3d370..61d436a9244a575c502e9f8312d32cacfd3aee45 100644
--- a/res/res_jabber.c
+++ b/res/res_jabber.c
@@ -32,7 +32,7 @@
 
 /*** MODULEINFO
 	<depend>iksemel</depend>
-	<use>openssl</use>
+	<use type="external">openssl</use>
  ***/
 
 #include "asterisk.h"