diff -up gnupg-2.2.19/common/iobuf.h.build gnupg-2.2.19/common/iobuf.h
--- gnupg-2.2.19/common/iobuf.h.build	2017-02-24 13:46:24.000000000 +0100
+++ gnupg-2.2.19/common/iobuf.h	2020-01-29 18:53:45.466585922 +0100
@@ -250,7 +250,7 @@ struct iobuf_struct
 };
 
 #ifndef EXTERN_UNLESS_MAIN_MODULE
-#if defined (__riscos__) && !defined (INCLUDED_BY_MAIN_MODULE)
+#if !defined (INCLUDED_BY_MAIN_MODULE)
 #define EXTERN_UNLESS_MAIN_MODULE extern
 #else
 #define EXTERN_UNLESS_MAIN_MODULE
diff -up gnupg-2.2.19/g10/options.h.build gnupg-2.2.19/g10/options.h
--- gnupg-2.2.19/g10/options.h.build	2020-01-29 12:54:10.308621663 +0100
+++ gnupg-2.2.19/g10/options.h	2020-01-29 18:53:23.817975442 +0100
@@ -32,7 +32,7 @@
 
 #ifndef EXTERN_UNLESS_MAIN_MODULE
 /* Norcraft can't cope with common symbols */
-#if defined (__riscos__) && !defined (INCLUDED_BY_MAIN_MODULE)
+#if !defined (INCLUDED_BY_MAIN_MODULE)
 #define EXTERN_UNLESS_MAIN_MODULE extern
 #else
 #define EXTERN_UNLESS_MAIN_MODULE