diff --git a/lib/puppet/provider/firewalld_direct_chain/firewall_cmd.rb b/lib/puppet/provider/firewalld_direct_chain/firewall_cmd.rb
index ba8db37b..129a6024 100644
--- a/lib/puppet/provider/firewalld_direct_chain/firewall_cmd.rb
+++ b/lib/puppet/provider/firewalld_direct_chain/firewall_cmd.rb
@@ -1,5 +1,5 @@
 require 'puppet'
-require 'puppet/provider/firewalld'
+require File.join(File.dirname(__FILE__), '..', 'firewalld.rb')
 
 Puppet::Type.type(:firewalld_direct_chain).provide(:firewall_cmd, :parent => Puppet::Provider::Firewalld) do
   desc "Provider for managing firewalld direct chains using firewall-cmd"
diff --git a/lib/puppet/provider/firewalld_direct_passthrough/firewall_cmd.rb b/lib/puppet/provider/firewalld_direct_passthrough/firewall_cmd.rb
index 27065633..b0bbd147 100644
--- a/lib/puppet/provider/firewalld_direct_passthrough/firewall_cmd.rb
+++ b/lib/puppet/provider/firewalld_direct_passthrough/firewall_cmd.rb
@@ -1,5 +1,5 @@
 require 'puppet'
-require 'puppet/provider/firewalld'
+require File.join(File.dirname(__FILE__), '..', 'firewalld.rb')
 
 Puppet::Type.type(:firewalld_direct_passthrough).provide(
   :firewalld_cmd,
diff --git a/lib/puppet/provider/firewalld_direct_purge/firewall_cmd.rb b/lib/puppet/provider/firewalld_direct_purge/firewall_cmd.rb
index 58292bc2..7e61d7fd 100644
--- a/lib/puppet/provider/firewalld_direct_purge/firewall_cmd.rb
+++ b/lib/puppet/provider/firewalld_direct_purge/firewall_cmd.rb
@@ -1,5 +1,5 @@
 require 'puppet'
-require 'puppet/provider/firewalld'
+require File.join(File.dirname(__FILE__), '..', 'firewalld.rb')
 
 Puppet::Type.type(:firewalld_direct_purge).provide(
   :firewall_cmd,
diff --git a/lib/puppet/provider/firewalld_direct_rule/firewall_cmd.rb b/lib/puppet/provider/firewalld_direct_rule/firewall_cmd.rb
index 79cb8406..25005ae8 100644
--- a/lib/puppet/provider/firewalld_direct_rule/firewall_cmd.rb
+++ b/lib/puppet/provider/firewalld_direct_rule/firewall_cmd.rb
@@ -1,5 +1,5 @@
 require 'puppet'
-require 'puppet/provider/firewalld'
+require File.join(File.dirname(__FILE__), '..', 'firewalld.rb')
 
 Puppet::Type.type(:firewalld_direct_rule).provide(
   :firewall_cmd,
diff --git a/lib/puppet/provider/firewalld_port/firewall_cmd.rb b/lib/puppet/provider/firewalld_port/firewall_cmd.rb
index 6aac41b1..16f679cf 100644
--- a/lib/puppet/provider/firewalld_port/firewall_cmd.rb
+++ b/lib/puppet/provider/firewalld_port/firewall_cmd.rb
@@ -1,5 +1,5 @@
 require 'puppet'
-require 'puppet/provider/firewalld'
+require File.join(File.dirname(__FILE__), '..', 'firewalld.rb')
 
 Puppet::Type.type(:firewalld_port).provide(
   :firewall_cmd,
diff --git a/lib/puppet/provider/firewalld_rich_rule/firewall_cmd.rb b/lib/puppet/provider/firewalld_rich_rule/firewall_cmd.rb
index 0cb30a69..bc0761a3 100644
--- a/lib/puppet/provider/firewalld_rich_rule/firewall_cmd.rb
+++ b/lib/puppet/provider/firewalld_rich_rule/firewall_cmd.rb
@@ -1,5 +1,5 @@
 require 'puppet'
-require 'puppet/provider/firewalld'
+require File.join(File.dirname(__FILE__), '..', 'firewalld.rb')
 
 Puppet::Type.type(:firewalld_rich_rule).provide(
   :firewall_cmd,
diff --git a/lib/puppet/provider/firewalld_service/firewall_cmd.rb b/lib/puppet/provider/firewalld_service/firewall_cmd.rb
index 495259c4..cbb1969c 100644
--- a/lib/puppet/provider/firewalld_service/firewall_cmd.rb
+++ b/lib/puppet/provider/firewalld_service/firewall_cmd.rb
@@ -1,5 +1,5 @@
 require 'puppet'
-require 'puppet/provider/firewalld'
+require File.join(File.dirname(__FILE__), '..', 'firewalld.rb')
 
 Puppet::Type.type(:firewalld_service).provide(
   :firewall_cmd,
diff --git a/lib/puppet/provider/firewalld_zone/firewall_cmd.rb b/lib/puppet/provider/firewalld_zone/firewall_cmd.rb
index 636cc69d..a2dd65f6 100644
--- a/lib/puppet/provider/firewalld_zone/firewall_cmd.rb
+++ b/lib/puppet/provider/firewalld_zone/firewall_cmd.rb
@@ -1,6 +1,6 @@
 require 'puppet'
 require 'puppet/type'
-require 'puppet/provider/firewalld'
+require File.join(File.dirname(__FILE__), '..', 'firewalld.rb')
 
 
 Puppet::Type.type(:firewalld_zone).provide(