--- pl-5.4.7/packages/xpce/src/h/kernel.h.gcc4fix	2005-06-22 20:55:48.000000000 +0200
+++ pl-5.4.7/packages/xpce/src/h/kernel.h	2005-06-22 21:13:15.000000000 +0200
@@ -478,9 +478,6 @@
 						   : (size) * sizeof(char8)); \
   String name = str_init(&_s_ ## name ## _hdr, (proto), _s_ ## name ## _buf)
 
-#ifndef NO_BUILT_IN_DECL
-extern struct name builtin_names[];	/* object-array of built-in's */
-#endif
 #include "names.ih"			/* #defines for code used names */
 
 #define isName(name)	(isObject(name) && onFlag((name), F_ISNAME))
@@ -1137,6 +1134,10 @@
   ABSTRACT_CHAR_ARRAY
 End;
 
+#ifndef NO_BUILT_IN_DECL
+extern struct name builtin_names[];	/* object-array of built-in's */
+#endif
+
 NewClass(string)
   ABSTRACT_CHAR_ARRAY
 End;
--- pl-5.4.7/packages/xpce/src/win/window.c.gcc4fix	2005-06-22 21:18:01.000000000 +0200
+++ pl-5.4.7/packages/xpce/src/win/window.c	2005-06-22 21:18:44.000000000 +0200
@@ -1432,7 +1432,7 @@
 }
 
 
-static status
+status
 UpdateScrollbarValuesWindow(PceWindow sw)
 { return qadSendv(sw, NAME_updateScrollBarValues, 0, NULL);
 }
--- pl-5.4.7/packages/xpce/src/x11/xdnd.c.gcc4fix	2005-06-22 21:19:17.000000000 +0200
+++ pl-5.4.7/packages/xpce/src/x11/xdnd.c	2005-06-22 21:23:36.000000000 +0200
@@ -531,7 +531,8 @@
     xevent.xclient.message_type = dnd->XdndPosition;
     xevent.xclient.format = 32;
 
-    XDND_POSITION_SOURCE_WIN (&xevent) = from;
+//    XDND_POSITION_SOURCE_WIN (&xevent) = from;
+    xevent.xclient.data.l[0] = from;
     XDND_POSITION_ROOT_SET (&xevent, x, y);
     if (dnd_version_at_least (dnd->dragging_version, 1))
 	XDND_POSITION_TIME (&xevent) = time;
@@ -554,7 +555,8 @@
     xevent.xclient.message_type = dnd->XdndStatus;
     xevent.xclient.format = 32;
 
-    XDND_STATUS_TARGET_WIN (&xevent) = from;
+//    XDND_STATUS_TARGET_WIN (&xevent) = from;
+    xevent.xclient.data.l[0] = from;
     XDND_STATUS_WILL_ACCEPT_SET (&xevent, will_accept);
     if (will_accept)
 	XDND_STATUS_WANT_POSITION_SET (&xevent, want_position);
@@ -580,7 +582,8 @@
     xevent.xclient.message_type = dnd->XdndLeave;
     xevent.xclient.format = 32;
 
-    XDND_LEAVE_SOURCE_WIN (&xevent) = from;
+//    XDND_LEAVE_SOURCE_WIN (&xevent) = from;
+    xevent.xclient.data.l[0] = from;
 
     xdnd_send_event (dnd, window, &xevent);
 }
@@ -597,7 +600,8 @@
     xevent.xclient.message_type = dnd->XdndDrop;
     xevent.xclient.format = 32;
 
-    XDND_DROP_SOURCE_WIN (&xevent) = from;
+//    XDND_DROP_SOURCE_WIN (&xevent) = from;
+    xevent.xclient.data.l[0] = from;
     if (dnd_version_at_least (dnd->dragging_version, 1))
 	XDND_DROP_TIME (&xevent) = time;
 
@@ -618,7 +622,8 @@
     xevent.xclient.message_type = dnd->XdndFinished;
     xevent.xclient.format = 32;
 
-    XDND_FINISHED_TARGET_WIN (&xevent) = from;
+//    XDND_FINISHED_TARGET_WIN (&xevent) = from;
+    xevent.xclient.data.l[0] = from;
 
     xdnd_send_event (dnd, window, &xevent);
 }