diff -Nru pfstools-2.1.0/debian/changelog pfstools-2.1.0/debian/changelog
--- pfstools-2.1.0/debian/changelog	2019-10-04 17:20:38.000000000 +0000
+++ pfstools-2.1.0/debian/changelog	2020-08-27 23:08:13.000000000 +0000
@@ -1,3 +1,10 @@
+pfstools (2.1.0-5+rpi1) bullseye-staging; urgency=medium
+
+  * Re-order includes to work around bug 969128
+    in libmagick++-6.q16-dev (Closes: 966904)
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Thu, 27 Aug 2020 23:08:13 +0000
+
 pfstools (2.1.0-5) unstable; urgency=medium
 
   * 40_Fix-format-security-errors-with-Octave-5.1.patch: Fix FTBFS with octave
diff -Nru pfstools-2.1.0/debian/patches/reorder-includes-imagemagick.patch pfstools-2.1.0/debian/patches/reorder-includes-imagemagick.patch
--- pfstools-2.1.0/debian/patches/reorder-includes-imagemagick.patch	1970-01-01 00:00:00.000000000 +0000
+++ pfstools-2.1.0/debian/patches/reorder-includes-imagemagick.patch	2020-08-27 23:08:13.000000000 +0000
@@ -0,0 +1,44 @@
+Description:  Re-order includes to work around bug 969128 in libmagick++-6.q16-dev
+ libmagick++ currently includes assert.h inside a namespace which breaks other
+ code that tries to use assert.h, re-order the includes to ensure that
+ assert.h gets included outside the namespace.
+Author: Peter Michael Green <plugwash@raspbian.org>
+Bug-Debian: https://bugs.debian.org/966904
+
+Index: pfstools-2.1.0/src/fileformat/pfsinimgmagick.cpp
+===================================================================
+--- pfstools-2.1.0.orig/src/fileformat/pfsinimgmagick.cpp
++++ pfstools-2.1.0/src/fileformat/pfsinimgmagick.cpp
+@@ -26,12 +26,12 @@
+  */
+ 
+ #include <config.h>
++#include <pfs.h>
+ #include <Magick++.h>
+ 
+ #include <iostream>
+ 
+ #include <getopt.h>
+-#include <pfs.h>
+ 
+ #define PROG_NAME "pfsinimgmagick"
+ 
+Index: pfstools-2.1.0/src/fileformat/pfsoutimgmagick.cpp
+===================================================================
+--- pfstools-2.1.0.orig/src/fileformat/pfsoutimgmagick.cpp
++++ pfstools-2.1.0/src/fileformat/pfsoutimgmagick.cpp
+@@ -28,13 +28,12 @@
+ 
+ #include <config.h>
+ 
+-
++#include <pfs.h>
+ #include <Magick++.h>
+ 
+ #include <iostream>
+ 
+ #include <getopt.h>
+-#include <pfs.h>
+ 
+ #define PROG_NAME "pfsoutimgmagick"
+ 
diff -Nru pfstools-2.1.0/debian/patches/series pfstools-2.1.0/debian/patches/series
--- pfstools-2.1.0/debian/patches/series	2019-10-04 17:19:44.000000000 +0000
+++ pfstools-2.1.0/debian/patches/series	2020-08-27 23:08:13.000000000 +0000
@@ -4,3 +4,4 @@
 40_Fix-format-security-errors-with-Octave-5.1.patch
 octave-nargin.dpatch
 octave-signal.dpatch
+reorder-includes-imagemagick.patch