diff --git a/Library/Homebrew/cmd/--env.rb b/Library/Homebrew/cmd/--env.rb
index 668ed02f8c..478cc4c629 100644
--- a/Library/Homebrew/cmd/--env.rb
+++ b/Library/Homebrew/cmd/--env.rb
@@ -1,5 +1,4 @@
-require 'extend/ENV'
-require 'hardware'
+require "extend/ENV"
 
 module Homebrew
   def __env
diff --git a/Library/Homebrew/cmd/postinstall.rb b/Library/Homebrew/cmd/postinstall.rb
index d604167693..52a2c1d470 100644
--- a/Library/Homebrew/cmd/postinstall.rb
+++ b/Library/Homebrew/cmd/postinstall.rb
@@ -1,5 +1,3 @@
-require 'formula_installer'
-
 module Homebrew
   def postinstall
     ARGV.formulae.each {|f| f.post_install }
diff --git a/Library/Homebrew/cmd/test.rb b/Library/Homebrew/cmd/test.rb
index 1b0569723e..35d7fb1e03 100644
--- a/Library/Homebrew/cmd/test.rb
+++ b/Library/Homebrew/cmd/test.rb
@@ -1,7 +1,5 @@
-require 'extend/ENV'
-require 'hardware'
-require 'keg'
-require 'timeout'
+require "extend/ENV"
+require "timeout"
 
 module Homebrew
   TEST_TIMEOUT_SECONDS = 5*60
diff --git a/Library/Homebrew/cmd/versions.rb b/Library/Homebrew/cmd/versions.rb
index 349123d090..ce2f6c5a89 100644
--- a/Library/Homebrew/cmd/versions.rb
+++ b/Library/Homebrew/cmd/versions.rb
@@ -1,4 +1,3 @@
-require "formula"
 require "formula_versions"
 
 module Homebrew
diff --git a/Library/Homebrew/formula_versions.rb b/Library/Homebrew/formula_versions.rb
index feb8cd1a25..bc60ee9790 100644
--- a/Library/Homebrew/formula_versions.rb
+++ b/Library/Homebrew/formula_versions.rb
@@ -1,3 +1,5 @@
+require "formula"
+
 class FormulaVersions
   IGNORED_EXCEPTIONS = [
     ArgumentError, NameError, SyntaxError, TypeError,