diff --git a/hw/xwin/winkeyhook.c b/hw/xwin/winkeyhook.c
index 96b74756b..c65e4f499 100755
--- a/hw/xwin/winkeyhook.c
+++ b/hw/xwin/winkeyhook.c
@@ -69,12 +69,16 @@ winKeyboardMessageHookLL (int iCode, WPARAM wParam, LPARAM lParam)
   /* Pass keystrokes on to our main message loop */
   if (iCode == HC_ACTION)
     {
+#if 0
+      ErrorF ("vkCode: %08x\tscanCode: %08x\n", p->vkCode, p->scanCode);
+#endif
+
       switch (wParam)
 	{
 	case WM_KEYDOWN:  case WM_SYSKEYDOWN:
 	case WM_KEYUP:    case WM_SYSKEYUP: 
 	  fPassKeystroke = 
-	    (p->vkCode == VK_TAB) && ((p->flags & LLKHF_ALTDOWN) != 0)
+	    ((p->vkCode == VK_TAB) && ((p->flags & LLKHF_ALTDOWN) != 0))
 	    || (p->vkCode == VK_LWIN) || (p->vkCode == VK_RWIN);
 	  break;
 	}
diff --git a/hw/xwin/winkeynames.h b/hw/xwin/winkeynames.h
index 4d1ffb7cc..661a8b15f 100755
--- a/hw/xwin/winkeynames.h
+++ b/hw/xwin/winkeynames.h
@@ -1,3 +1,5 @@
+#ifndef _WINKEYNAMES_H
+#define _WINKEYNAMES_H
 /* $XFree86: xc/programs/Xserver/hw/xfree86/common/atKeynames.h,v 3.18 2001/09/29 20:40:30 herrb Exp $ */
 /*
  * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
@@ -23,9 +25,6 @@
  */
 /* $XConsortium: atKeynames.h /main/11 1996/03/09 11:17:41 kaleb $ */
 
-#ifndef _ATKEYNAMES_H
-#define _ATKEYNAMES_H
-
 #define XK_TECHNICAL
 #define	XK_KATAKANA
 #include "keysym.h"
@@ -202,4 +201,4 @@
 #define KEY_NOTUSED	  0
 #define KEY_UNKNOWN	255
 
-#endif /* _ATKEYNAMES_H */
+#endif /* _WINKEYNAMES_H */