Index: src/bp-activity/bp-activity-loader.php
===================================================================
--- src/bp-activity/bp-activity-loader.php
+++ src/bp-activity/bp-activity-loader.php
@@ -53,13 +53,16 @@
 			'actions',
 			'screens',
 			'filters',
-			'classes',
 			'template',
 			'functions',
 			'notifications',
 			'cache'
 		);
 
+		if ( ! buddypress()->do_autoload ) {
+			$includes[] = 'classes';
+		}
+
 		// Load Akismet support if Akismet is configured.
 		$akismet_key = bp_get_option( 'wordpress_api_key' );
 
Index: src/bp-blogs/bp-blogs-loader.php
===================================================================
--- src/bp-blogs/bp-blogs-loader.php
+++ src/bp-blogs/bp-blogs-loader.php
@@ -125,7 +125,6 @@
 			'cache',
 			'actions',
 			'screens',
-			'classes',
 			'template',
 			'filters',
 			'activity',
@@ -136,6 +135,10 @@
 			$includes[] = 'widgets';
 		}
 
+		if ( ! buddypress()->do_autoload ) {
+			$includes[] = 'classes';
+		}
+
 		// Include the files.
 		parent::includes( $includes );
 	}
Index: src/bp-friends/bp-friends-loader.php
===================================================================
--- src/bp-friends/bp-friends-loader.php
+++ src/bp-friends/bp-friends-loader.php
@@ -46,7 +46,6 @@
 			'actions',
 			'screens',
 			'filters',
-			'classes',
 			'activity',
 			'template',
 			'functions',
@@ -54,6 +53,10 @@
 			'widgets',
 		);
 
+		if ( ! buddypress()->do_autoload ) {
+			$includes[] = 'classes';
+		}
+
 		parent::includes( $includes );
 	}
 
Index: src/bp-groups/bp-groups-loader.php
===================================================================
--- src/bp-groups/bp-groups-loader.php
+++ src/bp-groups/bp-groups-loader.php
@@ -111,7 +111,6 @@
 			'actions',
 			'filters',
 			'screens',
-			'classes',
 			'widgets',
 			'activity',
 			'template',
@@ -124,6 +123,10 @@
 			$includes[] = 'admin';
 		}
 
+		if ( ! buddypress()->do_autoload ) {
+			$includes[] = 'classes';
+		}
+
 		parent::includes( $includes );
 	}
 
Index: src/bp-loader.php
===================================================================
--- src/bp-loader.php
+++ src/bp-loader.php
@@ -101,6 +101,14 @@
 	 */
 	public $active_components = array();
 
+	/**
+	 * Whether autoload is in use.
+	 *
+	 * @since 2.5.0
+	 * @var bool
+	 */
+	public $do_autoload = false;
+
 	/** Option Overload *******************************************************/
 
 	/**
@@ -457,6 +465,10 @@
 	 * @uses is_admin() If in WordPress admin, load additional file.
 	 */
 	private function includes() {
+		if ( function_exists( 'spl_autoload_register' ) ) {
+			spl_autoload_register( array( $this, 'autoload' ) );
+			$this->do_autoload = true;
+		}
 
 		// Load the WP abstraction file so BuddyPress can run on all WordPress setups.
 		require( $this->plugin_dir . 'bp-core/bp-core-wpabstraction.php' );
@@ -478,7 +490,6 @@
 		require( $this->plugin_dir . 'bp-core/bp-core-cssjs.php'            );
 		require( $this->plugin_dir . 'bp-core/bp-core-update.php'           );
 		require( $this->plugin_dir . 'bp-core/bp-core-options.php'          );
-		require( $this->plugin_dir . 'bp-core/bp-core-classes.php'          );
 		require( $this->plugin_dir . 'bp-core/bp-core-taxonomy.php'         );
 		require( $this->plugin_dir . 'bp-core/bp-core-filters.php'          );
 		require( $this->plugin_dir . 'bp-core/bp-core-attachments.php'      );
@@ -494,6 +505,10 @@
 		require( $this->plugin_dir . 'bp-core/bp-core-loader.php'           );
 		require( $this->plugin_dir . 'bp-core/bp-core-customizer-email.php' );
 
+		if ( ! $this->do_autoload ) {
+			require( $this->plugin_dir . 'bp-core/bp-core-classes.php' );
+		}
+
 		// Skip or load deprecated content
 		if ( false !== $this->load_deprecated ) {
 			require( $this->plugin_dir . 'bp-core/deprecated/1.2.php' );
@@ -511,6 +526,79 @@
 	}
 
 	/**
+	 * Autoload classes.
+	 *
+	 * @since 2.5.0
+	 *
+	 * @param string $class
+	 */
+	public function autoload( $class ) {
+		$class_parts = explode( '_', strtolower( $class ) );
+
+		if ( 'bp' !== $class_parts[0] ) {
+			return;
+		}
+
+		$components = array(
+			'activity',
+			'blogs',
+			'core',
+			'friends',
+			'groups',
+			'members',
+			'messages',
+			'notifications',
+			'xprofile',
+		);
+
+		// These classes don't have a name that matches their component.
+		$irregular_map = array(
+			'BP_Attachment_Avatar'         => 'core',
+			'BP_Attachment_Cover_Image'    => 'core',
+			'BP_Attachment'                => 'core',
+			'BP_Button'                    => 'core',
+			'BP_Date_Query'                => 'core',
+			'BP_Email_Delivery'            => 'core',
+			'BP_Email_Recipient'           => 'core',
+			'BP_Email'                     => 'core',
+			'BP_Embed'                     => 'core',
+			'BP_Media_Extractor'           => 'core',
+			'BP_Members_Suggestions'       => 'core',
+			'BP_PHPMailer'                 => 'core',
+			'BP_Recursive_Query'           => 'core',
+			'BP_Suggestions'               => 'core',
+			'BP_User_Query'                => 'core',
+			'BP_Walker_Nav_Menu_Checklist' => 'core',
+			'BP_Walker_Nav_Menu_Menu'      => 'core',
+
+			'BP_Group_Extension'    => 'groups',
+			'BP_Group_Member_Query' => 'groups',
+
+			'BP_Signup' => 'members',
+		);
+
+		$component = null;
+
+		// First check to see if the class is one without a properly namespaced name.
+		if ( isset( $irregular_map[ $class ] ) ) {
+			$component = $irregular_map[ $class ];
+
+		// Next chunk is usually the component name.
+		} elseif ( in_array( $class_parts[1], $components, true ) ) {
+			$component = $class_parts[1];
+		}
+
+		if ( ! $component ) {
+			return;
+		}
+
+		// Sanitize class name.
+		$class = strtolower( str_replace( '_', '-', $class ) );
+
+		require dirname( __FILE__ ) . "/bp-{$component}/classes/class-{$class}.php";
+	}
+
+	/**
 	 * Set up the default hooks and actions.
 	 *
 	 * @since 1.6.0
Index: src/bp-members/bp-members-loader.php
===================================================================
--- src/bp-members/bp-members-loader.php
+++ src/bp-members/bp-members-loader.php
@@ -54,7 +54,6 @@
 		// Always include these files.
 		$includes = array(
 			'actions',
-			'classes',
 			'filters',
 			'screens',
 			'template',
@@ -68,6 +67,10 @@
 			$includes[] = 'activity';
 		}
 
+		if ( ! buddypress()->do_autoload ) {
+			$includes[] = 'classes';
+		}
+
 		// Include these only if in admin.
 		if ( is_admin() ) {
 			$includes[] = 'admin';
Index: src/bp-messages/bp-messages-loader.php
===================================================================
--- src/bp-messages/bp-messages-loader.php
+++ src/bp-messages/bp-messages-loader.php
@@ -60,7 +60,6 @@
 			'cache',
 			'actions',
 			'screens',
-			'classes',
 			'filters',
 			'template',
 			'functions',
@@ -68,6 +67,10 @@
 			'widgets',
 		);
 
+		if ( ! buddypress()->do_autoload ) {
+			$includes[] = 'classes';
+		}
+
 		// Conditional includes.
 		if ( bp_is_active( $this->id, 'star' ) ) {
 			$includes[] = 'star';
Index: src/bp-notifications/bp-notifications-loader.php
===================================================================
--- src/bp-notifications/bp-notifications-loader.php
+++ src/bp-notifications/bp-notifications-loader.php
@@ -45,7 +45,6 @@
 	public function includes( $includes = array() ) {
 		$includes = array(
 			'actions',
-			'classes',
 			'screens',
 			'adminbar',
 			'template',
@@ -53,6 +52,10 @@
 			'cache',
 		);
 
+		if ( ! buddypress()->do_autoload ) {
+			$includes[] = 'classes';
+		}
+
 		parent::includes( $includes );
 	}
 
Index: src/bp-xprofile/bp-xprofile-loader.php
===================================================================
--- src/bp-xprofile/bp-xprofile-loader.php
+++ src/bp-xprofile/bp-xprofile-loader.php
@@ -66,7 +66,6 @@
 			'activity',
 			'screens',
 			'caps',
-			'classes',
 			'filters',
 			'settings',
 			'template',
@@ -78,6 +77,10 @@
 			$includes[] = 'admin';
 		}
 
+		if ( ! buddypress()->do_autoload ) {
+			$includes[] = 'classes';
+		}
+
 		parent::includes( $includes );
 	}
 
