diff --git a/lib/msf/core/payload.rb b/lib/msf/core/payload.rb
index 76b82ccb53..55fdc250c7 100644
--- a/lib/msf/core/payload.rb
+++ b/lib/msf/core/payload.rb
@@ -12,7 +12,7 @@ module Msf
 ###
 class Payload < Msf::Module
 
-  require 'rex/payloads'
+  require 'rex/payloads/win32'
 
   # Platform specific includes
   require 'metasploit/framework/compiler/mingw'
diff --git a/lib/rex/payloads.rb b/lib/rex/payloads.rb
index eedb44076b..ef1a1895ae 100644
--- a/lib/rex/payloads.rb
+++ b/lib/rex/payloads.rb
@@ -1,2 +1,4 @@
 # -*- coding: binary -*-
-require 'rex/payloads/win32'
+module Rex::Payloads
+
+end
diff --git a/lib/rex/payloads/meterpreter.rb b/lib/rex/payloads/meterpreter.rb
index 0da289f3c8..59f1561a28 100644
--- a/lib/rex/payloads/meterpreter.rb
+++ b/lib/rex/payloads/meterpreter.rb
@@ -1,4 +1,4 @@
-
+require 'rex/payloads'
 module Rex::Payloads::Meterpreter
 
-end
\ No newline at end of file
+end