--- Win32-GUI-1.01_03/GUI.h.orig	2005-06-30 23:36:14.000000000 +0100
+++ Win32-GUI-1.01_03/GUI.h	2005-07-01 11:46:32.617500000 +0100
@@ -12,7 +12,6 @@
 #undef NOTRACKMOUSEEVENT
 #include <stdarg.h>
 #include <windows.h>
-#include <winuser.h>
 #include <commctrl.h>
 #include <commdlg.h>
 #include <wtypes.h>
@@ -20,9 +19,9 @@
 #include <shellapi.h>
 #include <shlobj.h>
 
-#if defined(_MSC_VER) && (_MSC_VER <= 1200) && (WINVER < 0x0500)
+#if defined(_MSC_VER)
 #include <math.h>
-#endif /* defined(_MSC_VER) && (_MSC_VER <= 1200) && (WINVER < 0x0500) */
+#endif
 
 #include "resource.h"
 
@@ -759,7 +758,7 @@
 // MSVC6 patches
 #if defined(_MSC_VER) && (_MSC_VER <= 1200) && (WINVER < 0x0500)
 /*
- * MSVC6 falsely misses these definitions. Need to check which SP fixed that.
+ * MSVC6 falsely misses these definitions.
  */
 typedef struct tagWINDOWINFO
 {
@@ -777,7 +776,7 @@
 
 #define WS_ACTIVECAPTION    0x0001
 
-BOOL WINAPI
+extern "C" BOOL WINAPI
 GetWindowInfo(
     HWND hwnd,
     PWINDOWINFO pwi
--- Win32-GUI-1.01_03/GUI.xs.orig	2005-06-30 23:36:16.000000000 +0100
+++ Win32-GUI-1.01_03/GUI.xs	2005-07-01 09:28:29.863750000 +0100
@@ -2398,9 +2398,6 @@
 PREINIT:
     WINDOWINFO pwi;
 PPCODE:
-#if defined(_MSC_VER) && (_MSC_VER <= 1200) && (WINVER < 0x0500)
-    XSRETURN_UNDEF;
-#else
     pwi.cbSize = sizeof(WINDOWINFO);
     if(GetWindowInfo(handle, &pwi)) {
         EXTEND(SP, 4);
@@ -2413,7 +2410,6 @@
     else {
         XSRETURN_UNDEF;
     }
-#endif
 
     ###########################################################################
     # (@)METHOD:GetWindowRect()
--- Win32-GUI-1.01_03/GUI_MessageLoops.cpp.orig	2005-06-30 23:36:22.000000000 +0100
+++ Win32-GUI-1.01_03/GUI_MessageLoops.cpp	2005-07-01 11:25:19.805000000 +0100
@@ -30,9 +30,6 @@
 
         perlud = (LPPERLWIN32GUI_USERDATA) GetWindowLong((HWND) hwnd, GWL_USERDATA);
         if(perlud && (perlud->dwPlStyle & PERLWIN32GUI_FLICKERFREE)) {
-#if defined(_MSC_VER) && (_MSC_VER <= 1200) && (WINVER < 0x0500)
-            return (LRESULT) 0;
-#else
             WINDOWINFO pwi;
             RECT cr;
             pwi.cbSize = sizeof(WINDOWINFO);
@@ -73,7 +70,6 @@
             DeleteDC(hdc2);
             ReleaseDC(hwnd, hdc);
             return (LRESULT) 0;
-#endif
         }
         break;
     case WM_ERASEBKGND: