diff --git a/Library/Homebrew/superenv/macsystem.rb b/Library/Homebrew/superenv/macsystem.rb
index bf09564627..7dbb4794a7 100644
--- a/Library/Homebrew/superenv/macsystem.rb
+++ b/Library/Homebrew/superenv/macsystem.rb
@@ -1,10 +1,8 @@
-# new code because I don't really trust the Xcode code now having researched it more
-module MacSystem extend self
+module MacSystem
+  extend self
+
   def xcode_clt_installed?
-    # TODO: handle 10.9 CLT which has headers under:
-    # /Library/Developer/CommandLineTools/usr/include
-    File.executable? "/usr/bin/clang" and File.executable? "/usr/bin/lldb" and
-      File.executable? "/usr/bin/make" and File.directory? "/usr/include"
+    MacOS::CLT.installed?
   end
 
   def xcode43_without_clt?
@@ -12,7 +10,6 @@ module MacSystem extend self
   end
 
   def x11_prefix
-    @x11_prefix ||= %W[/opt/X11 /usr/X11
-      #{MacOS.sdk_path}/usr/X11].find{|path| File.directory? "#{path}/include" }
+    MacOS::X11.prefix
   end
 end