removing includes from puppetmaster.pp