diff -Nru pktanon-2~git20160407.0.2bde4f2+dfsg/debian/changelog pktanon-2~git20160407.0.2bde4f2+dfsg/debian/changelog
--- pktanon-2~git20160407.0.2bde4f2+dfsg/debian/changelog	2019-07-22 11:48:23.000000000 +0000
+++ pktanon-2~git20160407.0.2bde4f2+dfsg/debian/changelog	2019-10-31 16:52:21.000000000 +0000
@@ -1,3 +1,12 @@
+pktanon (2~git20160407.0.2bde4f2+dfsg-5+rpi1) bullseye-staging; urgency=medium
+
+  * Move <pcap.h> include outside namespace.
+  * Clean up some stuff left behind by testsuite.
+  * Disable testsuite, it doesn't get run on the autobuilders anyway,
+    so it just acts as a trap for people building manually.
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Thu, 31 Oct 2019 16:52:21 +0000
+
 pktanon (2~git20160407.0.2bde4f2+dfsg-5) unstable; urgency=medium
 
   * Use debhelper 12.
diff -Nru pktanon-2~git20160407.0.2bde4f2+dfsg/debian/patches/0004-include-pcap.h-outside-namespace.patch pktanon-2~git20160407.0.2bde4f2+dfsg/debian/patches/0004-include-pcap.h-outside-namespace.patch
--- pktanon-2~git20160407.0.2bde4f2+dfsg/debian/patches/0004-include-pcap.h-outside-namespace.patch	1970-01-01 00:00:00.000000000 +0000
+++ pktanon-2~git20160407.0.2bde4f2+dfsg/debian/patches/0004-include-pcap.h-outside-namespace.patch	2019-10-31 16:46:27.000000000 +0000
@@ -0,0 +1,29 @@
+Description: Move #include <pcap.h> outside namespace
+ Utils.h includes pcap.h from within the pktannon namespace, this causes system
+ structures to be incorrectly placed in the pktanon namespace breaking stuff
+ later. This patch moves the include outside of the namespace.
+Author: Peter Michael Green <plugwash@debian.org>
+
+--- pktanon-2~git20160407.0.2bde4f2+dfsg.orig/src/Utils.h
++++ pktanon-2~git20160407.0.2bde4f2+dfsg/src/Utils.h
+@@ -13,6 +13,11 @@
+ #include <PktAnon.h>
+ // #include <transformations/ErrorCodes.h>
+ 
++# ifdef HAVE_LIBPCAP
++
++# include <pcap.h>
++# endif
++
+ namespace pktanon
+ {
+ 
+@@ -35,8 +40,6 @@ inline void transform_packet ( PCAP_REC_
+ 
+ # ifdef HAVE_LIBPCAP
+ 
+-# include <pcap.h>
+-
+ inline void transform_packet ( struct pcap_pkthdr* pkt_header, const uint8_t* original_packet, uint8_t* transformed_packet, Stats& stats )
+ {
+   auto new_pkt_len = PktAnon::transform_packet ( original_packet, transformed_packet,  pkt_header->caplen );
diff -Nru pktanon-2~git20160407.0.2bde4f2+dfsg/debian/patches/series pktanon-2~git20160407.0.2bde4f2+dfsg/debian/patches/series
--- pktanon-2~git20160407.0.2bde4f2+dfsg/debian/patches/series	2019-07-22 11:36:28.000000000 +0000
+++ pktanon-2~git20160407.0.2bde4f2+dfsg/debian/patches/series	2019-10-31 16:42:24.000000000 +0000
@@ -1,3 +1,4 @@
 rename-enums.patch
 0001-remove-CryptoPan.patch
 0002-add-support-for-xerces-c-3.2.patch
+0004-include-pcap.h-outside-namespace.patch
diff -Nru pktanon-2~git20160407.0.2bde4f2+dfsg/debian/rules pktanon-2~git20160407.0.2bde4f2+dfsg/debian/rules
--- pktanon-2~git20160407.0.2bde4f2+dfsg/debian/rules	2019-07-22 11:48:10.000000000 +0000
+++ pktanon-2~git20160407.0.2bde4f2+dfsg/debian/rules	2019-10-31 16:52:21.000000000 +0000
@@ -20,6 +20,7 @@
 override_dh_auto_clean:
 	dh_auto_clean
 	rm -rf $(MANPAGES)
+	rm -f tests/pktanon-runtime/trace.pcap.gz tests/transformations/out.pcap tests/dejagnu_logs/*.sum tests/dejagnu_logs/*.log
 
 override_dh_installman: $(MANPAGES)
 	dh_installman
@@ -27,3 +28,7 @@
 override_dh_auto_install:
 	dh_auto_install
 	rm -rfv debian/pktanon/usr/lib
+
+override_dh_auto_test:
+	echo testsuite disabled.
+
diff -Nru pktanon-2~git20160407.0.2bde4f2+dfsg/debian/source/include-binaries pktanon-2~git20160407.0.2bde4f2+dfsg/debian/source/include-binaries
--- pktanon-2~git20160407.0.2bde4f2+dfsg/debian/source/include-binaries	2019-07-22 11:27:08.000000000 +0000
+++ pktanon-2~git20160407.0.2bde4f2+dfsg/debian/source/include-binaries	2019-10-31 16:41:20.000000000 +0000
@@ -1,3 +1,5 @@
 debian/tests/sample.identity.pcap
 debian/tests/sample.default.pcap
 
+src/RawSocketRecordsHandler.o
+src/SocketOutput.o