diff --git a/manifests/files.pp b/manifests/files.pp
index 44130ae492dc8f31109707bc7accc0a74c4bd427..03e44bacc785cd7c061d1bec11184fc42666c782 100644
--- a/manifests/files.pp
+++ b/manifests/files.pp
@@ -1,19 +1,19 @@
-class postfix::files (
-  $smtp_listen,
-  $root_mail_recipient,
-  $use_amavisd,
-  $use_dovecot_lda,
-  $use_schleuder,
-  $use_sympa,
-  $mail_user,
-  $myorigin,
-  $inet_interfaces,
-  $master_smtp,
-  $master_smtps,
-  $master_submission,
-) {
+class postfix::files {
   include postfix::params
 
+  $inet_interfaces = $postfix::inet_interfaces
+  $mail_user = $postfix::mail_user
+  $master_smtp = $postfix::master_smtp
+  $master_smtps = $postfix::master_smtps
+  $master_submission = $postfix::master_submission
+  $myorigin = $postfix::myorigin
+  $root_mail_recipient = $postfix::root_mail_recipient
+  $smtp_listen = $postfix::smtp_listen
+  $use_amavisd = $postfix::use_amavisd
+  $use_dovecot_lda = $postfix::use_dovecot_lda
+  $use_schleuder = $postfix::use_schleuder
+  $use_sympa = $postfix::use_sympa
+
   file { '/etc/mailname':
     ensure  => present,
     content => "${::fqdn}\n",
diff --git a/manifests/init.pp b/manifests/init.pp
index d04d03a3f3c47d23b17dfb030025dd626fa503f1..118f48b92e2e5aafd0bfbf6fcf59f1e413ef4703 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -97,20 +97,7 @@ class postfix (
   }
 
   class { 'postfix::packages': } ->
-  class { 'postfix::files':
-    inet_interfaces     => $inet_interfaces,
-    mail_user           => $mail_user,
-    master_smtp         => $master_smtp,
-    master_smtps        => $master_smtps,
-    master_submission   => $master_submission,
-    myorigin            => $myorigin,
-    root_mail_recipient => $root_mail_recipient,
-    smtp_listen         => $_smtp_listen,
-    use_amavisd         => $use_amavisd,
-    use_dovecot_lda     => $use_dovecot_lda,
-    use_schleuder       => $use_schleuder,
-    use_sympa           => $use_sympa,
-    } ~>
+  class { 'postfix::files': } ~>
   class { 'postfix::service': } ->
   Class['postfix']