--- a/src/intl-encap-win32.c	Fri Jan 15 04:49:35 2010 -0600
+++ b/src/intl-encap-win32.c	Tue Jan 12 01:19:01 2010 -0600
@@ -355,7 +355,8 @@
 yes GetWindowTextLength
 yes MessageBox
 yes MessageBoxEx
-split MessageBoxIndirect LPMSGBOXPARAMS NT 4.0+ only
+// split MessageBoxIndirect LPMSGBOXPARAMS NT 4.0+ only
+no MessageBoxIndirect Cygwin has split MSGBOXPARAMS* instead of LPMSGBOXPARAMS
 yes GetWindowLong
 yes SetWindowLong
 yes GetClassLong
@@ -393,6 +394,7 @@
 
 file WINGDI.H
 
+begin-bracket defined (HAVE_MS_WINDOWS)
 // split-sized LOGCOLORSPACE
 // split-sized TEXTMETRIC
 // split-sized NEWTEXTMETRIC
@@ -467,6 +469,7 @@
 // Unicode-only EMREXTCREATEFONTINDIRECTW
 no wglUseFontBitmaps causes link error
 no wglUseFontOutlines causes link error
+end-bracket
 
 file WINSPOOL.H
 
@@ -762,6 +765,7 @@
 
 file COMMDLG.H
 
+begin-bracket defined (HAVE_MS_WINDOWS)
 split GetOpenFileName LPOPENFILENAME
 split GetSaveFileName LPOPENFILENAME
 yes GetFileTitle
@@ -782,6 +786,7 @@
 // FINDMSGSTRING
 skip PrintDlg LPPRINTDLG with split-sized DEVMODE handle
 skip PageSetupDlg LPPAGESETUPDLG with split-sized DEVMODE handle
+end-bracket
 
 file DDE.H
 
@@ -873,9 +878,11 @@
 split MultinetGetConnectionPerformance LPNETRESOURCE
 end-bracket
 
-file IME.H
+// Doesn't exist under Cygwin
 
-no SendIMEMessageEx obsolete, no docs available
+// file IME.H
+
+// no SendIMEMessageEx obsolete, no docs available
 
 file OBJBASE.H
 
@@ -1195,6 +1202,8 @@
     return (UINT) ExtractIconExA ((LPCSTR) lpszFile, nIconIndex, phiconLarge, phiconSmall, nIcons);
 }
 
+#ifdef HAVE_MS_WINDOWS
+
 /* NOTE: NT 4.0+ only */
 BOOL
 qxeGetICMProfile (HDC arg1, LPDWORD arg2, Extbyte * arg3)
@@ -1231,6 +1240,8 @@
 #endif /* CYGWIN_HEADERS */
 }
 
+#endif /* HAVE_MS_WINDOWS */
+
 #ifndef CYGWIN /* present in headers but missing in shell32.a */
 
 BOOL