Avoid global mutation. Closes #851.

2 files changed, 7 insertions, 2 deletions

diff --git a/lib/ohai/dsl/plugin.rb b/lib/ohai/dsl/plugin.rb
index adcb6f82..176b4f07 100644
--- a/lib/ohai/dsl/plugin.rb
+++ b/lib/ohai/dsl/plugin.rb
@@ -22,6 +22,7 @@ require "ohai/mixin/os"
 require "ohai/mixin/command"
 require "ohai/mixin/seconds_to_human"
 require "ohai/hints"
+require "ohai/util/file_helper"
 
 module Ohai
 
@@ -82,6 +83,10 @@ module Ohai
       include Ohai::Mixin::Command
       include Ohai::Mixin::SecondsToHuman
 
+      # Pending next major release of Ohai.
+      # See https://github.com/chef/ohai/issues/851 for details.
+      include Ohai::Util::FileHelper
+
       attr_reader :data
 
       def initialize(data)
diff --git a/lib/ohai/plugins/darwin/virtualization.rb b/lib/ohai/plugins/darwin/virtualization.rb
index e7b4a91d..61abae7d 100644
--- a/lib/ohai/plugins/darwin/virtualization.rb
+++ b/lib/ohai/plugins/darwin/virtualization.rb
@@ -20,9 +20,9 @@
 
 require "ohai/util/file_helper"
 
-include Ohai::Util::FileHelper
-
 Ohai.plugin(:Virtualization) do
+  include Ohai::Util::FileHelper
+
   provides "virtualization"
 
   def vboxmanage_exists?