--- a/dlls/crypt32/crypt32_private.h	2020-01-21 11:03:21.000000000 -0600
+++ b/dlls/crypt32/crypt32_private.h	2020-01-22 09:09:42.545954092 -0600
@@ -152,7 +152,7 @@
  */
 HCRYPTPROV WINAPI I_CryptGetDefaultCryptProv(ALG_ID);
 
-HINSTANCE hInstance DECLSPEC_HIDDEN;
+extern HINSTANCE hInstance DECLSPEC_HIDDEN;
 
 void crypt_oid_init(void) DECLSPEC_HIDDEN;
 void crypt_oid_free(void) DECLSPEC_HIDDEN;
--- a/dlls/gphoto2.ds/gphoto2_i.h	2020-01-21 11:03:21.000000000 -0600
+++ b/dlls/gphoto2.ds/gphoto2_i.h	2020-01-22 10:07:59.403974843 -0600
@@ -100,7 +100,7 @@
     struct jpeg_decompress_struct	jd;
     struct jpeg_error_mgr		jerr;
 #endif
-} activeDS DECLSPEC_HIDDEN;
+} extern activeDS DECLSPEC_HIDDEN;
 
 /* Helper functions */
 extern TW_UINT16 GPHOTO2_SaneCapability (pTW_CAPABILITY pCapability, TW_UINT16 action) DECLSPEC_HIDDEN;
--- a/dlls/gphoto2.ds/gphoto2_main.c	2020-01-22 10:22:39.110786117 -0600
+++ b/dlls/gphoto2.ds/gphoto2_main.c	2020-01-22 10:22:51.743818190 -0600
@@ -33,6 +33,8 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(twain);
 
+struct tagActiveDS activeDS;
+
 DSMENTRYPROC GPHOTO2_dsmentry;
 
 #ifdef HAVE_GPHOTO2