diff --git a/lib/msf/core/opt_base.rb b/lib/msf/core/opt_base.rb
index 63369c3f09..566f53703f 100644
--- a/lib/msf/core/opt_base.rb
+++ b/lib/msf/core/opt_base.rb
@@ -5,19 +5,6 @@ require 'rex/socket'
 
 module Msf
 
-  autoload :Opt, 'msf/core/opt'
-
-  autoload :OptAddress, 'msf/core/opt_address'
-  autoload :OptAddressRange, 'msf/core/opt_address_range'
-  autoload :OptBool, 'msf/core/opt_bool'
-  autoload :OptEnum, 'msf/core/opt_enum'
-  autoload :OptInt, 'msf/core/opt_int'
-  autoload :OptPath, 'msf/core/opt_path'
-  autoload :OptPort, 'msf/core/opt_port'
-  autoload :OptRaw, 'msf/core/opt_raw'
-  autoload :OptRegexp, 'msf/core/opt_regexp'
-  autoload :OptString, 'msf/core/opt_string'
-
   ###
   #
   # The base class for all options.
diff --git a/lib/msf/core/option_container.rb b/lib/msf/core/option_container.rb
index f52f7cc909..fced7cf9e3 100644
--- a/lib/msf/core/option_container.rb
+++ b/lib/msf/core/option_container.rb
@@ -1,7 +1,21 @@
 # -*- coding: binary -*-
 
 module Msf
-  require 'msf/core/opt_base'
+
+  autoload :Opt, 'msf/core/opt'
+
+  autoload :OptBase, 'msf/core/opt_base'
+
+  autoload :OptAddress, 'msf/core/opt_address'
+  autoload :OptAddressRange, 'msf/core/opt_address_range'
+  autoload :OptBool, 'msf/core/opt_bool'
+  autoload :OptEnum, 'msf/core/opt_enum'
+  autoload :OptInt, 'msf/core/opt_int'
+  autoload :OptPath, 'msf/core/opt_path'
+  autoload :OptPort, 'msf/core/opt_port'
+  autoload :OptRaw, 'msf/core/opt_raw'
+  autoload :OptRegexp, 'msf/core/opt_regexp'
+  autoload :OptString, 'msf/core/opt_string'
 
   #
   # The options purpose in life is to associate named options with arbitrary