diff --git a/curspriv.h b/curspriv.h
index ac615b1b..50d1f9b7 100644
--- a/curspriv.h
+++ b/curspriv.h
@@ -15,7 +15,7 @@
  * See the file maintain.er for details of the current maintainer.	*
  ************************************************************************/
 
-/* $Id: curspriv.h,v 1.117 2006/08/12 22:22:05 wmcbrine Exp $ */
+/* $Id: curspriv.h,v 1.118 2006/08/13 02:51:55 wmcbrine Exp $ */
 
 /*                         CURSPRIV.H
 
@@ -56,9 +56,10 @@ enum
 };
 
 extern WINDOW *pdc_getch_win;
+
 extern unsigned long pdc_key_modifiers;
 
-extern MOUSE_STATUS Trapped_Mouse_status;
+extern MOUSE_STATUS pdc_mouse_status;
 
 extern unsigned char *pdc_atrtab;
 
diff --git a/dos/pdckbd.c b/dos/pdckbd.c
index c682bbe8..79f5cdf9 100644
--- a/dos/pdckbd.c
+++ b/dos/pdckbd.c
@@ -23,7 +23,7 @@
 
 #include "pdcdos.h"
 
-RCSID("$Id: pdckbd.c,v 1.35 2006/08/13 02:11:36 wmcbrine Exp $");
+RCSID("$Id: pdckbd.c,v 1.36 2006/08/13 02:51:55 wmcbrine Exp $");
 
 /************************************************************************
  *    Table for key code translation of function keys in keypad mode	*
@@ -112,8 +112,6 @@ static int kptab[] =
 
 unsigned long pdc_key_modifiers = 0L;
 
-MOUSE_STATUS Trapped_Mouse_status;
-
 /*man-start**************************************************************
 
   PDC_get_input_fd()	- Get file descriptor used for PDCurses input
diff --git a/os2/pdckbd.c b/os2/pdckbd.c
index 91cbbce8..a9460d49 100644
--- a/os2/pdckbd.c
+++ b/os2/pdckbd.c
@@ -33,7 +33,7 @@ static int tahead = -1;
 static KBDINFO kbdinfo;		/* default keyboard mode */
 #endif
 
-RCSID("$Id: pdckbd.c,v 1.34 2006/08/12 22:22:05 wmcbrine Exp $");
+RCSID("$Id: pdckbd.c,v 1.35 2006/08/13 02:51:55 wmcbrine Exp $");
 
 /************************************************************************
  *   Table for key code translation of function keys in keypad mode	*
@@ -123,8 +123,6 @@ static int kptab[] =
 
 unsigned long pdc_key_modifiers = 0L;
 
-MOUSE_STATUS Trapped_Mouse_status;
-
 /*man-start**************************************************************
 
   PDC_get_input_fd()    - Get file descriptor used for PDCurses input
diff --git a/pdcurses/mouse.c b/pdcurses/mouse.c
index c593deb3..7fc18b71 100644
--- a/pdcurses/mouse.c
+++ b/pdcurses/mouse.c
@@ -29,7 +29,9 @@
 #undef getmouse
 #undef getbmap
 
-RCSID("$Id: mouse.c,v 1.20 2006/08/13 00:05:39 wmcbrine Exp $");
+RCSID("$Id: mouse.c,v 1.21 2006/08/13 02:51:55 wmcbrine Exp $");
+
+MOUSE_STATUS pdc_mouse_status;
 
 /*man-start**************************************************************
 
@@ -137,7 +139,7 @@ int request_mouse_pos(void)
 {
 	PDC_LOG(("request_mouse_pos() - called\n"));
 
-	memcpy(&Mouse_status, &Trapped_Mouse_status, sizeof(MOUSE_STATUS));
+	Mouse_status = pdc_mouse_status;
 
 	return OK;
 }
diff --git a/win32/pdckbd.c b/win32/pdckbd.c
index 39938630..a2467715 100644
--- a/win32/pdckbd.c
+++ b/win32/pdckbd.c
@@ -24,14 +24,14 @@
 #define CURSES_LIBRARY 1
 #include <curses.h>
 
-RCSID("$Id: pdckbd.c,v 1.59 2006/08/13 00:05:39 wmcbrine Exp $");
+RCSID("$Id: pdckbd.c,v 1.60 2006/08/13 02:51:55 wmcbrine Exp $");
 
-#define ACTUAL_MOUSE_MOVED	  (Actual_Mouse_status.changes & 8)
-#define ACTUAL_BUTTON_STATUS(x)   (Actual_Mouse_status.button[(x) - 1])
+#define ACTUAL_MOUSE_MOVED	  (actual_mouse_status.changes & 8)
+#define ACTUAL_BUTTON_STATUS(x)   (actual_mouse_status.button[(x) - 1])
 
-#define TEMP_MOUSE_X_POS	  (Temp_Mouse_status.x)
-#define TEMP_MOUSE_Y_POS	  (Temp_Mouse_status.y)
-#define TEMP_BUTTON_STATUS(x)	  (Temp_Mouse_status.button[(x) - 1])
+#define TEMP_MOUSE_X_POS	  (temp_mouse_status.x)
+#define TEMP_MOUSE_Y_POS	  (temp_mouse_status.y)
+#define TEMP_BUTTON_STATUS(x)	  (temp_mouse_status.button[(x) - 1])
 
 #define KEY_STATE TRUE
 #define MS_MOUSE_MOVED 1
@@ -336,8 +336,6 @@ static KPTAB ext_kptab[] =
 
 /* End of kptab[] */
 
-MOUSE_STATUS Trapped_Mouse_status;
-
 /*man-start**************************************************************
 
   PDC_get_input_fd() - Get file descriptor used for PDCurses input
@@ -532,9 +530,9 @@ static int processKeyEvent(void)
 
 int PDC_get_bios_key(void)
 {
-	MOUSE_STATUS Temp_Mouse_status;
+	MOUSE_STATUS temp_mouse_status;
 	static int last_button_no = 0;
-	static MOUSE_STATUS Actual_Mouse_status;
+	static MOUSE_STATUS actual_mouse_status;
 	int button_no = 0;
 	bool trap_mouse = FALSE;
 	int retval;
@@ -555,16 +553,16 @@ int PDC_get_bios_key(void)
 		return retval;
 
 	    case MOUSE_EVENT:
-		memset((char*)&Temp_Mouse_status, 0, sizeof(MOUSE_STATUS));
+		memset((char*)&temp_mouse_status, 0, sizeof(MOUSE_STATUS));
 
 		/* Wheel has been scrolled */
 
 		if (save_ip.Event.MouseEvent.dwEventFlags == MOUSE_WHEELED)
 		{
 		    if (save_ip.Event.MouseEvent.dwButtonState & 0xFF000000)
-			Temp_Mouse_status.changes = PDC_MOUSE_WHEEL_DOWN;
+			temp_mouse_status.changes = PDC_MOUSE_WHEEL_DOWN;
 		    else
-			Temp_Mouse_status.changes = PDC_MOUSE_WHEEL_UP;
+			temp_mouse_status.changes = PDC_MOUSE_WHEEL_UP;
 		}
 
 		/* button press, release or double click */
@@ -703,7 +701,7 @@ int PDC_get_bios_key(void)
 		}
 		else	/* button motion event */
 		{
-		    Temp_Mouse_status.changes |= PDC_MOUSE_MOVED;
+		    temp_mouse_status.changes |= PDC_MOUSE_MOVED;
 		    button_no = last_button_no;
 
 		    if ((button_no == 1 && SP->_trap_mbe & BUTTON1_MOVED)
@@ -739,7 +737,7 @@ int PDC_get_bios_key(void)
 		    TEMP_MOUSE_X_POS)) != 0)
 			return KEY_F(key);
 
-		Temp_Mouse_status.changes |= 1 << (button_no - 1);
+		temp_mouse_status.changes |= 1 << (button_no - 1);
 
 		if (save_ip.Event.MouseEvent.dwControlKeyState &
 		    SHIFT_PRESSED)
@@ -765,20 +763,19 @@ int PDC_get_bios_key(void)
 
 		/* We now have the current mouse status information
 		   for the last Mouse event.  We need to save this in
-		   Actual_Mouse_status so we can use that when comparing
+		   actual_mouse_status so we can use that when comparing
 		   against the next mouse event. We also need to
-		   determine if we need to set Trapped_Mouse_status
+		   determine if we need to set pdc_mouse_status
 		   based on the settings in SP->_trap_mbe. */
 
-		memcpy(&Actual_Mouse_status, &Temp_Mouse_status,
-			sizeof(MOUSE_STATUS));
+		actual_mouse_status = temp_mouse_status;
 
 		if (trap_mouse)
 			 break;
 	    }
 
-	    if ((Temp_Mouse_status.changes & PDC_MOUSE_WHEEL_DOWN ||
-		Temp_Mouse_status.changes & PDC_MOUSE_WHEEL_UP) &&
+	    if ((temp_mouse_status.changes & PDC_MOUSE_WHEEL_DOWN ||
+		temp_mouse_status.changes & PDC_MOUSE_WHEEL_UP) &&
 		SP->_trap_mbe & MOUSE_WHEEL_SCROLL)
 	    {
 		TEMP_MOUSE_X_POS = -1;
@@ -788,9 +785,9 @@ int PDC_get_bios_key(void)
 	}
 
 	/* To get here we have a mouse event that has been trapped by 
-	   the user. Save it in the Trapped_Mouse_status structure. */
+	   the user. Save it in the pdc_mouse_status structure. */
 
-	memcpy(&Trapped_Mouse_status, &Temp_Mouse_status, sizeof(MOUSE_STATUS));
+	pdc_mouse_status = temp_mouse_status;
 
 	return KEY_MOUSE;
 }
@@ -1139,7 +1136,7 @@ static int win32_kbhit(int timeout)
 		/* To get here a recognised event has occurred; save it 
 		   and return TRUE */
 
-		memcpy(&save_ip, &ip, sizeof(INPUT_RECORD));
+		save_ip = ip;
 		rc = TRUE;
 	}
 
diff --git a/x11/pdckbd.c b/x11/pdckbd.c
index a1c4782d..7f502877 100644
--- a/x11/pdckbd.c
+++ b/x11/pdckbd.c
@@ -17,13 +17,11 @@
 
 #include "pdcx11.h"
 
-RCSID("$Id: pdckbd.c,v 1.35 2006/08/12 22:22:05 wmcbrine Exp $");
+RCSID("$Id: pdckbd.c,v 1.36 2006/08/13 02:51:55 wmcbrine Exp $");
 
-MOUSE_STATUS Trapped_Mouse_status;
-
-#define TRAPPED_MOUSE_X_POS	  (Trapped_Mouse_status.x)
-#define TRAPPED_MOUSE_Y_POS	  (Trapped_Mouse_status.y)
-#define TRAPPED_BUTTON_STATUS(x)  (Trapped_Mouse_status.button[(x) - 1])
+#define TRAPPED_MOUSE_X_POS	  (pdc_mouse_status.x)
+#define TRAPPED_MOUSE_Y_POS	  (pdc_mouse_status.y)
+#define TRAPPED_BUTTON_STATUS(x)  (pdc_mouse_status.button[(x) - 1])
 
 static bool PDC_kbhit(void)
 {
@@ -69,7 +67,7 @@ int PDC_get_bios_key(void)
 
 	    if (key == KEY_MOUSE)
 	    {
-		if (XC_read_socket(XC_key_sock, (char *)&Trapped_Mouse_status, 
+		if (XC_read_socket(XC_key_sock, (char *)&pdc_mouse_status, 
 		    sizeof(MOUSE_STATUS)) < 0)
 			XCursesExitCursesProcess(2,
 			    "exiting from PDC_get_bios_key");