diff --git a/dlls/gphoto2.ds/gphoto2_i.h b/dlls/gphoto2.ds/gphoto2_i.h
index 89c4bc08a33..8312815c6e2 100644
--- a/dlls/gphoto2.ds/gphoto2_i.h
+++ b/dlls/gphoto2.ds/gphoto2_i.h
@@ -103,16 +103,6 @@ struct tagActiveDS
 /* Helper functions */
 extern TW_UINT16 GPHOTO2_SaneCapability (pTW_CAPABILITY pCapability, TW_UINT16 action);
 
-/*  */
-extern TW_UINT16 GPHOTO2_ControlGroupHandler (
-	pTW_IDENTITY pOrigin, TW_UINT16 DAT, TW_UINT16 MSG, TW_MEMREF pData);
-extern TW_UINT16 GPHOTO2_ImageGroupHandler (
-	pTW_IDENTITY pOrigin, TW_UINT16 DAT, TW_UINT16 MSG, TW_MEMREF pData);
-extern TW_UINT16 GPHOTO2_AudioGroupHandler (
-	pTW_IDENTITY pOrigin, TW_UINT16 DAT, TW_UINT16 MSG, TW_MEMREF pData);
-extern TW_UINT16 GPHOTO2_SourceManagerHandler (
-	pTW_IDENTITY pOrigin, TW_UINT16 DAT, TW_UINT16 MSG, TW_MEMREF pData);
-
 /* Implementation of operation triplets
  * From Application to Source (Control Information) */
 TW_UINT16 GPHOTO2_CapabilityGet (pTW_IDENTITY pOrigin, TW_MEMREF pData);
diff --git a/dlls/gphoto2.ds/gphoto2_main.c b/dlls/gphoto2.ds/gphoto2_main.c
index f4f454633b2..c0238283303 100644
--- a/dlls/gphoto2.ds/gphoto2_main.c
+++ b/dlls/gphoto2.ds/gphoto2_main.c
@@ -311,7 +311,7 @@ static TW_UINT16 GPHOTO2_SourceControlHandler (
 }
 
 
-TW_UINT16 GPHOTO2_ImageGroupHandler (
+static TW_UINT16 GPHOTO2_ImageGroupHandler (
            pTW_IDENTITY pOrigin,
            TW_UINT16    DAT,
            TW_UINT16    MSG,
diff --git a/dlls/gphoto2.ds/ui.c b/dlls/gphoto2.ds/ui.c
index e9d2f874c0f..40afb9e5a32 100644
--- a/dlls/gphoto2.ds/ui.c
+++ b/dlls/gphoto2.ds/ui.c
@@ -39,8 +39,8 @@
 #include "wine/debug.h"
 #include "resource.h"
 
-LPCSTR settings_key = "Software\\Wine\\Gphoto2";
-LPCSTR settings_value = "SkipUI";
+static const char settings_key[] = "Software\\Wine\\Gphoto2";
+static const char settings_value[] = "SkipUI";
 static BOOL disable_dialog;
 static HBITMAP static_bitmap;