--- a/src/device-msw.c	Mon Aug 13 10:31:30 2007 +0200
+++ b/src/device-msw.c	Mon Aug 13 10:32:22 2007 +0200
@@ -39,23 +39,16 @@
 #include "frame.h"
 #include "sysdep.h"
 
+#ifndef __CYGWIN32__
+#include <commctrl.h>
+#endif
+
 /* win32 DDE management library globals */
 DWORD mswindows_dde_mlid;
 HSZ mswindows_dde_service;
 HSZ mswindows_dde_topic_system;
 HSZ mswindows_dde_item_open;
 
-#ifdef __CYGWIN32__
-typedef struct tagINITCOMMONCONTROLSEX
-{
-  DWORD dwSize;
-  DWORD dwICC;
-} INITCOMMONCONTROLSEX;
-WINAPI BOOL InitCommonControlsEx (INITCOMMONCONTROLSEX*);
-#else
-#include <commctrl.h>
-#endif
-
 /* Control conversion of upper case file names to lower case.
    nil means no, t means yes. */
 Lisp_Object Vmswindows_downcase_file_names;
@@ -73,10 +66,6 @@
   WNDCLASSEX wc;
   HWND desktop;
   HDC hdc;
-#ifdef HAVE_TOOLBARS
-  INITCOMMONCONTROLSEX iccex;
-  xzero(iccex);
-#endif
 
   DEVICE_INFD (d) = DEVICE_OUTFD (d) = -1;
   init_baud_rate (d);
@@ -119,13 +108,7 @@
 			  IMAGE_ICON, 16, 16, 0);
   RegisterClassEx (&wc);
 #ifdef HAVE_TOOLBARS
-  iccex.dwSize = sizeof (iccex);
-  iccex.dwICC = ICC_BAR_CLASSES;
-#ifdef __CYGWIN32__
   InitCommonControls ();
-#else
-  InitCommonControlsEx (&iccex);
-#endif
 #endif
 }