diff --git a/manifests/fragment.pp b/manifests/fragment.pp
index a71977d..489e26c 100644
--- a/manifests/fragment.pp
+++ b/manifests/fragment.pp
@@ -7,7 +7,7 @@
   $content = undef,
 ) {
 
-  include rsyslog
+  include ::rsyslog
 
   validate_re($ensure, ['file','absent'])
   validate_string($content)
diff --git a/manifests/init.pp b/manifests/init.pp
index 47147c0..3e98bf7 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -189,7 +189,7 @@
         /^6\.*/: {
           $default_pid_file        = '/var/run/syslogd.pid'
           $sysconfig_erb           = 'sysconfig.rhel6.erb'
-          $default_syslogd_options = ''
+          $default_syslogd_options = undef
           $default_mod_imjournal   = false
         }
         /^7\.*/: {
@@ -218,7 +218,7 @@
       $default_logrotate_present = true
       $default_service_name      = 'syslog'
       $default_sysconfig_path    = '/etc/sysconfig/syslog'
-      $default_syslogd_options   = ''
+      $default_syslogd_options   = undef
       $default_pid_file          = '/var/run/rsyslogd.pid'
       $default_mod_imjournal     = false
       case $::operatingsystemrelease {
@@ -468,7 +468,7 @@
     # logging servers do not log elsewhere
     $remote_logging_real = false
 
-    include common
+    include ::common
 
     common::mkdir_p { $log_dir: }