diff -Nru openssh-8.4p1/debian/changelog openssh-8.4p1/debian/changelog
--- openssh-8.4p1/debian/changelog	2021-07-05 07:21:03.000000000 -0500
+++ openssh-8.4p1/debian/changelog	2021-08-12 15:55:06.000000000 -0500
@@ -1,3 +1,9 @@
+openssh (1:8.4p1-5ubuntu3) impish; urgency=medium
+
+  * Add includes.h to compat tests, and remove closefrom prototype
+
+ -- William 'jawn-smith' Wilson <william.wilson@canonical.com>  Thu, 12 Aug 2021 15:55:06 -0500
+
 openssh (1:8.4p1-5ubuntu2) impish; urgency=medium
 
   * d/systemd/ssh@.service: preserve the systemd managed runtime directory to
diff -Nru openssh-8.4p1/debian/patches/419aa01123db5ff5dbc68b2376ef23b222862338.patch openssh-8.4p1/debian/patches/419aa01123db5ff5dbc68b2376ef23b222862338.patch
--- openssh-8.4p1/debian/patches/419aa01123db5ff5dbc68b2376ef23b222862338.patch	1969-12-31 18:00:00.000000000 -0600
+++ openssh-8.4p1/debian/patches/419aa01123db5ff5dbc68b2376ef23b222862338.patch	2021-08-12 15:55:06.000000000 -0500
@@ -0,0 +1,96 @@
+Description: Add includes.h to compat tests
+ On platforms where closefrom returns void (eg glibc>=2.34) the prototype
+ for closefrom in its compat tests would cause compile errors.  Remove
+ this and have the tests pull in the compat headers in the same way as
+ the main code.
+Origin: upstream, https://github.com/openssh/openssh-portable/commit/419aa01123db5ff5dbc68b2376ef23b222862338
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/openssh/+bug/1939751
+Last-Update: 2021-08-12
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/openbsd-compat/regress/closefromtest.c
++++ b/openbsd-compat/regress/closefromtest.c
+@@ -14,6 +14,8 @@
+  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+  */
+ 
++#include "includes.h"
++
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ 
+@@ -24,8 +26,6 @@
+ 
+ #define NUM_OPENS 10
+ 
+-int closefrom(int);
+-
+ void
+ fail(char *msg)
+ {
+--- a/openbsd-compat/regress/Makefile.in
++++ b/openbsd-compat/regress/Makefile.in
+@@ -7,7 +7,7 @@
+ CC=@CC@
+ LD=@LD@
+ CFLAGS=@CFLAGS@
+-CPPFLAGS=-I. -I.. -I$(srcdir) -I$(srcdir)/.. @CPPFLAGS@ @DEFS@
++CPPFLAGS=-I. -I.. -I../.. -I$(srcdir) -I$(srcdir)/.. -I$(srcdir)/../.. @CPPFLAGS@ @DEFS@
+ EXEEXT=@EXEEXT@
+ LIBCOMPAT=../libopenbsd-compat.a
+ LIBS=@LIBS@
+--- a/openbsd-compat/regress/opensslvertest.c
++++ b/openbsd-compat/regress/opensslvertest.c
+@@ -14,6 +14,8 @@
+  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+  */
+ 
++#include "includes.h"
++
+ #include <stdio.h>
+ #include <stdlib.h>
+ 
+--- a/openbsd-compat/regress/snprintftest.c
++++ b/openbsd-compat/regress/snprintftest.c
+@@ -17,6 +17,8 @@
+ 
+ #define BUFSZ 2048
+ 
++#include "includes.h"
++
+ #include <sys/types.h>
+ #include <stdlib.h>
+ #include <stdio.h>
+--- a/openbsd-compat/regress/strduptest.c
++++ b/openbsd-compat/regress/strduptest.c
+@@ -14,6 +14,8 @@
+  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+  */
+ 
++#include "includes.h"
++
+ #include <stdlib.h>
+ #include <string.h>
+ 
+--- a/openbsd-compat/regress/strtonumtest.c
++++ b/openbsd-compat/regress/strtonumtest.c
+@@ -17,6 +17,8 @@
+ 
+ /* OPENBSD ORIGINAL: regress/lib/libc/strtonum/strtonumtest.c */
+ 
++#include "includes.h"
++
+ #include <limits.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+--- a/openbsd-compat/regress/utimensattest.c
++++ b/openbsd-compat/regress/utimensattest.c
+@@ -14,6 +14,8 @@
+  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+  */
+ 
++#include "includes.h"
++
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ 
diff -Nru openssh-8.4p1/debian/patches/series openssh-8.4p1/debian/patches/series
--- openssh-8.4p1/debian/patches/series	2021-07-05 07:21:03.000000000 -0500
+++ openssh-8.4p1/debian/patches/series	2021-08-12 15:52:20.000000000 -0500
@@ -29,3 +29,4 @@
 0f90440ca70abab947acbd77795e9f130967956c.patch
 2e0beff67def2120f4b051b1016d7fbf84823e78.patch
 1bb130ed34721d46452529d094d9bbf045607d79.patch
+419aa01123db5ff5dbc68b2376ef23b222862338.patch