diff --git a/lemonldap-ng-handler/MANIFEST b/lemonldap-ng-handler/MANIFEST
index 0eac6b428..818831b9c 100644
--- a/lemonldap-ng-handler/MANIFEST
+++ b/lemonldap-ng-handler/MANIFEST
@@ -13,7 +13,6 @@ lib/Lemonldap/NG/Handler/API/Nginx.pm
 lib/Lemonldap/NG/Handler/CGI.pm
 lib/Lemonldap/NG/Handler/Reload.pm
 lib/Lemonldap/NG/Handler/Main.pm
-lib/Lemonldap/NG/Handler/Main/Headers.pm
 lib/Lemonldap/NG/Handler/Main/Jail.pm
 lib/Lemonldap/NG/Handler/Main/Logger.pm
 lib/Lemonldap/NG/Handler/Main/PostForm.pm
diff --git a/lemonldap-ng-handler/lib/Lemonldap/NG/Handler/Main.pm b/lemonldap-ng-handler/lib/Lemonldap/NG/Handler/Main.pm
index 706d49cb9..f5c848752 100755
--- a/lemonldap-ng-handler/lib/Lemonldap/NG/Handler/Main.pm
+++ b/lemonldap-ng-handler/lib/Lemonldap/NG/Handler/Main.pm
@@ -61,7 +61,6 @@ BEGIN {
 
 use Lemonldap::NG::Handler::Reload;
 use Lemonldap::NG::Handler::Main::Jail;
-use Lemonldap::NG::Handler::Main::Headers;
 use Lemonldap::NG::Handler::Main::PostForm;
 use Lemonldap::NG::Handler::Main::Logger;
 
@@ -315,8 +314,7 @@ sub run ($$) {
             'debug', $r );
         $class->updateStatus( $r, 'SKIP' );
         $class->hideCookie($r);
-        Lemonldap::NG::Handler::Main::Headers->cleanHeaders( $r,
-            $tsv->{forgeHeaders}, $tsv->{headerList} );
+        $class->cleanHeaders($r);
         return OK;
     }
 
@@ -342,8 +340,7 @@ sub run ($$) {
         $class->updateStatus( $r, 'OK', $datas->{ $tsv->{whatToTrace} } );
 
         # ACCOUNTING (2. Inform remote application)
-        Lemonldap::NG::Handler::Main::Headers->sendHeaders( $r,
-            $tsv->{forgeHeaders} );
+        $class->sendHeaders( $r );
 
         # Store local macros
         if ( keys %$datas > $kc and $tsv->{sessionCache} ) {
@@ -377,8 +374,7 @@ sub run ($$) {
             'debug', $r );
         $class->updateStatus( $r, 'UNPROTECT' );
         $class->hideCookie($r);
-        Lemonldap::NG::Handler::Main::Headers->cleanHeaders( $r,
-            $tsv->{forgeHeaders}, $tsv->{headerList} );
+        $class->cleanHeaders($r);
         return OK;
     }
 
@@ -607,4 +603,26 @@ sub isUnprotected {
     return $tsv->{defaultProtection}->{$vhost};
 }
 
+## @rmethod void sendHeaders()
+# Launch function compiled by forgeHeadersInit() for the current virtual host
+sub sendHeaders {
+    my ( $class, $r ) = @_;
+    my $vhost = Lemonldap::NG::Handler::API->hostname($r);
+    if ( defined( $tsv->{forgeHeaders}->{$vhost} ) ) {
+        Lemonldap::NG::Handler::API->set_header_in( $r,
+            &{ $tsv->{forgeHeaders}->{$vhost} } );
+    }
+}
+
+## @rmethod void cleanHeaders()
+# Unset HTTP headers, when sendHeaders is skipped
+sub cleanHeaders {
+    my ( $class, $r ) = @_;
+    my $vhost = Lemonldap::NG::Handler::API->hostname($r);
+    if ( defined( $tsv->{headerList}->{$vhost} ) ) {
+        Lemonldap::NG::Handler::API->unset_header_in( $r,
+            @{ $tsv->{headerList}->{$vhost} } );
+    }
+}
+
 1;
diff --git a/lemonldap-ng-handler/lib/Lemonldap/NG/Handler/Main/Headers.pm b/lemonldap-ng-handler/lib/Lemonldap/NG/Handler/Main/Headers.pm
deleted file mode 100755
index 0d831758c..000000000
--- a/lemonldap-ng-handler/lib/Lemonldap/NG/Handler/Main/Headers.pm
+++ /dev/null
@@ -1,33 +0,0 @@
-package Lemonldap::NG::Handler::Main::Headers;
-
-use strict;
-
-use Lemonldap::NG::Handler::API qw( :httpCodes );    # for importing MP function
-use Lemonldap::NG::Handler::Main::Logger;
-
-our $VERSION = '1.4.0';
-
-
-## @rmethod void sendHeaders()
-# Launch function compiled by forgeHeadersInit() for the current virtual host
-sub sendHeaders {
-    my ( $class, $r, $forgeHeaders ) = splice @_;
-    my $vhost = Lemonldap::NG::Handler::API->hostname($r);
-    if ( defined( $forgeHeaders->{$vhost} ) ) {
-        Lemonldap::NG::Handler::API->set_header_in( $r,
-            &{ $forgeHeaders->{$vhost} } );
-    }
-}
-
-## @rmethod void cleanHeaders()
-# Unset HTTP headers for the current virtual host, when sendHeaders is skipped
-sub cleanHeaders {
-    my ( $class, $r, $forgeHeaders, $headerList ) = splice @_;
-    my $vhost = Lemonldap::NG::Handler::API->hostname($r);
-    if ( defined( $forgeHeaders->{$vhost} ) ) {
-        Lemonldap::NG::Handler::API->unset_header_in( $r,
-            @{ $headerList->{$vhost} } );
-    }
-}
-
-1;