7 files changed, 7 insertions, 5 deletions
diff --git a/lib/chef/application/apply.rb b/lib/chef/application/apply.rb
index 3641f7a3f3..2c36adc191 100644
--- a/lib/chef/application/apply.rb
+++ b/lib/chef/application/apply.rb
@@ -27,7 +27,7 @@ require "fileutils" unless defined?(FileUtils)
 require "tempfile" unless defined?(Tempfile)
 require_relative "../providers"
 require_relative "../resources"
-require "chef-utils"
+require "chef-utils/dist"
 require "license_acceptance/cli_flags/mixlib_cli"
 
 class Chef::Application::Apply < Chef::Application
diff --git a/lib/chef/application/client.rb b/lib/chef/application/client.rb
index 70477722f4..77b8de3d0d 100644
--- a/lib/chef/application/client.rb
+++ b/lib/chef/application/client.rb
@@ -21,6 +21,7 @@ require_relative "base"
 require_relative "../handler/error_report"
 require_relative "../workstation_config_loader"
 autoload :URI, "uri"
+require "chef-utils"
 module Mixlib
   module Authentication
     autoload :Log, "mixlib/authentication"
diff --git a/lib/chef/application/exit_code.rb b/lib/chef/application/exit_code.rb
index ed83d51b59..c634ba2b58 100644
--- a/lib/chef/application/exit_code.rb
+++ b/lib/chef/application/exit_code.rb
@@ -22,7 +22,7 @@ class Chef
     # These are the exit codes defined in Chef RFC 062
     # https://github.com/chef/chef-rfc/blob/master/rfc062-exit-status.md
     class ExitCode
-      require "chef-utils"
+      require "chef-utils/dist/infra"
 
       # -1 is defined as DEPRECATED_FAILURE in RFC 062, so it is
       # not enumerated in an active constant.
diff --git a/lib/chef/application/knife.rb b/lib/chef/application/knife.rb
index af6d352937..d4e3d179b2 100644
--- a/lib/chef/application/knife.rb
+++ b/lib/chef/application/knife.rb
@@ -22,7 +22,7 @@ require "ohai/config"
 module Net
   autoload :HTTP, File.expand_path("../monkey_patches/net_http", __dir__)
 end
-require "chef-utils"
+require "chef-utils/dist"
 
 class Chef::Application::Knife < Chef::Application
 
diff --git a/lib/chef/application/solo.rb b/lib/chef/application/solo.rb
index e514c7063f..d495f3ff8d 100644
--- a/lib/chef/application/solo.rb
+++ b/lib/chef/application/solo.rb
@@ -21,6 +21,7 @@ require_relative "../../chef"
 require_relative "client"
 require "fileutils" unless defined?(FileUtils)
 require "pathname" unless defined?(Pathname)
+require "chef-utils"
 
 # DO NOT MAKE EDITS, see Chef::Application::Base
 #
diff --git a/lib/chef/application/windows_service.rb b/lib/chef/application/windows_service.rb
index 49ab3d2855..8332b1e747 100644
--- a/lib/chef/application/windows_service.rb
+++ b/lib/chef/application/windows_service.rb
@@ -29,7 +29,7 @@ require "socket" unless defined?(Socket)
 require "uri" unless defined?(URI)
 require "win32/daemon"
 require_relative "../mixin/shell_out"
-require "chef-utils"
+require "chef-utils/dist/infra"
 
 class Chef
   class Application
diff --git a/lib/chef/application/windows_service_manager.rb b/lib/chef/application/windows_service_manager.rb
index d28028bcc1..5bbebd62e2 100644
--- a/lib/chef/application/windows_service_manager.rb
+++ b/lib/chef/application/windows_service_manager.rb
@@ -21,7 +21,7 @@ if RUBY_PLATFORM.match?(/mswin|mingw32|windows/)
 end
 require_relative "../config"
 require "mixlib/cli" unless defined?(Mixlib::CLI)
-require "chef-utils"
+require "chef-utils/dist/infra"
 
 class Chef
   class Application