diff --git a/Rakefile b/Rakefile
index 093ed1a141fc6..cf03a842a325e 100644
--- a/Rakefile
+++ b/Rakefile
@@ -25,18 +25,22 @@ require 'rake_tasks/crazy_fun/mappings/rake_mappings'
 require 'rake_tasks/crazy_fun/mappings/ruby_mappings'
 require 'rake_tasks/crazy_fun/mappings/tasks'
 
-# Location of all new methods
+# Location of all new (non-CrazyFun) methods
+require 'rake_tasks/selenium_rake/browsers'
 require 'rake_tasks/selenium_rake/checks'
+require 'rake_tasks/selenium_rake/cpp_formatter'
 require 'rake_tasks/selenium_rake/ie_generator'
 require 'rake_tasks/selenium_rake/java_formatter'
-require 'rake_tasks/selenium_rake/cpp_formatter'
 require 'rake_tasks/selenium_rake/type_definitions_generator'
 
-# Our modifications to the Rake library
+# Our modifications to the Rake / Bazel libraries
+require 'rake/task'
 require 'rake_tasks/rake/task'
 require 'rake_tasks/rake/dsl'
+require 'rake_tasks/bazel/task'
 
-# These are the final items mixed into the global NS, should be namespaced correctly
+# These are the final items mixed into the global NS
+# These need moving into correct namespaces, and not be globally included
 require 'rake_tasks/bazel'
 require 'rake_tasks/copyright'
 require 'rake_tasks/python'
diff --git a/rake_tasks/bazel.rb b/rake_tasks/bazel.rb
index 961c2ac092595..781c506337062 100644
--- a/rake_tasks/bazel.rb
+++ b/rake_tasks/bazel.rb
@@ -1,8 +1,5 @@
 require 'pp'
 require 'open3'
-require 'rake/task'
-require 'rake_tasks/selenium_rake/checks'
-require 'rake_tasks/bazel/task'
 
 module Bazel
   def self.execute(kind, args, target, &block)
diff --git a/rake_tasks/python.rb b/rake_tasks/python.rb
index 32b3ad3b623bc..d3bc3c403d883 100644
--- a/rake_tasks/python.rb
+++ b/rake_tasks/python.rb
@@ -1,4 +1,3 @@
-require 'rake_tasks/selenium_rake/browsers'
 
 def py_exe
   if ENV.key?('python')