Moved standard library requirements to the files which use them. Cleaned up vagrant.rb quite a bit.

lib/vagrant.rb

@@ -1,8 +1,6 @@
-# First, load the various libs which Vagrant requires
+require 'json'
-%w{tempfile json pathname logger virtualbox net/ssh archive/tar/minitar
+require 'virtualbox'
-  net/scp fileutils mario}.each do |lib|
+require "vagrant/util/glob_loader"
-  require lib
-end
 
 module Vagrant
   class << self
@@ -14,10 +12,8 @@ module Vagrant
   end
 end
 
-# Then load the glob loader, which will handle loading everything else
+# Load them up. One day we'll convert this to autoloads. Today
-require "vagrant/util/glob_loader"
+# is not that day. Low hanging fruit for anyone wishing to do it.
-
-# Load them up
 libdir = File.expand_path("lib/vagrant", Vagrant.source_root)
 Vagrant::GlobLoader.glob_require(libdir, %w{util util/stacked_proc_runner
   downloaders/base config provisioners/base provisioners/chef systems/base

lib/vagrant/action/box/destroy.rb

@@ -1,3 +1,5 @@
+require 'fileutils'
+
 module Vagrant
   class Action
     module Box

lib/vagrant/action/box/unpackage.rb

@@ -1,3 +1,6 @@
+require 'fileutils'
+require 'archive/tar/minitar'
+
 module Vagrant
   class Action
     module Box

lib/vagrant/action/general/package.rb

@@ -1,3 +1,6 @@
+require 'fileutils'
+require 'archive/tar/minitar'
+
 module Vagrant
   class Action
     module General

lib/vagrant/action/vm/export.rb

@@ -1,3 +1,5 @@
+require 'fileutils'
+
 module Vagrant
   class Action
     module VM

lib/vagrant/downloaders/file.rb

@@ -1,3 +1,5 @@
+require 'fileutils'
+
 module Vagrant
   module Downloaders
     # "Downloads" a file to a temporary file. Basically, this downloader

lib/vagrant/environment.rb

@@ -1,3 +1,6 @@
+require 'pathname'
+require 'fileutils'
+
 module Vagrant
   # Represents a single Vagrant environment. This class is responsible
   # for loading all of the Vagrantfile's for the given environment and

lib/vagrant/provisioners/chef_server.rb

@@ -1,3 +1,5 @@
+require 'pathname'
+
 module Vagrant
   module Provisioners
     # This class implements provisioning via chef-client, allowing provisioning

lib/vagrant/ssh.rb

@@ -1,3 +1,7 @@
+require 'net/ssh'
+require 'net/scp'
+require 'mario'
+
 module Vagrant
   # Manages SSH access to a specific environment. Allows an environment to
   # replace the process with SSH itself, run a specific set of commands,

lib/vagrant/util/plain_logger.rb

@@ -1,3 +1,5 @@
+require 'logger'
+
 module Vagrant
   module Util
     # Subclass of the standard library logger which has no format on

lib/vagrant/util/platform.rb

@@ -1,3 +1,5 @@
+require 'mario'
+
 module Vagrant
   module Util
     # This class just contains some platform checking code.

lib/vagrant/util/resource_logger.rb

@@ -1,4 +1,5 @@
 require 'thread'
+require 'mario'
 
 module Vagrant
   module Util