diff --git a/zsnes/src/linux/sdllink.c b/zsnes/src/linux/sdllink.c
index face676c..8339240c 100644
--- a/zsnes/src/linux/sdllink.c
+++ b/zsnes/src/linux/sdllink.c
@@ -111,7 +111,7 @@ static float MouseMaxY = 223;
 static int MouseX, MouseY;
 static float MouseMoveX, MouseMoveY;
 static int MouseMove2X, MouseMove2Y;
-static unsigned char MouseButton;
+unsigned char MouseButton;
 static float MouseXScale = 1.0;
 static float MouseYScale = 1.0;
 DWORD LastUsedPos = 0;
diff --git a/zsnes/src/uic.c b/zsnes/src/uic.c
index 4dfc360d..a9516d41 100644
--- a/zsnes/src/uic.c
+++ b/zsnes/src/uic.c
@@ -448,9 +448,9 @@ int MouseCount = 0;
 
 unsigned short MouseMoveX[2];
 unsigned short MouseMoveY[2];
-unsigned short MouseButton[2];
+unsigned short MouseButtons[2];
 
-bool MouseWaiting[2];
+static bool MouseWaiting[2];
 
 void MultiMouseShutdown()
 {
@@ -466,7 +466,7 @@ void MultiMouseInit()
    {
      MouseMoveX[0] = MouseMoveX[1] = 0;
      MouseMoveY[0] = MouseMoveY[1] = 0;
-     MouseButton[0] = MouseButton[1] = 0;
+     MouseButtons[0] = MouseButtons[1] = 0;
      MouseWaiting[0] = MouseWaiting[1] = false;
      atexit(MultiMouseShutdown);
 
@@ -519,8 +519,8 @@ void MultiMouseProcess()
       }
       else if (event.type == MANYMOUSE_EVENT_BUTTON)
       {
-        if (event.item == 0) { MOUSE_BUTTON_HANDLE(MouseButton[event.device], 0, event.value); }
-        else if (event.item == 1) { MOUSE_BUTTON_HANDLE(MouseButton[event.device], 1, event.value); }
+        if (event.item == 0) { MOUSE_BUTTON_HANDLE(MouseButtons[event.device], 0, event.value); }
+        else if (event.item == 1) { MOUSE_BUTTON_HANDLE(MouseButtons[event.device], 1, event.value); }
       }
     }
   }
diff --git a/zsnes/src/video/procvid.asm b/zsnes/src/video/procvid.asm
index 6240b403..5ef419a0 100644
--- a/zsnes/src/video/procvid.asm
+++ b/zsnes/src/video/procvid.asm
@@ -42,7 +42,7 @@ EXTSYM MovieDisplayFrame
 EXTSYM MouseCount,device2
 
 %ifndef __MSDOS__
-EXTSYM MouseMoveX,MouseMoveY,MouseButton,MultiMouseProcess,mouse
+EXTSYM MouseMoveX,MouseMoveY,MouseButtons,MultiMouseProcess,mouse
 %endif
 
 %ifdef __MSDOS__
@@ -160,7 +160,7 @@ NEWSYM processmouse1
     mov byte[mouse],0
     call MultiMouseProcess
     popad
-    mov bx,[MouseButton]
+    mov bx,[MouseButtons]
     mov [mousebuttons],bx
     mov cx,[MouseMoveX]
     mov dx,[MouseMoveY]
@@ -212,7 +212,7 @@ NEWSYM processmouse2
     mov byte[mouse],1
     call MultiMouseProcess
     popad
-    mov bx,[MouseButton+2]
+    mov bx,[MouseButtons+2]
     jmp .mousestuff
 .nomultimouse
 %endif