--- a/src/console-msw.h	Mon Aug 13 11:17:10 2007 +0200
+++ b/src/console-msw.h	Mon Aug 13 11:18:11 2007 +0200
@@ -33,13 +33,8 @@
 #define INCLUDED_console_msw_h_
 
 #include "console.h"
-#include <windows.h>
-#include <ddeml.h>	/* DDE management library */
-#if !defined(__CYGWIN32__) && !defined(__MINGW32__) \
-	|| CYGWIN_VERSION_DLL_MAJOR > 20
-#include <shellapi.h>	/* FileManager/Explorer drag and drop */
-#include <commctrl.h>
-#endif
+#include "syswindows.h"
+#include "syscommctrl.h"
 
 #ifdef HAVE_XPM
 #include <X11/xpm.h>
@@ -164,6 +159,9 @@
   /* DC for this win32 window */
   HDC hdc;
 
+  /* Used with DeferWindowPos */
+  HDWP hdwp;
+
   /* Time of last click event, for button 2 emul */
   DWORD last_click_time;
 
@@ -352,4 +350,7 @@
 
 int msw_windows9x_p (void);
 
+
+void mswindows_output_last_error (char *frob);
+
 #endif /* INCLUDED_console_msw_h_ */