diff --git a/srcpkgs/namecoin/patches/dequeu.patch b/srcpkgs/namecoin/patches/dequeu.patch
deleted file mode 100644
index 60aa9511a3f..00000000000
--- a/srcpkgs/namecoin/patches/dequeu.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/httpserver.cpp	2019-08-05 07:23:46.000000000 +0200
-+++ b/src/httpserver.cpp	2019-08-05 07:23:46.000000000 +0200
-@@ -18,6 +18,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <deque>
- 
- #include <sys/types.h>
- #include <sys/stat.h>
diff --git a/srcpkgs/namecoin/patches/fix-include.patch b/srcpkgs/namecoin/patches/fix-include.patch
new file mode 100644
index 00000000000..b923004ffa7
--- /dev/null
+++ b/srcpkgs/namecoin/patches/fix-include.patch
@@ -0,0 +1,77 @@
+Index: namecoin-0.18.1/src/bench/block_assemble.cpp
+===================================================================
+--- namecoin-0.18.1.orig/src/bench/block_assemble.cpp
++++ namecoin-0.18.1/src/bench/block_assemble.cpp
+@@ -20,7 +20,9 @@
+ 
+ #include <boost/thread.hpp>
+ 
++#include <array>
+ #include <list>
++#include <memory>
+ #include <vector>
+ 
+ static std::shared_ptr<CBlock> PrepareBlock(const CScript& coinbase_scriptPubKey)
+Index: namecoin-0.18.1/src/net_processing.cpp
+===================================================================
+--- namecoin-0.18.1.orig/src/net_processing.cpp
++++ namecoin-0.18.1/src/net_processing.cpp
+@@ -30,7 +30,9 @@
+ #include <util/moneystr.h>
+ #include <util/strencodings.h>
+ 
++#include <array>
+ #include <memory>
++#include <utility>
+ 
+ #if defined(NDEBUG)
+ # error "Bitcoin cannot be compiled without assertions."
+Index: namecoin-0.18.1/src/qt/sendcoinsdialog.cpp
+===================================================================
+--- namecoin-0.18.1.orig/src/qt/sendcoinsdialog.cpp
++++ namecoin-0.18.1/src/qt/sendcoinsdialog.cpp
+@@ -32,6 +32,8 @@
+ #include <QSettings>
+ #include <QTextDocument>
+ 
++#include <array>
++
+ static const std::array<int, 9> confTargets = { {2, 4, 6, 12, 24, 48, 144, 504, 1008} };
+ int getConfTargetForIndex(int index) {
+     if (index+1 > static_cast<int>(confTargets.size())) {
+Index: namecoin-0.18.1/src/qt/trafficgraphwidget.cpp
+===================================================================
+--- namecoin-0.18.1.orig/src/qt/trafficgraphwidget.cpp
++++ namecoin-0.18.1/src/qt/trafficgraphwidget.cpp
+@@ -6,6 +6,7 @@
+ #include <qt/trafficgraphwidget.h>
+ #include <qt/clientmodel.h>
+ 
++#include <QPainterPath>
+ #include <QPainter>
+ #include <QColor>
+ #include <QTimer>
+Index: namecoin-0.18.1/src/httpserver.cpp
+===================================================================
+--- namecoin-0.18.1.orig/src/httpserver.cpp
++++ namecoin-0.18.1/src/httpserver.cpp
+@@ -18,6 +18,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <deque>
+ 
+ #include <sys/types.h>
+ #include <sys/stat.h>
+Index: namecoin-0.18.1/src/test/cuckoocache_tests.cpp
+===================================================================
+--- namecoin-0.18.1.orig/src/test/cuckoocache_tests.cpp
++++ namecoin-0.18.1/src/test/cuckoocache_tests.cpp
+@@ -7,6 +7,7 @@
+ #include <test/test_bitcoin.h>
+ #include <random.h>
+ #include <thread>
++#include <deque>
+ 
+ /** Test Suite for CuckooCache
+  *