diff --git a/apps/app_queue.c b/apps/app_queue.c
index e45ea91697..9442ce6495 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 29c37a20b0..10a1af48d1 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 5e342bda08..971e1879d0 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 3a0260fbdf..321be66258 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 d8dd736e40..3b08d8ce4e 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 f3a097e7d0..9f5f32deb6 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 d0a027c3de..53b1a85e40 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 293a2c1feb..bd92fe9b0e 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 3981425e90..18eba23712 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 d48e21f28d..6554ee000a 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 64597a9b41..891106b6f3 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 51cea99e1d..e17e8ca9c0 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 4c52d9d7c0..26418d760e 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 2d0ffcb3a2..61d436a924 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"