diff --git a/defaultconfig.module b/defaultconfig.module
index fc6e70c..5e38a16 100644
--- a/defaultconfig.module
+++ b/defaultconfig.module
@@ -290,16 +290,13 @@ function defaultconfig_include() {
 
 function defaultconfig_component_include($component, $module = FALSE) {
   // Include file if necessary.
-  if (isset($component['group'])) {
-    if ($module) {
+  $modules = $module ? array($module) : module_list();
+  // Include all necessary files.
+  foreach ($modules as $module) {
+    module_load_include('features.defaultconfig.inc', $module);
+    if (!empty($component['group'])) {
       module_load_include($component['group'] . '.inc', $module);
     }
-    else {
-      // Include all necessary files.
-      foreach (module_list() as $module) {
-        module_load_include($component['group'] . '.inc', $module);
-      }
-    }
   }
 }
 
@@ -320,6 +317,7 @@ function defaultconfig_component_rebuild($component, $module = FALSE) {
   drupal_alter($component['hook'], $defaults, $module);
   // Have a generic alter for all components.
   drupal_alter('defaultconfig_component', $defaults, $component);
+  watchdog('defaultconfig', 'Rebuilding @component for @module.', array('@component' => $component['name'], '@module' => $module ? $module : 'all modules'));
   $component['rebuild callback']($component, $defaults, $module);
 }
 
