diff --git a/lib/WUI/nhttp/server.h b/lib/WUI/nhttp/server.h
index 077b63c821..33e20b985a 100644
--- a/lib/WUI/nhttp/server.h
+++ b/lib/WUI/nhttp/server.h
@@ -7,6 +7,7 @@
 #include "handler.h"
 
 #include <automata/core.h>
+#include <common/pbuf_deleter.hpp>
 
 #include <lwip/altcp.h>
 #include <lwip/tcpip.h>
@@ -94,13 +95,6 @@ class ServerDefs {
  */
 class Server {
 private:
-    class PbufDeleter {
-    public:
-        void operator()(pbuf *buff) {
-            pbuf_free(buff);
-        }
-    };
-
     class ListenerDeleter {
     public:
         void operator()(altcp_pcb *conn) {
diff --git a/src/common/pbuf_deleter.hpp b/src/common/pbuf_deleter.hpp
new file mode 100644
index 0000000000..e675e1eacf
--- /dev/null
+++ b/src/common/pbuf_deleter.hpp
@@ -0,0 +1,10 @@
+#pragma once
+
+#include <lwip/pbuf.h>
+
+class PbufDeleter {
+public:
+    void operator()(pbuf *buff) {
+        pbuf_free(buff);
+    }
+};
diff --git a/src/transfers/download.cpp b/src/transfers/download.cpp
index 4f282aac96..e661607e50 100644
--- a/src/transfers/download.cpp
+++ b/src/transfers/download.cpp
@@ -6,6 +6,7 @@
     // Avoid deep transitive dependency hell in unit tests...
     #include <nhttp/server.h>
 #endif
+#include <common/pbuf_deleter.hpp>
 #include <nhttp/splice.h>
 #include <http_lifetime.h>
 #include <timing.h>
@@ -275,13 +276,6 @@ class Download::Async {
             done(DownloadStep::FailedNetwork);
             return ERR_ABRT;
         }
-        // TODO: Unify with the one in server.h
-        class PbufDeleter {
-        public:
-            void operator()(pbuf *buff) {
-                pbuf_free(buff);
-            }
-        };
         unique_ptr<pbuf, PbufDeleter> data(data_raw);
         if (phase != Phase::Headers) {
             done(DownloadStep::Aborted);