1 files changed, 4 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller.rb b/actionpack/lib/action_controller.rb
index cbcb35b686..0eaf630bbe 100755
--- a/actionpack/lib/action_controller.rb
+++ b/actionpack/lib/action_controller.rb
@@ -49,8 +49,9 @@ require 'action_controller/caching'
 require 'action_controller/components'
 require 'action_controller/verification'
 require 'action_controller/streaming'
-require 'action_controller/auto_complete'
 require 'action_controller/session_management'
+require 'action_controller/macros/auto_complete'
+require 'action_controller/macros/in_place_editing'
 
 require 'action_view'
 ActionController::Base.template_class = ActionView::Base
@@ -71,6 +72,7 @@ ActionController::Base.class_eval do
   include ActionController::Components
   include ActionController::Verification
   include ActionController::Streaming
-  include ActionController::AutoComplete
   include ActionController::SessionManagement
+  include ActionController::Macros::AutoComplete
+  include ActionController::Macros::InPlaceEditing
 end