7 files changed, 44 insertions, 44 deletions
diff --git a/lib/chef/application/apply.rb b/lib/chef/application/apply.rb
index 715e0152d2..31713b32e7 100644
--- a/lib/chef/application/apply.rb
+++ b/lib/chef/application/apply.rb
@@ -17,16 +17,16 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require "chef"
-require "chef/application"
-require "chef/client"
-require "chef/config"
-require "chef/log"
+require_relative ".."
+require_relative ""
+require_relative "../client"
+require_relative "../config"
+require_relative "../log"
 require "fileutils"
 require "tempfile"
-require "chef/providers"
-require "chef/resources"
-require "chef/dist"
+require_relative "../providers"
+require_relative "../resources"
+require_relative "../dist"
 
 class Chef::Application::Apply < Chef::Application
 
diff --git a/lib/chef/application/client.rb b/lib/chef/application/client.rb
index 2c63a54f33..94f681b709 100644
--- a/lib/chef/application/client.rb
+++ b/lib/chef/application/client.rb
@@ -17,19 +17,19 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require "chef/application"
-require "chef/client"
-require "chef/config"
-require "chef/daemon"
-require "chef/log"
-require "chef/config_fetcher"
-require "chef/handler/error_report"
-require "chef/workstation_config_loader"
-require "chef/mixin/shell_out"
+require_relative ""
+require_relative "../client"
+require_relative "../config"
+require_relative "../daemon"
+require_relative "../log"
+require_relative "../config_fetcher"
+require_relative "../handler/error_report"
+require_relative "../workstation_config_loader"
+require_relative "../mixin/shell_out"
 require "chef-config/mixin/dot_d"
 require "mixlib/archive"
 require "uri"
-require "chef/dist"
+require_relative "../dist"
 require "license_acceptance/cli_flags/mixlib_cli"
 
 class Chef::Application::Client < Chef::Application
diff --git a/lib/chef/application/exit_code.rb b/lib/chef/application/exit_code.rb
index 5330db2456..7001cb1837 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/dist"
+      require_relative "../dist"
 
       # -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 52d447891f..eb6581c2d8 100644
--- a/lib/chef/application/knife.rb
+++ b/lib/chef/application/knife.rb
@@ -15,12 +15,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require "chef/knife"
-require "chef/application"
+require_relative "../knife"
+require_relative ""
 require "mixlib/log"
 require "ohai/config"
 require "chef/monkey_patches/net_http.rb"
-require "chef/dist"
+require_relative "../dist"
 
 class Chef::Application::Knife < Chef::Application
 
diff --git a/lib/chef/application/solo.rb b/lib/chef/application/solo.rb
index b1957fbf7c..67acee8de8 100644
--- a/lib/chef/application/solo.rb
+++ b/lib/chef/application/solo.rb
@@ -16,20 +16,20 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require "chef"
-require "chef/application"
-require "chef/application/client"
-require "chef/client"
-require "chef/config"
-require "chef/daemon"
-require "chef/log"
-require "chef/config_fetcher"
+require_relative ".."
+require_relative ""
+require_relative "client"
+require_relative "../client"
+require_relative "../config"
+require_relative "../daemon"
+require_relative "../log"
+require_relative "../config_fetcher"
 require "fileutils"
-require "chef/mixin/shell_out"
+require_relative "../mixin/shell_out"
 require "pathname"
 require "chef-config/mixin/dot_d"
 require "mixlib/archive"
-require "chef/dist"
+require_relative "../dist"
 
 class Chef::Application::Solo < Chef::Application
   include Chef::Mixin::ShellOut
diff --git a/lib/chef/application/windows_service.rb b/lib/chef/application/windows_service.rb
index cba0dc9781..6bbc7c6d0b 100644
--- a/lib/chef/application/windows_service.rb
+++ b/lib/chef/application/windows_service.rb
@@ -16,20 +16,20 @@
 # limitations under the License.
 #
 
-require "chef"
-require "chef/monologger"
-require "chef/application"
-require "chef/client"
-require "chef/config"
-require "chef/handler/error_report"
-require "chef/log"
-require "chef/http"
+require_relative ".."
+require_relative "../monologger"
+require_relative ""
+require_relative "../client"
+require_relative "../config"
+require_relative "../handler/error_report"
+require_relative "../log"
+require_relative "../http"
 require "mixlib/cli"
 require "socket"
 require "uri"
 require "win32/daemon"
-require "chef/mixin/shell_out"
-require "chef/dist"
+require_relative "../mixin/shell_out"
+require_relative "../dist"
 
 class Chef
   class Application
diff --git a/lib/chef/application/windows_service_manager.rb b/lib/chef/application/windows_service_manager.rb
index 2646d98624..4a2bfa258e 100644
--- a/lib/chef/application/windows_service_manager.rb
+++ b/lib/chef/application/windows_service_manager.rb
@@ -19,9 +19,9 @@
 if RUBY_PLATFORM =~ /mswin|mingw32|windows/
   require "win32/service"
 end
-require "chef/config"
+require_relative "../config"
 require "mixlib/cli"
-require "chef/dist"
+require_relative "../dist"
 
 class Chef
   class Application