No more free lunch

3 files changed, 4 insertions, 4 deletions

diff --git a/activesupport/lib/active_support.rb b/activesupport/lib/active_support.rb
index 21b730fa0c..84bf372163 100644
--- a/activesupport/lib/active_support.rb
+++ b/activesupport/lib/active_support.rb
@@ -50,10 +50,7 @@ module ActiveSupport
   autoload :XmlMini, 'active_support/xml_mini'
 end
 
-require 'active_support/core/all'
-
 require 'active_support/vendor'
-require 'active_support/core_ext'
 require 'active_support/dependencies'
 require 'active_support/json'
 
diff --git a/activesupport/lib/active_support/core/all.rb b/activesupport/lib/active_support/core/all.rb
index f397f48e9c..55e8b4cfac 100644
--- a/activesupport/lib/active_support/core/all.rb
+++ b/activesupport/lib/active_support/core/all.rb
@@ -1,3 +1,4 @@
+require 'active_support/core_ext'
 require 'active_support/core'
 Dir["#{File.dirname(__FILE__)}/*.rb"].sort.each do |path|
   require "active_support/core/#{File.basename(path, '.rb')}"
diff --git a/activesupport/lib/active_support/core_ext/kernel/requires.rb b/activesupport/lib/active_support/core_ext/kernel/requires.rb
index 323fea49fe..d2238898d6 100644
--- a/activesupport/lib/active_support/core_ext/kernel/requires.rb
+++ b/activesupport/lib/active_support/core_ext/kernel/requires.rb
@@ -1,3 +1,5 @@
+require 'active_support/core_ext/kernel/reporting'
+
 module Kernel
   # Require a library with fallback to RubyGems.  Warnings during library
   # loading are silenced to increase signal/noise for application warnings.
@@ -21,4 +23,4 @@ module Kernel
       end
     end
   end
-end
\ No newline at end of file
+end