diff --git a/apps/app_mixmonitor.c b/apps/app_mixmonitor.c
index 24ce3b6ef5..b1579a70ac 100644
--- a/apps/app_mixmonitor.c
+++ b/apps/app_mixmonitor.c
@@ -34,6 +34,7 @@
  */
 
 /*** MODULEINFO
+	<use type="module">func_periodic_hook</use>
 	<support_level>core</support_level>
  ***/
 
diff --git a/bridges/bridge_builtin_features.c b/bridges/bridge_builtin_features.c
index 43cf2c9713..37310f6c97 100644
--- a/bridges/bridge_builtin_features.c
+++ b/bridges/bridge_builtin_features.c
@@ -26,6 +26,7 @@
  */
 
 /*** MODULEINFO
+	<use type="module">res_monitor</use>
 	<support_level>core</support_level>
  ***/
 
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index f422aae436..e618ee8075 100644
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -52,7 +52,7 @@
  */
 
 /*** MODULEINFO
-	<use type="external">crypto</use>
+	<use type="module">res_crypto</use>
 	<support_level>core</support_level>
  ***/
 
diff --git a/channels/chan_rtp.c b/channels/chan_rtp.c
index 2ab8414806..4ab496e36c 100644
--- a/channels/chan_rtp.c
+++ b/channels/chan_rtp.c
@@ -28,6 +28,7 @@
  */
 
 /*** MODULEINFO
+	<depend>res_rtp_multicast</depend>
 	<support_level>core</support_level>
  ***/
 
diff --git a/funcs/func_aes.c b/funcs/func_aes.c
index f4a8d06b71..a0e7d5bd95 100644
--- a/funcs/func_aes.c
+++ b/funcs/func_aes.c
@@ -23,7 +23,7 @@
  */
 
 /*** MODULEINFO
-	<use type="external">crypto</use>
+	<use type="module">res_crypto</use>
 	<support_level>core</support_level>
  ***/
 
diff --git a/pbx/pbx_dundi.c b/pbx/pbx_dundi.c
index ff4fa3f304..bd999e42a4 100644
--- a/pbx/pbx_dundi.c
+++ b/pbx/pbx_dundi.c
@@ -32,7 +32,7 @@
 
 /*** MODULEINFO
 	<depend>zlib</depend>
-	<use type="external">crypto</use>
+	<use type="module">res_crypto</use>
 	<support_level>extended</support_level>
  ***/
 
diff --git a/res/ari/resource_events.c b/res/ari/resource_events.c
index 535ce70eea..0281446767 100644
--- a/res/ari/resource_events.c
+++ b/res/ari/resource_events.c
@@ -23,6 +23,11 @@
  * \author David M. Lee, II <dlee@digium.com>
  */
 
+/*** MODULEINFO
+	<depend type="module">res_http_websocket</depend>
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/res/res_agi.c b/res/res_agi.c
index d7ea3510c2..3ea0cd329a 100644
--- a/res/res_agi.c
+++ b/res/res_agi.c
@@ -25,6 +25,7 @@
  */
 
 /*** MODULEINFO
+	<depend>res_speech</depend>
 	<support_level>core</support_level>
  ***/
 
diff --git a/res/res_ari.c b/res/res_ari.c
index e4b50ab117..006e25db18 100644
--- a/res/res_ari.c
+++ b/res/res_ari.c
@@ -73,6 +73,7 @@
 
 /*** MODULEINFO
 	<depend type="module">res_http_websocket</depend>
+	<depend type="module">res_stasis</depend>
 	<support_level>core</support_level>
  ***/
 
diff --git a/res/res_pjsip.c b/res/res_pjsip.c
index 04fd603a45..1fce19b8a3 100644
--- a/res/res_pjsip.c
+++ b/res/res_pjsip.c
@@ -51,6 +51,7 @@
 	<depend>res_sorcery_config</depend>
 	<depend>res_sorcery_memory</depend>
 	<depend>res_sorcery_astdb</depend>
+	<use type="module">res_statsd</use>
 	<support_level>core</support_level>
  ***/
 
diff --git a/res/res_pjsip_outbound_publish.c b/res/res_pjsip_outbound_publish.c
index a9f92331be..1c73a09779 100644
--- a/res/res_pjsip_outbound_publish.c
+++ b/res/res_pjsip_outbound_publish.c
@@ -18,6 +18,7 @@
 
 /*** MODULEINFO
 	<depend>pjproject</depend>
+	<depend>res_pjproject</depend>
 	<depend>res_pjsip</depend>
 	<support_level>core</support_level>
  ***/
diff --git a/res/res_pjsip_outbound_registration.c b/res/res_pjsip_outbound_registration.c
index 0fed59fdce..731a1a9398 100644
--- a/res/res_pjsip_outbound_registration.c
+++ b/res/res_pjsip_outbound_registration.c
@@ -19,6 +19,7 @@
 /*** MODULEINFO
 	<depend>pjproject</depend>
 	<depend>res_pjsip</depend>
+	<use type="module">res_statsd</use>
 	<support_level>core</support_level>
  ***/
 
diff --git a/res/res_pjsip_publish_asterisk.c b/res/res_pjsip_publish_asterisk.c
index fa5e4ced71..72e1e4d7e4 100644
--- a/res/res_pjsip_publish_asterisk.c
+++ b/res/res_pjsip_publish_asterisk.c
@@ -20,6 +20,7 @@
 	<depend>pjproject</depend>
 	<depend>res_pjsip</depend>
 	<depend>res_pjsip_outbound_publish</depend>
+	<depend>res_pjsip_pubsub</depend>
 	<support_level>core</support_level>
  ***/
 
diff --git a/tests/test_utils.c b/tests/test_utils.c
index e4f6e0a524..98cf063dbe 100644
--- a/tests/test_utils.c
+++ b/tests/test_utils.c
@@ -27,6 +27,8 @@
 
 /*** MODULEINFO
 	<depend>TEST_FRAMEWORK</depend>
+	<use type="module">res_agi</use>
+	<use type="module">res_crypto</use>
 	<support_level>core</support_level>
  ***/