diff --git a/desmume/src/ctrlssdl.cpp b/desmume/src/ctrlssdl.cpp
index fc111e98b..0e0c6c2e3 100644
--- a/desmume/src/ctrlssdl.cpp
+++ b/desmume/src/ctrlssdl.cpp
@@ -22,10 +22,10 @@
 
 #include "ctrlssdl.h"
 
-const char *key_names[NB_KEYS];
 u16 keyboard_cfg[NB_KEYS];
 u16 joypad_cfg[NB_KEYS];
 u16 nbr_joy;
+mouse_status mouse;
 
 static SDL_Joystick **open_joysticks = NULL;
 
diff --git a/desmume/src/gdbstub.h b/desmume/src/gdbstub.h
index 21bdff123..697937c32 100644
--- a/desmume/src/gdbstub.h
+++ b/desmume/src/gdbstub.h
@@ -22,31 +22,30 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#ifdef __cplusplus
+#define EXTERNC extern "C"
+#else
+#define EXTERNC
+#endif
+
 typedef void *gdbstub_handle_t;
 
 /*
  * The function interface
  */
 
-gdbstub_handle_t
+EXTERNC gdbstub_handle_t
 createStub_gdb( u16 port,
                 struct armcpu_memory_iface **cpu_memio,
                 struct armcpu_memory_iface *direct_memio);
 
-void
+EXTERNC void
 destroyStub_gdb( gdbstub_handle_t stub);
 
-void
+EXTERNC void
 activateStub_gdb( gdbstub_handle_t stub,
                   struct armcpu_ctrl_iface *cpu_ctrl);
 
-
-#ifdef __cplusplus
-#define EXTERNC extern "C"
-#else
-#define EXTERNC
-#endif
-
   /*
    * An implementation of the following functions is required
    * for the GDB stub to function.
@@ -59,3 +58,4 @@ EXTERNC void
 joinThread_gdb( void *thread_handle);
 
 #endif /* End of _GDBSTUB_H_ */
+