diff --git a/beets/__init__.py b/beets/__init__.py
index 90652a037..4c8fa25df 100644
--- a/beets/__init__.py
+++ b/beets/__init__.py
@@ -14,6 +14,8 @@
 
 from __future__ import absolute_import, unicode_literals
 
+import os
+
 import beets.library
 from beets.util import confit
 
@@ -23,3 +25,13 @@ __author__ = 'Adrian Sampson <adrian@radbox.org>'
 Library = beets.library.Library
 
 config = confit.LazyConfig('beets', __name__)
+
+try:
+    included_filenames = config['include'].get(list)
+except confit.NotFoundError:
+    included_filenames = []
+
+for filename in included_filenames:
+    filename = os.path.join(config.config_dir(), filename)
+    if os.path.isfile(filename):
+        config.set_file(filename)
diff --git a/beets/util/confit.py b/beets/util/confit.py
index 6c3dd3cb2..4c5b30cb6 100644
--- a/beets/util/confit.py
+++ b/beets/util/confit.py
@@ -779,16 +779,6 @@ class Configuration(RootView):
         if os.path.isfile(filename):
             self.add(ConfigSource(load_yaml(filename) or {}, filename))
 
-        try:
-            included_filenames = self['include'].get(list)
-        except NotFoundError:
-            included_filenames = []
-
-        for filename in included_filenames:
-            filename = os.path.join(self.config_dir(), filename)
-            if os.path.isfile(filename):
-                self.add(ConfigSource(load_yaml(filename) or {}, filename))
-
     def _add_default_source(self):
         """Add the package's default configuration settings. This looks
         for a YAML file located inside the package for the module