diff --git a/frotz-2.51-extern.patch b/frotz-2.51-extern.patch
index f0d0867..d6adf87 100644
--- a/frotz-2.51-extern.patch
+++ b/frotz-2.51-extern.patch
@@ -1,16 +1,69 @@
-From f5dd9b5d2836b12f3bbe725346d5faa617df32a1 Mon Sep 17 00:00:00 2001
+From a06030444f2d29fcbef69950be6955b199548ffd Mon Sep 17 00:00:00 2001
 From: "FeRD (Frank Dana)" <ferdnyc@gmail.com>
 Date: Wed, 12 Feb 2020 06:08:25 -0500
-Subject: [PATCH 1/2] Single definition for f_setup
+Subject: [PATCH] Add externs for multiply-defined variables
 
 ---
- src/dumb/dblorb.c | 2 +-
- src/dumb/dinit.c  | 2 +-
- src/dumb/dinput.c | 2 +-
- src/dumb/dpic.c   | 2 +-
- src/sdl/sf_util.c | 2 +-
- 5 files changed, 5 insertions(+), 5 deletions(-)
+ src/curses/ux_audio.c | 2 +-
+ src/curses/ux_init.c  | 5 ++---
+ src/curses/ux_input.c | 2 +-
+ src/dumb/dblorb.c     | 2 +-
+ src/dumb/dinit.c      | 2 +-
+ src/dumb/dinput.c     | 2 +-
+ src/dumb/dpic.c       | 2 +-
+ src/sdl/sf_util.c     | 2 +-
+ src/sdl/sf_video.c    | 2 +-
+ 9 files changed, 10 insertions(+), 11 deletions(-)
 
+diff --git a/src/curses/ux_audio.c b/src/curses/ux_audio.c
+index 56bcf85..183dab4 100644
+--- a/src/curses/ux_audio.c
++++ b/src/curses/ux_audio.c
+@@ -45,7 +45,7 @@
+ #include "ux_blorb.h"
+ #include "ux_audio.h"
+ 
+-f_setup_t f_setup;
++extern f_setup_t f_setup;
+ extern z_header_t z_header;
+ 
+ #ifndef NO_SOUND
+diff --git a/src/curses/ux_init.c b/src/curses/ux_init.c
+index 9f719c9..3a01353 100644
+--- a/src/curses/ux_init.c
++++ b/src/curses/ux_init.c
+@@ -53,7 +53,7 @@
+ #include <locale.h>
+ #endif
+ 
+-f_setup_t f_setup;
++extern f_setup_t f_setup;
+ extern z_header_t z_header;
+ 
+ volatile sig_atomic_t terminal_resized = 0;
+@@ -88,8 +88,7 @@ char stripped_story_name[FILENAME_MAX+1];
+ char semi_stripped_story_name[FILENAME_MAX+1];
+ */
+ 
+-f_setup_t f_setup;
+-u_setup_t u_setup;
++extern u_setup_t u_setup;
+ 
+ /* static void sigwinch_handler(int); */
+ static void sigint_handler(int);
+diff --git a/src/curses/ux_input.c b/src/curses/ux_input.c
+index d2be095..9ca51de 100644
+--- a/src/curses/ux_input.c
++++ b/src/curses/ux_input.c
+@@ -49,7 +49,7 @@
+ 
+ #ifndef NO_SOUND
+ #include "ux_sema.h"
+-ux_sem_t sound_done;
++extern ux_sem_t sound_done;
+ #endif
+ 
+ static int start_of_prev_word(int, const zchar*);
 diff --git a/src/dumb/dblorb.c b/src/dumb/dblorb.c
 index 98a62ac..0d1e3a8 100644
 --- a/src/dumb/dblorb.c
@@ -76,18 +129,6 @@ index 73251b1..678e1e7 100644
  
  typedef void (*CLEANFUNC)();
  
--- 
-2.24.1
-
-From 09b5947f62a1cf35ae78c0b60bd28ddbafef232b Mon Sep 17 00:00:00 2001
-From: "FeRD (Frank Dana)" <ferdnyc@gmail.com>
-Date: Wed, 12 Feb 2020 06:18:15 -0500
-Subject: [PATCH 2/2] Single definition for sdl_active
-
----
- src/sdl/sf_video.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
 diff --git a/src/sdl/sf_video.c b/src/sdl/sf_video.c
 index 62221c4..8522dd7 100644
 --- a/src/sdl/sf_video.c