diff --git a/src/bp-activity/bp-activity-embeds.php b/src/bp-activity/bp-activity-embeds.php
index ae69a9622..9dfb92efc 100644
--- a/src/bp-activity/bp-activity-embeds.php
+++ b/src/bp-activity/bp-activity-embeds.php
@@ -88,6 +88,7 @@ add_action( 'embed_head', 'bp_activity_embed_add_inline_styles', 20 );
  *
  * @param  int $activity_id The activity ID.
  * @return bool
+ * @global BP_Activity_Template $activities_template The main activity template loop class.
  */
 function bp_activity_embed_has_activity( $activity_id = 0 ) {
 	global $activities_template;
diff --git a/src/bp-activity/bp-activity-filters.php b/src/bp-activity/bp-activity-filters.php
index 3367e75f2..e039ba09d 100644
--- a/src/bp-activity/bp-activity-filters.php
+++ b/src/bp-activity/bp-activity-filters.php
@@ -407,6 +407,8 @@ function bp_activity_make_nofollow_filter( $text ) {
  *     for all available parameters.
  * }
  * @return string $excerpt The truncated text.
+ * 
+ * @global $activities_template.
  */
 function bp_activity_truncate_entry( $text, $args = array() ) {
 	global $activities_template;
diff --git a/src/bp-activity/bp-activity-template.php b/src/bp-activity/bp-activity-template.php
index 7391ea5f2..ca87ceffd 100644
--- a/src/bp-activity/bp-activity-template.php
+++ b/src/bp-activity/bp-activity-template.php
@@ -409,6 +409,8 @@ function bp_activity_load_more_link() {
 	 * @since 11.0.0 Adds the `offset_lower` query arg to avoid last displayed activity to be duplicated.
 	 *
 	 * @return string $link
+	 * 
+	 * @global BP_Activity_Template $activities_template The main activity template loop class.
 	 */
 	function bp_get_activity_load_more_link() {
 		global $activities_template;
@@ -2745,6 +2747,8 @@ function bp_activity_thread_permalink() {
 	 *
 	 *
 	 * @return string $link The activity thread permalink.
+	 * 
+	 * @global BP_Activity_Template $activities_template The main activity template loop class.
 	 */
 	function bp_get_activity_thread_permalink() {
 		global $activities_template;
@@ -2776,6 +2780,8 @@ function bp_activity_comment_permalink() {
 	 * @since 1.8.0
 	 *
 	 * @return string $link The activity comment permalink.
+	 * 
+	 * @global BP_Activity_Template $activities_template The main activity template loop class.
 	 */
 	function bp_get_activity_comment_permalink() {
 		global $activities_template;
@@ -3693,6 +3699,8 @@ function bp_activity_comments_user_avatars( $args = array() ) {
  * @since 1.7.0
  *
  * @return bool|array An array of IDs, or false if none are found.
+ * 
+ * @global BP_Activity_Template $activities_template The main activity template loop class.
  */
 function bp_activity_get_comments_user_ids() {
 	global $activities_template;
diff --git a/src/bp-xprofile/bp-xprofile-admin.php b/src/bp-xprofile/bp-xprofile-admin.php
index 999f32b17..fcbecbb34 100644
--- a/src/bp-xprofile/bp-xprofile-admin.php
+++ b/src/bp-xprofile/bp-xprofile-admin.php
@@ -409,6 +409,9 @@ function xprofile_admin_screen( $message = '', $type = 'error' ) {
  * @since 1.0.0
  *
  * @param int|null $group_id Group ID to manage.
+ * 
+ * @global string $message The feedback message to show.
+ * @global string $type The type of feedback message to show.
  */
 function xprofile_admin_manage_group( $group_id = null ) {
 	global $message, $type;
@@ -476,6 +479,9 @@ function xprofile_admin_manage_group( $group_id = null ) {
  * @since 1.0.0
  *
  * @param int $group_id ID of the group to delete.
+ * 
+ * @global string $message The feedback message to show.
+ * @global string $type The type of feedback message to show.
  */
 function xprofile_admin_delete_group( $group_id ) {
 	global $message, $type;
@@ -556,6 +562,9 @@ function xprofile_admin_delete_group_screen( $group_id ) {
  *
  * @param int      $group_id ID of the group.
  * @param int|null $field_id ID of the field being managed.
+ * @global wpdb $wpdb WordPress database object.
+ * @global string $message The feedback message to show.
+ * @global $groups.
  */
 function xprofile_admin_manage_field( $group_id, $field_id = null ) {
 	global $wpdb, $message, $groups;
@@ -1011,6 +1020,7 @@ add_action( 'wp_ajax_xprofile_reorder_groups', 'xprofile_ajax_reorder_field_grou
  * @param object $admin_group Admin group object.
  * @param string $class       Classes to append to output.
  * @param bool   $is_signup   Whether the admin field output is made inside the signup group.
+ * @global $field.
  */
 function xprofile_admin_field( $admin_field, $admin_group, $class = '', $is_signup = false ) {
 	global $field;
diff --git a/src/bp-xprofile/bp-xprofile-cache.php b/src/bp-xprofile/bp-xprofile-cache.php
index 795c59f68..e785a000b 100644
--- a/src/bp-xprofile/bp-xprofile-cache.php
+++ b/src/bp-xprofile/bp-xprofile-cache.php
@@ -53,6 +53,8 @@ function bp_xprofile_get_non_cached_field_ids( $user_id = 0, $field_ids = array(
  * @param array $object_ids Multi-dimensional array of object_ids, keyed by
  *                          object type ('group', 'field', 'data').
  * @return bool
+ * 
+ * @global wpdb $wpdb WordPress database object.
  */
 function bp_xprofile_update_meta_cache( $object_ids = array() ) {
 	global $wpdb;
diff --git a/src/bp-xprofile/classes/class-bp-xprofile-data-template.php b/src/bp-xprofile/classes/class-bp-xprofile-data-template.php
index 27c6e5be9..b7d3e3297 100644
--- a/src/bp-xprofile/classes/class-bp-xprofile-data-template.php
+++ b/src/bp-xprofile/classes/class-bp-xprofile-data-template.php
@@ -301,6 +301,7 @@ class BP_XProfile_Data_Template {
 	 * Sets up the profile group.
 	 *
 	 * @since 1.0.0
+	 * @global $group.
 	 */
 	public function the_profile_group() {
 		global $group;
@@ -392,6 +393,7 @@ class BP_XProfile_Data_Template {
 	 * Set up the profile fields.
 	 *
 	 * @since 1.0.0
+	 * @global $field.
 	 */
 	public function the_profile_field() {
 		global $field;
diff --git a/src/bp-xprofile/classes/class-bp-xprofile-field-type-wordpress.php b/src/bp-xprofile/classes/class-bp-xprofile-field-type-wordpress.php
index 73eac6ab3..08afaae4a 100644
--- a/src/bp-xprofile/classes/class-bp-xprofile-field-type-wordpress.php
+++ b/src/bp-xprofile/classes/class-bp-xprofile-field-type-wordpress.php
@@ -159,6 +159,7 @@ abstract class BP_XProfile_Field_Type_WordPress extends BP_XProfile_Field_Type {
 	 * @param integer $user_id The user ID.
 	 * @param integer $field_id The xProfile field ID.
 	 * @return array An array containing the metadata `id`, `value` and `table_name`.
+	 * @global wpdb $wpdb WordPress database object.
 	 */
 	public function get_field_value( $user_id, $field_id = 0 ) {
 		global $wpdb;