Better fix

2 files changed, 12 insertions, 9 deletions

diff --git a/lib/chef/provider/registry_key.rb b/lib/chef/provider/registry_key.rb
index 25fe76cdc1..948fa6c63f 100644
--- a/lib/chef/provider/registry_key.rb
+++ b/lib/chef/provider/registry_key.rb
@@ -25,10 +25,7 @@ require 'chef/provider'
 require 'etc'
 require 'fileutils'
 require 'chef/scan_access_control'
-
-if Chef::Platform::windows?
-  require 'chef/win32/registry'
-end
+require 'chef/win32/registry'
 
 class Chef
 
diff --git a/lib/chef/win32/registry.rb b/lib/chef/win32/registry.rb
index 64cc18f038..6171dc1614 100644
--- a/lib/chef/win32/registry.rb
+++ b/lib/chef/win32/registry.rb
@@ -17,17 +17,23 @@
 # limitations under the License.
 #
 require 'chef/reserved_names'
-require 'win32/registry'
-require 'win32/api'
-require 'chef/win32/api/registry'
+require 'chef/win32/api'
 require 'chef/mixin/wstring'
 
+if RUBY_PLATFORM =~ /mswin|mingw32|windows/
+  require 'chef/win32/api/registry'
+  require 'win32/registry'
+  require 'win32/api'
+end
+
 class Chef
   class Win32
     class Registry
 
-      include Chef::ReservedNames::Win32::API::Registry
-      extend Chef::ReservedNames::Win32::API::Registry
+      if RUBY_PLATFORM =~ /mswin|mingw32|windows/
+        include Chef::ReservedNames::Win32::API::Registry
+        extend Chef::ReservedNames::Win32::API::Registry
+      end
 
       include Chef::Mixin::WideString
       extend Chef::Mixin::WideString