diff --git a/app/models/user.rb b/app/models/user.rb
index 12322dca6..92f4f92a4 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -2,9 +2,7 @@
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
-require File.join(Rails.root, 'lib/diaspora/user/friending')
-require File.join(Rails.root, 'lib/diaspora/user/querying')
-require File.join(Rails.root, 'lib/diaspora/user/receiving')
+require File.join(Rails.root, 'lib/diaspora/user')
 require File.join(Rails.root, 'lib/salmon/salmon')
 
 class InvitedUserValidator < ActiveModel::Validator
@@ -20,9 +18,7 @@ end
 class User
   include MongoMapper::Document
   plugin MongoMapper::Devise
-  include Diaspora::UserModules::Friending
-  include Diaspora::UserModules::Querying
-  include Diaspora::UserModules::Receiving
+  include Diaspora::UserModules
   include Encryptor::Private
   QUEUE = MessageHandler.new
 
diff --git a/lib/diaspora/user.rb b/lib/diaspora/user.rb
new file mode 100644
index 000000000..94da947f8
--- /dev/null
+++ b/lib/diaspora/user.rb
@@ -0,0 +1,11 @@
+require File.join(Rails.root, 'lib/diaspora/user/friending')
+require File.join(Rails.root, 'lib/diaspora/user/querying')
+require File.join(Rails.root, 'lib/diaspora/user/receiving')
+
+module Diaspora
+  module UserModules
+    include Friending
+    include Querying
+    include Receiving
+  end
+end