diff --git a/lib/fog/aws/core.rb b/lib/fog/aws/core.rb
index 1b2d5a15e..da4090c03 100644
--- a/lib/fog/aws/core.rb
+++ b/lib/fog/aws/core.rb
@@ -1,4 +1,6 @@
 require 'fog/core'
+require 'fog/xml'
+require 'fog/json'
 require 'fog/aws/credential_fetcher'
 require 'fog/aws/region_methods'
 require 'fog/aws/signaturev4'
diff --git a/lib/fog/bare_metal_cloud/core.rb b/lib/fog/bare_metal_cloud/core.rb
index 4d24249f8..8c6532f68 100644
--- a/lib/fog/bare_metal_cloud/core.rb
+++ b/lib/fog/bare_metal_cloud/core.rb
@@ -1,4 +1,5 @@
 require 'fog/core'
+require 'fog/xml'
 
 module Fog
   module BareMetalCloud
diff --git a/lib/fog/bluebox/core.rb b/lib/fog/bluebox/core.rb
index 3d9f4679f..9834a88cd 100644
--- a/lib/fog/bluebox/core.rb
+++ b/lib/fog/bluebox/core.rb
@@ -1,4 +1,5 @@
 require 'fog/core'
+require 'fog/json'
 
 module Fog
   module Bluebox
diff --git a/lib/fog/clodo/core.rb b/lib/fog/clodo/core.rb
index b3b180711..27e63463e 100644
--- a/lib/fog/clodo/core.rb
+++ b/lib/fog/clodo/core.rb
@@ -1,4 +1,5 @@
 require 'fog/core'
+require 'fog/json'
 
 module Fog
   module Clodo
diff --git a/lib/fog/cloudsigma/core.rb b/lib/fog/cloudsigma/core.rb
index 2ea9a8f00..86f181c8d 100644
--- a/lib/fog/cloudsigma/core.rb
+++ b/lib/fog/cloudsigma/core.rb
@@ -1,4 +1,5 @@
 require 'fog/core'
+require 'fog/json'
 
 module Fog
   module CloudSigma
diff --git a/lib/fog/cloudstack/core.rb b/lib/fog/cloudstack/core.rb
index 41ec52e41..c916dc0c3 100644
--- a/lib/fog/cloudstack/core.rb
+++ b/lib/fog/cloudstack/core.rb
@@ -1,4 +1,5 @@
 require 'fog/core'
+require 'fog/json'
 require 'uri'
 
 module Fog
diff --git a/lib/fog/digitalocean/core.rb b/lib/fog/digitalocean/core.rb
index 033c2c15a..082f73e32 100644
--- a/lib/fog/digitalocean/core.rb
+++ b/lib/fog/digitalocean/core.rb
@@ -1,4 +1,5 @@
 require 'fog/core'
+require 'fog/json'
 
 module Fog
   module DigitalOcean
diff --git a/lib/fog/dnsimple/core.rb b/lib/fog/dnsimple/core.rb
index 9e2ef3669..148cda5fc 100644
--- a/lib/fog/dnsimple/core.rb
+++ b/lib/fog/dnsimple/core.rb
@@ -1,4 +1,5 @@
 require 'fog/core'
+require 'fog/json'
 
 module Fog
   module DNSimple
diff --git a/lib/fog/dnsmadeeasy/core.rb b/lib/fog/dnsmadeeasy/core.rb
index a8454b95c..3efa1a188 100644
--- a/lib/fog/dnsmadeeasy/core.rb
+++ b/lib/fog/dnsmadeeasy/core.rb
@@ -1,4 +1,5 @@
 require 'fog/core'
+require 'fog/json'
 
 module Fog
   module DNSMadeEasy
diff --git a/lib/fog/dreamhost/core.rb b/lib/fog/dreamhost/core.rb
index caf3288d3..8d1d4c0fe 100644
--- a/lib/fog/dreamhost/core.rb
+++ b/lib/fog/dreamhost/core.rb
@@ -1,4 +1,5 @@
 require 'fog/core'
+require 'fog/json'
 
 module Fog
   module Dreamhost
diff --git a/lib/fog/dynect/core.rb b/lib/fog/dynect/core.rb
index ab4e126e7..796d9084d 100644
--- a/lib/fog/dynect/core.rb
+++ b/lib/fog/dynect/core.rb
@@ -1,6 +1,7 @@
 require 'nokogiri'
 
 require 'fog/core'
+require 'fog/xml'
 require 'fog/core/parser'
 
 module Fog
diff --git a/lib/fog/glesys/core.rb b/lib/fog/glesys/core.rb
index 28923f12c..ec54dc038 100644
--- a/lib/fog/glesys/core.rb
+++ b/lib/fog/glesys/core.rb
@@ -1,4 +1,5 @@
 require 'fog/core'
+require 'fog/json'
 
 module Fog
   module Glesys
diff --git a/lib/fog/go_grid/core.rb b/lib/fog/go_grid/core.rb
index f4a7abf68..6cf895dca 100644
--- a/lib/fog/go_grid/core.rb
+++ b/lib/fog/go_grid/core.rb
@@ -1,4 +1,5 @@
 require 'fog/core'
+require 'fog/json'
 
 module Fog
   module GoGrid
diff --git a/lib/fog/google/core.rb b/lib/fog/google/core.rb
index a588f942e..d7cbeb4e3 100644
--- a/lib/fog/google/core.rb
+++ b/lib/fog/google/core.rb
@@ -1,4 +1,5 @@
 require 'fog/core'
+require 'fog/xml'
 
 module Fog
   module Google
diff --git a/lib/fog/hp/core.rb b/lib/fog/hp/core.rb
index ed16fc8f1..38a384dc9 100644
--- a/lib/fog/hp/core.rb
+++ b/lib/fog/hp/core.rb
@@ -1,4 +1,5 @@
 require 'fog/core'
+require 'fog/json'
 require 'fog/hp/simple_http_instrumentor'
 
 module Fog
diff --git a/lib/fog/ibm/core.rb b/lib/fog/ibm/core.rb
index ab365d819..5f982e5ec 100644
--- a/lib/fog/ibm/core.rb
+++ b/lib/fog/ibm/core.rb
@@ -1,4 +1,5 @@
 require 'fog/core'
+require 'fog/json'
 
 module Fog
   module IBM
diff --git a/lib/fog/internet_archive/core.rb b/lib/fog/internet_archive/core.rb
index d5de970d2..ec7f3421b 100644
--- a/lib/fog/internet_archive/core.rb
+++ b/lib/fog/internet_archive/core.rb
@@ -1,4 +1,5 @@
 require 'fog/core'
+require 'fog/xml'
 require 'fog/internet_archive/signaturev4'
 
 module Fog
diff --git a/lib/fog/joyent/core.rb b/lib/fog/joyent/core.rb
index 6935cc5ce..debd99f96 100644
--- a/lib/fog/joyent/core.rb
+++ b/lib/fog/joyent/core.rb
@@ -1,4 +1,5 @@
 require 'fog/core'
+require 'fog/json'
 
 module Fog
   module Joyent
diff --git a/lib/fog/libvirt/core.rb b/lib/fog/libvirt/core.rb
index 5b5029a32..d7ec9aba3 100644
--- a/lib/fog/libvirt/core.rb
+++ b/lib/fog/libvirt/core.rb
@@ -1,4 +1,6 @@
 require 'fog/core'
+require 'fog/xml'
+require 'fog/json'
 
 module Fog
   module Libvirt
diff --git a/lib/fog/linode/core.rb b/lib/fog/linode/core.rb
index d3a13492b..948a19a4c 100644
--- a/lib/fog/linode/core.rb
+++ b/lib/fog/linode/core.rb
@@ -1,4 +1,5 @@
 require 'fog/core'
+require 'fog/json'
 
 module Fog
   module Linode
diff --git a/lib/fog/ninefold/core.rb b/lib/fog/ninefold/core.rb
index 4fef92cb5..42cf0a1c9 100644
--- a/lib/fog/ninefold/core.rb
+++ b/lib/fog/ninefold/core.rb
@@ -1,4 +1,5 @@
 require 'fog/core'
+require 'fog/json'
 
 module Fog
   module Ninefold
diff --git a/lib/fog/openstack/core.rb b/lib/fog/openstack/core.rb
index 87a3613b0..5d708a41a 100644
--- a/lib/fog/openstack/core.rb
+++ b/lib/fog/openstack/core.rb
@@ -1,4 +1,5 @@
 require 'fog/core'
+require 'fog/json'
 
 module Fog
   module OpenStack
diff --git a/lib/fog/ovirt/core.rb b/lib/fog/ovirt/core.rb
index 2c1dbe4ba..5d85afe87 100644
--- a/lib/fog/ovirt/core.rb
+++ b/lib/fog/ovirt/core.rb
@@ -1,4 +1,5 @@
 require 'fog/core'
+require 'fog/xml'
 
 module Fog
   module Ovirt
diff --git a/lib/fog/rackspace/core.rb b/lib/fog/rackspace/core.rb
index 93bb30a97..86b00a3a5 100644
--- a/lib/fog/rackspace/core.rb
+++ b/lib/fog/rackspace/core.rb
@@ -1,4 +1,5 @@
 require 'fog/core'
+require 'fog/json'
 require 'fog/rackspace/mock_data'
 require 'fog/rackspace/service'
 require 'fog/rackspace/errors'
diff --git a/lib/fog/rage4/core.rb b/lib/fog/rage4/core.rb
index 68d2d6b4e..cc6b41d4b 100644
--- a/lib/fog/rage4/core.rb
+++ b/lib/fog/rage4/core.rb
@@ -1,4 +1,5 @@
 require 'fog/core'
+require 'fog/json'
 
 module Fog
   module Rage4
diff --git a/lib/fog/riakcs/core.rb b/lib/fog/riakcs/core.rb
index 1061df7f8..51413a2a0 100644
--- a/lib/fog/riakcs/core.rb
+++ b/lib/fog/riakcs/core.rb
@@ -1,4 +1,5 @@
 require 'fog/core'
+require 'fog/json'
 
 module Fog
   module RiakCS
diff --git a/lib/fog/serverlove/core.rb b/lib/fog/serverlove/core.rb
index 00caddcb0..ecf261b88 100644
--- a/lib/fog/serverlove/core.rb
+++ b/lib/fog/serverlove/core.rb
@@ -1,4 +1,5 @@
 require 'fog/core'
+require 'fog/json'
 
 module Fog
   module Serverlove
diff --git a/lib/fog/storm_on_demand/core.rb b/lib/fog/storm_on_demand/core.rb
index 90c3de266..f3ad8ae1e 100644
--- a/lib/fog/storm_on_demand/core.rb
+++ b/lib/fog/storm_on_demand/core.rb
@@ -1,4 +1,5 @@
 require 'fog/core'
+require 'fog/json'
 
 module Fog
   module StormOnDemand
diff --git a/lib/fog/vcloud_director/core.rb b/lib/fog/vcloud_director/core.rb
index f6187ba2d..6cedf425c 100644
--- a/lib/fog/vcloud_director/core.rb
+++ b/lib/fog/vcloud_director/core.rb
@@ -1,4 +1,5 @@
 require 'fog/core'
+require 'fog/xml'
 
 module Fog
   module VcloudDirector
diff --git a/lib/fog/voxel/core.rb b/lib/fog/voxel/core.rb
index 03b8c8f3b..f99d18e2f 100644
--- a/lib/fog/voxel/core.rb
+++ b/lib/fog/voxel/core.rb
@@ -1,4 +1,5 @@
 require 'fog/core'
+require 'fog/xml'
 require 'digest/md5'
 
 module Fog
diff --git a/lib/fog/xenserver/core.rb b/lib/fog/xenserver/core.rb
index 05a42bb85..5df39cd43 100644
--- a/lib/fog/xenserver/core.rb
+++ b/lib/fog/xenserver/core.rb
@@ -1,4 +1,5 @@
 require 'fog/core'
+require 'fog/xml'
 
 module Fog
   module XenServer
diff --git a/lib/fog/zerigo/core.rb b/lib/fog/zerigo/core.rb
index 2ab9be3ca..0b82845e1 100644
--- a/lib/fog/zerigo/core.rb
+++ b/lib/fog/zerigo/core.rb
@@ -1,4 +1,5 @@
 require 'fog/core'
+require 'fog/xml'
 
 module Fog
   module Zerigo