diff --git a/features.module b/features.module
index 86a8a58..8fe7aa4 100644
--- a/features.module
+++ b/features.module
@@ -339,7 +339,7 @@ function features_include_defaults($components = NULL, $reset = FALSE) {
   if (!isset($include_components) || $reset) {
     $include_components = features_get_components();
     foreach ($include_components as $component => $info) {
-      if ($component !== 'views' && !isset($info['api']) && (!isset($info['default_file']) || $info['default_file'] !== FEATURES_DEFAULTS_INCLUDED)) {
+      if (!isset($info['default_file']) || $info['default_file'] !== FEATURES_DEFAULTS_INCLUDED) {
         unset($include_components[$component]);
       }
     }
@@ -356,7 +356,7 @@ function features_include_defaults($components = NULL, $reset = FALSE) {
   foreach ($components as $component) {
     if (isset($include_components[$component]) && (!isset($included[$component]) || $reset)) {
       $info = $include_components[$component];
-      // Inclusion of defaults for Views.
+      // Inclusion of ctools components.
       if (isset($info['api'], $info['module'], $info['current_version'])) {
         ctools_include('plugins');
         ctools_plugin_api_include($info['module'], $info['api'], $info['current_version'], $info['current_version']);
@@ -365,7 +365,8 @@ function features_include_defaults($components = NULL, $reset = FALSE) {
       else {
         $features = isset($features) ? $features : features_get_features(NULL, $reset);
         foreach ($features as $feature) {
-          module_load_include('inc', $feature->name, "{$feature->name}.features.{$component}");
+          $filename = isset($info['default_file']) && $info['default_file'] == FEATURES_DEFAULTS_CUSTOM ? $info['default_filename'] : "features.{$component}";
+          module_load_include('inc', $feature->name, "{$feature->name}.$filename");
         }
       }
       $included[$component] = TRUE;