Index: src/includes/extend/buddypress/loader.php
===================================================================
--- src/includes/extend/buddypress/loader.php
+++ src/includes/extend/buddypress/loader.php
@@ -74,7 +74,19 @@
 			$includes[] = 'groups.php';
 		}
 
-		parent::includes( $includes );
+		// Require our files if they exist.
+		foreach ( $includes as $file ) {
+			if ( @is_file( $this->path . $file ) ) {
+				require $this->path . $file;
+			}
+		}
+
+		/**
+		 * Hook for plugins to include files, if necessary.
+		 *
+		 * @since 2.1.0 bbPress (r3552)
+		 */
+		do_action( "bp_{$this->id}_includes" );
 	}
 
 	/**