diff --git a/lib/cask.rb b/lib/cask.rb
index af6cdea59..5827f509f 100644
--- a/lib/cask.rb
+++ b/lib/cask.rb
@@ -1,21 +1,9 @@
-require 'plist/parser'
 require 'uri'
 
 class Cask; end
+class Cask::CLI; end
 
-require 'cask/cli'
-require 'cask/cli/edit'
-require 'cask/cli/install'
-require 'cask/cli/uninstall'
-require 'cask/cli/linkapps'
-require 'cask/cli/list'
-require 'cask/cli/search'
-require 'cask/actions'
-require 'cask/dsl'
-require 'cask/exceptions'
-require 'cask/installer'
-require 'cask/scopes'
-require 'plist/parser'
+Dir['lib/**/*.rb'].each { |file| require file.sub(/^lib\/(.*).rb$/, '\1') }
 
 class Cask
   include Cask::Actions
diff --git a/lib/cask/installer.rb b/lib/cask/installer.rb
index 6f5325a16..28a13bf15 100644
--- a/lib/cask/installer.rb
+++ b/lib/cask/installer.rb
@@ -22,6 +22,7 @@ class Cask::Installer
 
     def _with_extracted_mountpoints(path)
       if _dmg?(path)
+        require 'plist/parser'
         File.open(path) do |dmg|
           xml_str = `hdiutil mount -plist -nobrowse -readonly -noidme -mountrandom /tmp '#{dmg.path}'`
           hdiutil_info = Plist::parse_xml(xml_str)