diff --git a/Gemfile b/Gemfile
index 3d9d4ad8..b0b2d45f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -6,6 +6,15 @@ group :development, :test do
 
   gem 'metadata-json-lint'
   gem 'puppet-lint-param-docs'
+  gem 'puppet-lint-absolute_classname-check'
+  gem 'puppet-lint-absolute_template_path'
+  gem 'puppet-lint-trailing_newline-check'
+
+  # Puppet 4.x related lint checks
+  gem 'puppet-lint-unquoted_string-check'
+  gem 'puppet-lint-leading_zero-check'
+  gem 'puppet-lint-variable_contains_upcase'
+  gem 'puppet-lint-numericvariable'
 
   gem 'json'
   gem 'webmock'
diff --git a/examples/site.pp b/examples/site.pp
index 97087dc5..0e2b79c4 100644
--- a/examples/site.pp
+++ b/examples/site.pp
@@ -4,26 +4,26 @@ node default {
   }
 
   # First, install a mysql server
-  class { 'mysql::server': }
+  class { '::mysql::server': }
 
   # And create the database
-  class { 'heat::db::mysql':
+  class { '::heat::db::mysql':
     password => 'heat',
   }
 
   # Common class
-  class { 'heat':
+  class { '::heat':
     # The keystone_password parameter is mandatory
     keystone_password => 'password',
     sql_connection    => 'mysql://heat:heat@localhost/heat'
   }
 
   # Install heat-engine
-  class { 'heat::engine':
+  class { '::heat::engine':
     auth_encryption_key => 'whatever-key-you-like',
   }
 
   # Install the heat-api service
-  class { 'heat::api': }
+  class { '::heat::api': }
 
 }
diff --git a/manifests/api.pp b/manifests/api.pp
index 2c4fdf98..916493b0 100644
--- a/manifests/api.pp
+++ b/manifests/api.pp
@@ -53,9 +53,9 @@ class heat::api (
   $key_file          = false,
 ) {
 
-  include heat
-  include heat::params
-  include heat::policy
+  include ::heat
+  include ::heat::params
+  include ::heat::policy
 
   Heat_config<||> ~> Service['heat-api']
   Class['heat::policy'] -> Service['heat-api']
diff --git a/manifests/api_cfn.pp b/manifests/api_cfn.pp
index 18d720a6..175d9c14 100644
--- a/manifests/api_cfn.pp
+++ b/manifests/api_cfn.pp
@@ -56,9 +56,9 @@ class heat::api_cfn (
   $key_file          = false,
 ) {
 
-  include heat
-  include heat::params
-  include heat::policy
+  include ::heat
+  include ::heat::params
+  include ::heat::policy
 
   Heat_config<||> ~> Service['heat-api-cfn']
   Class['heat::policy'] -> Service['heat-api-cfn']
diff --git a/manifests/api_cloudwatch.pp b/manifests/api_cloudwatch.pp
index a527adcc..d57fe523 100644
--- a/manifests/api_cloudwatch.pp
+++ b/manifests/api_cloudwatch.pp
@@ -55,9 +55,9 @@ class heat::api_cloudwatch (
   $key_file          = false,
 ) {
 
-  include heat
-  include heat::params
-  include heat::policy
+  include ::heat
+  include ::heat::params
+  include ::heat::policy
 
   Heat_config<||> ~> Service['heat-api-cloudwatch']
   Class['heat::policy'] -> Service['heat-api-cloudwatch']
diff --git a/manifests/client.pp b/manifests/client.pp
index 3e1248e5..b594b0a7 100644
--- a/manifests/client.pp
+++ b/manifests/client.pp
@@ -11,7 +11,7 @@ class heat::client (
   $ensure = 'present'
 ) {
 
-  include heat::params
+  include ::heat::params
 
   package { 'python-heatclient':
     ensure => $ensure,
diff --git a/manifests/engine.pp b/manifests/engine.pp
index 2a710e46..c3aea1de 100644
--- a/manifests/engine.pp
+++ b/manifests/engine.pp
@@ -67,7 +67,7 @@ class heat::engine (
   $configure_delegated_roles     = true,                  #DEPRECATED
 ) {
 
-  include heat::params
+  include ::heat::params
 
   Heat_config<||> ~> Service['heat-engine']
 
diff --git a/manifests/init.pp b/manifests/init.pp
index a6f27d0a..d4fa1dac 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -222,7 +222,7 @@ class heat(
   $keystone_protocol           = 'http',
 ) {
 
-  include heat::params
+  include ::heat::params
 
   if $kombu_ssl_ca_certs and !$rabbit_use_ssl {
     fail('The kombu_ssl_ca_certs parameter requires rabbit_use_ssl to be set to true')
diff --git a/manifests/keystone/domain.pp b/manifests/keystone/domain.pp
index 463d8041..1758070a 100644
--- a/manifests/keystone/domain.pp
+++ b/manifests/keystone/domain.pp
@@ -38,7 +38,7 @@ class heat::keystone::domain (
   $domain_password   = 'changeme',
 ) {
 
-  include heat::params
+  include ::heat::params
 
   $cmd_evn = [
     "OS_USERNAME=${keystone_admin}",