diff --git a/lib/octokit.rb b/lib/octokit.rb
index f093d2185..c46bf548b 100644
--- a/lib/octokit.rb
+++ b/lib/octokit.rb
@@ -1,10 +1,23 @@
-require 'octokit/client'
-require 'octokit/enterprise_admin_client'
-require 'octokit/enterprise_management_console_client'
 require 'octokit/default'
+require 'octokit/configurable'
 
 # Ruby toolkit for the GitHub API
 module Octokit
+  autoload(:Client, File.join(__dir__, 'octokit/client'))
+  autoload(:EnterpriseAdminClient, File.join(__dir__, 'octokit/enterprise_admin_client'))
+  autoload(:EnterpriseManagementConsoleClient, File.join(__dir__, 'octokit/enterprise_management_console_client'))
+
+  autoload(:Warnable, File.join(__dir__, 'octokit/warnable'))
+  autoload(:Connection, File.join(__dir__, 'octokit/connection'))
+  autoload(:Authentication, File.join(__dir__, 'octokit/authentication'))
+  autoload(:Arguments, File.join(__dir__, 'octokit/arguments'))
+  autoload(:RepoArguments, File.join(__dir__, 'octokit/repo_arguments'))
+  autoload(:Gist, File.join(__dir__, 'octokit/gist'))
+  autoload(:RateLimit, File.join(__dir__, 'octokit/rate_limit'))
+  autoload(:Repository, File.join(__dir__, 'octokit/repository'))
+  autoload(:User, File.join(__dir__, 'octokit/user'))
+  autoload(:Organization, File.join(__dir__, 'octokit/organization'))
+  autoload(:Preview, File.join(__dir__, 'octokit/preview'))
 
   class << self
     include Octokit::Configurable
diff --git a/lib/octokit/client.rb b/lib/octokit/client.rb
index b6d4a480f..dc45a39c4 100644
--- a/lib/octokit/client.rb
+++ b/lib/octokit/client.rb
@@ -1,15 +1,3 @@
-require 'octokit/connection'
-require 'octokit/warnable'
-require 'octokit/arguments'
-require 'octokit/repo_arguments'
-require 'octokit/configurable'
-require 'octokit/authentication'
-require 'octokit/gist'
-require 'octokit/rate_limit'
-require 'octokit/repository'
-require 'octokit/user'
-require 'octokit/organization'
-require 'octokit/preview'
 require 'octokit/client/actions_secrets'
 require 'octokit/client/actions_workflows'
 require 'octokit/client/actions_workflow_runs'
diff --git a/lib/octokit/connection.rb b/lib/octokit/connection.rb
index fbe71ef1f..3b5014df0 100644
--- a/lib/octokit/connection.rb
+++ b/lib/octokit/connection.rb
@@ -1,5 +1,5 @@
 require 'sawyer'
-require 'octokit/authentication'
+
 module Octokit
 
   # Network layer for API clients.
diff --git a/lib/octokit/enterprise_admin_client.rb b/lib/octokit/enterprise_admin_client.rb
index 64a1c56f9..ae29a2f94 100644
--- a/lib/octokit/enterprise_admin_client.rb
+++ b/lib/octokit/enterprise_admin_client.rb
@@ -1,6 +1,3 @@
-require 'octokit/connection'
-require 'octokit/configurable'
-require 'octokit/warnable'
 require 'octokit/enterprise_admin_client/admin_stats'
 require 'octokit/enterprise_admin_client/license'
 require 'octokit/enterprise_admin_client/orgs'
diff --git a/lib/octokit/enterprise_management_console_client.rb b/lib/octokit/enterprise_management_console_client.rb
index 0310ead83..82d300a0d 100644
--- a/lib/octokit/enterprise_management_console_client.rb
+++ b/lib/octokit/enterprise_management_console_client.rb
@@ -1,6 +1,3 @@
-require 'octokit/configurable'
-require 'octokit/connection'
-require 'octokit/warnable'
 require 'octokit/enterprise_management_console_client/management_console'
 
 module Octokit