diff --git a/WindowMaker.changes b/WindowMaker.changes
index 12e4c55..1591bea 100644
--- a/WindowMaker.changes
+++ b/WindowMaker.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri May 30 20:31:01 UTC 2014 - jengelh@inai.de
+
+- Edit wm-giflib.patch to support giflib7-5.1 API
+
 -------------------------------------------------------------------
 Thu Apr 10 20:57:27 UTC 2014 - sfalken@opensuse.org
 
diff --git a/WindowMaker.spec b/WindowMaker.spec
index aa547c3..4cf1749 100644
--- a/WindowMaker.spec
+++ b/WindowMaker.spec
@@ -96,7 +96,7 @@ cp %{name}/{menu.*,plmenu.*} menu_orig
 %patch1
 %patch2 -p1
 %patch3 -p1
-%patch101
+%patch101 -p1
 cp %{S:4} .
 cp %{S:6} .
 %if 0%{?suse_version} < 1140
diff --git a/wm-giflib.patch b/wm-giflib.patch
index 297d2b9..230f78f 100644
--- a/wm-giflib.patch
+++ b/wm-giflib.patch
@@ -1,7 +1,177 @@
-Index: WINGs/Examples/colorpick.c
+---
+ WINGs/Examples/colorpick.c      |    4 ++++
+ WINGs/Examples/fontl.c          |    4 ++++
+ WINGs/Examples/puzzle.c         |    4 ++++
+ WINGs/Extras/test.c             |    4 ++++
+ WINGs/Extras/wtabledelegates.c  |    4 ++++
+ WINGs/Extras/wtableview.c       |    4 ++++
+ WINGs/Tests/mywidget.c          |    4 ++++
+ WINGs/Tests/testmywidget.c      |    4 ++++
+ WINGs/Tests/wmfile.c            |    4 ++++
+ WINGs/Tests/wmquery.c           |    4 ++++
+ WINGs/Tests/wtest.c             |    4 ++++
+ WINGs/array.c                   |    4 ++++
+ WINGs/bagtree.c                 |    4 ++++
+ WINGs/configuration.c           |    4 ++++
+ WINGs/data.c                    |    4 ++++
+ WINGs/dragcommon.c              |    4 ++++
+ WINGs/dragdestination.c         |    4 ++++
+ WINGs/dragsource.c              |    4 ++++
+ WINGs/error.c                   |    4 ++++
+ WINGs/findfile.c                |    4 ++++
+ WINGs/handlers.c                |    4 ++++
+ WINGs/hashtable.c               |    4 ++++
+ WINGs/memory.c                  |    4 ++++
+ WINGs/misc.c                    |    4 ++++
+ WINGs/notification.c            |    4 ++++
+ WINGs/proplist.c                |    4 ++++
+ WINGs/selection.c               |    4 ++++
+ WINGs/string.c                  |    4 ++++
+ WINGs/tree.c                    |    4 ++++
+ WINGs/userdefaults.c            |    4 ++++
+ WINGs/usleep.c                  |    4 ++++
+ WINGs/wapplication.c            |    4 ++++
+ WINGs/wappresource.c            |    4 ++++
+ WINGs/wballoon.c                |    4 ++++
+ WINGs/wbox.c                    |    4 ++++
+ WINGs/wbrowser.c                |    4 ++++
+ WINGs/wbutton.c                 |    4 ++++
+ WINGs/wcolor.c                  |    4 ++++
+ WINGs/wcolorpanel.c             |    4 ++++
+ WINGs/wcolorwell.c              |    4 ++++
+ WINGs/wevent.c                  |    4 ++++
+ WINGs/wfilepanel.c              |    4 ++++
+ WINGs/wfont.c                   |    4 ++++
+ WINGs/wfontpanel.c              |    4 ++++
+ WINGs/wframe.c                  |    4 ++++
+ WINGs/widgets.c                 |    4 ++++
+ WINGs/winputmethod.c            |    4 ++++
+ WINGs/wlabel.c                  |    4 ++++
+ WINGs/wlist.c                   |    4 ++++
+ WINGs/wmenuitem.c               |    4 ++++
+ WINGs/wmisc.c                   |    4 ++++
+ WINGs/wpanel.c                  |    4 ++++
+ WINGs/wpixmap.c                 |    4 ++++
+ WINGs/wpopupbutton.c            |    4 ++++
+ WINGs/wprogressindicator.c      |    4 ++++
+ WINGs/wruler.c                  |    4 ++++
+ WINGs/wscroller.c               |    4 ++++
+ WINGs/wscrollview.c             |    4 ++++
+ WINGs/wslider.c                 |    4 ++++
+ WINGs/wsplitview.c              |    4 ++++
+ WINGs/wtabview.c                |    4 ++++
+ WINGs/wtext.c                   |    4 ++++
+ WINGs/wtextfield.c              |    4 ++++
+ WINGs/wutil.c                   |    4 ++++
+ WINGs/wview.c                   |    4 ++++
+ WINGs/wwindow.c                 |    4 ++++
+ WPrefs.app/Appearance.c         |    4 ++++
+ WPrefs.app/Configurations.c     |    4 ++++
+ WPrefs.app/Expert.c             |    4 ++++
+ WPrefs.app/Focus.c              |    4 ++++
+ WPrefs.app/FontSimple.c         |    4 ++++
+ WPrefs.app/Icons.c              |    4 ++++
+ WPrefs.app/KeyboardSettings.c   |    4 ++++
+ WPrefs.app/Menu.c               |    4 ++++
+ WPrefs.app/MenuPreferences.c    |    4 ++++
+ WPrefs.app/MouseSettings.c      |    4 ++++
+ WPrefs.app/Paths.c              |    4 ++++
+ WPrefs.app/Preferences.c        |    4 ++++
+ WPrefs.app/TexturePanel.c       |    4 ++++
+ WPrefs.app/Themes.c             |    4 ++++
+ WPrefs.app/WPrefs.c             |    4 ++++
+ WPrefs.app/WindowHandling.c     |    4 ++++
+ WPrefs.app/Workspace.c          |    4 ++++
+ WPrefs.app/double.c             |    4 ++++
+ WPrefs.app/editmenu.c           |    4 ++++
+ WPrefs.app/main.c               |    4 ++++
+ WPrefs.app/xmodifier.c          |    4 ++++
+ configure.ac                    |    5 +++--
+ src/actions.c                   |    4 ++++
+ src/appicon.c                   |    4 ++++
+ src/application.c               |    4 ++++
+ src/appmenu.c                   |    4 ++++
+ src/balloon.c                   |    4 ++++
+ src/client.c                    |    4 ++++
+ src/colormap.c                  |    4 ++++
+ src/cycling.c                   |    4 ++++
+ src/defaults.c                  |    4 ++++
+ src/dialog.c                    |    4 ++++
+ src/dock.c                      |    4 ++++
+ src/dockedapp.c                 |    4 ++++
+ src/event.c                     |    4 ++++
+ src/framewin.c                  |    4 ++++
+ src/geomview.c                  |    4 ++++
+ src/icon.c                      |    4 ++++
+ src/main.c                      |    4 ++++
+ src/menu.c                      |    4 ++++
+ src/misc.c                      |    4 ++++
+ src/monitor.c                   |    4 ++++
+ src/motif.c                     |    4 ++++
+ src/moveres.c                   |    4 ++++
+ src/osdep_bsd.c                 |    4 ++++
+ src/osdep_darwin.c              |    4 ++++
+ src/osdep_linux.c               |    4 ++++
+ src/osdep_stub.c                |    4 ++++
+ src/pixmap.c                    |    4 ++++
+ src/placement.c                 |    4 ++++
+ src/properties.c                |    4 ++++
+ src/resources.c                 |    4 ++++
+ src/rootmenu.c                  |    4 ++++
+ src/screen.c                    |    4 ++++
+ src/session.c                   |    4 ++++
+ src/shutdown.c                  |    4 ++++
+ src/stacking.c                  |    4 ++++
+ src/startup.c                   |    4 ++++
+ src/superfluous.c               |    4 ++++
+ src/switchmenu.c                |    4 ++++
+ src/switchpanel.c               |    4 ++++
+ src/texture.c                   |    4 ++++
+ src/usermenu.c                  |    4 ++++
+ src/wcore.c                     |    4 ++++
+ src/wdefaults.c                 |    4 ++++
+ src/window.c                    |    4 ++++
+ src/winmenu.c                   |    4 ++++
+ src/winspector.c                |    4 ++++
+ src/wmspec.c                    |    4 ++++
+ src/workspace.c                 |    4 ++++
+ src/xdnd.c                      |    4 ++++
+ src/xinerama.c                  |    4 ++++
+ src/xmodifier.c                 |    4 ++++
+ src/xutil.c                     |    4 ++++
+ test/notest.c                   |    4 ++++
+ test/wtest.c                    |    4 ++++
+ util/convertfonts.c             |    4 ++++
+ util/fontconv.c                 |    4 ++++
+ util/geticonset.c               |    4 ++++
+ util/getstyle.c                 |    4 ++++
+ util/seticons.c                 |    4 ++++
+ util/setstyle.c                 |    4 ++++
+ util/wdread.c                   |    4 ++++
+ util/wdwrite.c                  |    4 ++++
+ util/wmagnify.c                 |    4 ++++
+ util/wmgenmenu.c                |    4 ++++
+ util/wmmenugen.c                |    4 ++++
+ util/wmmenugen_misc.c           |    4 ++++
+ util/wmmenugen_parse_wmconfig.c |    4 ++++
+ util/wmmenugen_parse_xdg.c      |    4 ++++
+ util/wxcopy.c                   |    4 ++++
+ wmlib/app.c                     |    4 ++++
+ wmlib/command.c                 |    4 ++++
+ wmlib/event.c                   |    4 ++++
+ wmlib/menu.c                    |    4 ++++
+ wrlib/alpha_combine.c           |    4 ++++
+ wrlib/gif.c                     |   26 +++++++++++++++++++++++---
+ wrlib/tests/testdraw.c          |    4 ++++
+ wrlib/tests/testgrad.c          |    4 ++++
+ wrlib/tests/testrot.c           |    4 ++++
+ wrlib/tests/view.c              |    4 ++++
+ 167 files changed, 686 insertions(+), 5 deletions(-)
+
+Index: WindowMaker-0.95.5/WINGs/Examples/colorpick.c
 ===================================================================
---- WINGs/Examples/colorpick.c.orig
-+++ WINGs/Examples/colorpick.c
+--- WindowMaker-0.95.5.orig/WINGs/Examples/colorpick.c
++++ WindowMaker-0.95.5/WINGs/Examples/colorpick.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -11,10 +181,10 @@ Index: WINGs/Examples/colorpick.c
  #include <stdlib.h>
  #include <stdio.h>
  #include <WINGs/WINGs.h>
-Index: WINGs/Examples/fontl.c
+Index: WindowMaker-0.95.5/WINGs/Examples/fontl.c
 ===================================================================
---- WINGs/Examples/fontl.c.orig
-+++ WINGs/Examples/fontl.c
+--- WindowMaker-0.95.5.orig/WINGs/Examples/fontl.c
++++ WindowMaker-0.95.5/WINGs/Examples/fontl.c
 @@ -18,6 +18,10 @@
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -26,10 +196,10 @@ Index: WINGs/Examples/fontl.c
  #include <stdlib.h>
  #include <stdio.h>
  #include <stdint.h>
-Index: WINGs/Examples/puzzle.c
+Index: WindowMaker-0.95.5/WINGs/Examples/puzzle.c
 ===================================================================
---- WINGs/Examples/puzzle.c.orig
-+++ WINGs/Examples/puzzle.c
+--- WindowMaker-0.95.5.orig/WINGs/Examples/puzzle.c
++++ WindowMaker-0.95.5/WINGs/Examples/puzzle.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -39,10 +209,10 @@ Index: WINGs/Examples/puzzle.c
  #include <stdlib.h>
  #include <stdio.h>
  #include <WINGs/WINGs.h>
-Index: WINGs/Extras/test.c
+Index: WindowMaker-0.95.5/WINGs/Extras/test.c
 ===================================================================
---- WINGs/Extras/test.c.orig
-+++ WINGs/Extras/test.c
+--- WindowMaker-0.95.5.orig/WINGs/Extras/test.c
++++ WindowMaker-0.95.5/WINGs/Extras/test.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -52,10 +222,10 @@ Index: WINGs/Extras/test.c
  #include <WINGs/WINGs.h>
  #include <stdio.h>
  #include <stdint.h>
-Index: WINGs/Extras/wtabledelegates.c
+Index: WindowMaker-0.95.5/WINGs/Extras/wtabledelegates.c
 ===================================================================
---- WINGs/Extras/wtabledelegates.c.orig
-+++ WINGs/Extras/wtabledelegates.c
+--- WindowMaker-0.95.5.orig/WINGs/Extras/wtabledelegates.c
++++ WindowMaker-0.95.5/WINGs/Extras/wtabledelegates.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -65,10 +235,10 @@ Index: WINGs/Extras/wtabledelegates.c
  #include <stdint.h>
  #include <WINGs/WINGsP.h>
  
-Index: WINGs/Extras/wtableview.c
+Index: WindowMaker-0.95.5/WINGs/Extras/wtableview.c
 ===================================================================
---- WINGs/Extras/wtableview.c.orig
-+++ WINGs/Extras/wtableview.c
+--- WindowMaker-0.95.5.orig/WINGs/Extras/wtableview.c
++++ WindowMaker-0.95.5/WINGs/Extras/wtableview.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -78,10 +248,10 @@ Index: WINGs/Extras/wtableview.c
  #include <WINGs/WINGsP.h>
  #include <X11/cursorfont.h>
  #include <stdint.h>
-Index: WINGs/Tests/mywidget.c
+Index: WindowMaker-0.95.5/WINGs/Tests/mywidget.c
 ===================================================================
---- WINGs/Tests/mywidget.c.orig
-+++ WINGs/Tests/mywidget.c
+--- WindowMaker-0.95.5.orig/WINGs/Tests/mywidget.c
++++ WindowMaker-0.95.5/WINGs/Tests/mywidget.c
 @@ -13,6 +13,10 @@
   *
   *
@@ -93,10 +263,10 @@ Index: WINGs/Tests/mywidget.c
  #include <WINGs/WINGsP.h>
  
  /*
-Index: WINGs/Tests/testmywidget.c
+Index: WindowMaker-0.95.5/WINGs/Tests/testmywidget.c
 ===================================================================
---- WINGs/Tests/testmywidget.c.orig
-+++ WINGs/Tests/testmywidget.c
+--- WindowMaker-0.95.5.orig/WINGs/Tests/testmywidget.c
++++ WindowMaker-0.95.5/WINGs/Tests/testmywidget.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -106,10 +276,10 @@ Index: WINGs/Tests/testmywidget.c
  #include <WINGs/WINGs.h>
  #include <stdlib.h>
  
-Index: WINGs/Tests/wmfile.c
+Index: WindowMaker-0.95.5/WINGs/Tests/wmfile.c
 ===================================================================
---- WINGs/Tests/wmfile.c.orig
-+++ WINGs/Tests/wmfile.c
+--- WindowMaker-0.95.5.orig/WINGs/Tests/wmfile.c
++++ WindowMaker-0.95.5/WINGs/Tests/wmfile.c
 @@ -11,6 +11,10 @@
   -----------------------------------------------------------------------
   */
@@ -121,10 +291,10 @@ Index: WINGs/Tests/wmfile.c
  #include <WINGs/WINGs.h>
  
  #include <unistd.h>
-Index: WINGs/Tests/wmquery.c
+Index: WindowMaker-0.95.5/WINGs/Tests/wmquery.c
 ===================================================================
---- WINGs/Tests/wmquery.c.orig
-+++ WINGs/Tests/wmquery.c
+--- WindowMaker-0.95.5.orig/WINGs/Tests/wmquery.c
++++ WindowMaker-0.95.5/WINGs/Tests/wmquery.c
 @@ -3,6 +3,10 @@
   * Author: Len Trigg <trigg@cs.waikato.ac.nz>
   */
@@ -136,10 +306,10 @@ Index: WINGs/Tests/wmquery.c
  #include <WINGs/WINGs.h>
  
  #include <unistd.h>
-Index: WINGs/Tests/wtest.c
+Index: WindowMaker-0.95.5/WINGs/Tests/wtest.c
 ===================================================================
---- WINGs/Tests/wtest.c.orig
-+++ WINGs/Tests/wtest.c
+--- WindowMaker-0.95.5.orig/WINGs/Tests/wtest.c
++++ WindowMaker-0.95.5/WINGs/Tests/wtest.c
 @@ -2,6 +2,10 @@
   * WINGs test application
   */
@@ -151,10 +321,10 @@ Index: WINGs/Tests/wtest.c
  #include <WINGs/WINGs.h>
  
  #include <stdio.h>
-Index: WINGs/array.c
+Index: WindowMaker-0.95.5/WINGs/array.c
 ===================================================================
---- WINGs/array.c.orig
-+++ WINGs/array.c
+--- WindowMaker-0.95.5.orig/WINGs/array.c
++++ WindowMaker-0.95.5/WINGs/array.c
 @@ -8,6 +8,10 @@
   * proper credit is always appreciated :)
   */
@@ -166,10 +336,10 @@ Index: WINGs/array.c
  #include <stdlib.h>
  #include <string.h>
  
-Index: WINGs/bagtree.c
+Index: WindowMaker-0.95.5/WINGs/bagtree.c
 ===================================================================
---- WINGs/bagtree.c.orig
-+++ WINGs/bagtree.c
+--- WindowMaker-0.95.5.orig/WINGs/bagtree.c
++++ WindowMaker-0.95.5/WINGs/bagtree.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -179,10 +349,10 @@ Index: WINGs/bagtree.c
  #include <stdlib.h>
  #include <string.h>
  
-Index: WINGs/configuration.c
+Index: WindowMaker-0.95.5/WINGs/configuration.c
 ===================================================================
---- WINGs/configuration.c.orig
-+++ WINGs/configuration.c
+--- WindowMaker-0.95.5.orig/WINGs/configuration.c
++++ WindowMaker-0.95.5/WINGs/configuration.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -192,10 +362,10 @@ Index: WINGs/configuration.c
  #include "WINGsP.h"
  #include "wconfig.h"
  
-Index: WINGs/data.c
+Index: WindowMaker-0.95.5/WINGs/data.c
 ===================================================================
---- WINGs/data.c.orig
-+++ WINGs/data.c
+--- WindowMaker-0.95.5.orig/WINGs/data.c
++++ WindowMaker-0.95.5/WINGs/data.c
 @@ -19,6 +19,10 @@
   *  MA 02110-1301, USA.
   */
@@ -207,10 +377,10 @@ Index: WINGs/data.c
  #include <string.h>
  #include "WUtil.h"
  
-Index: WINGs/dragcommon.c
+Index: WindowMaker-0.95.5/WINGs/dragcommon.c
 ===================================================================
---- WINGs/dragcommon.c.orig
-+++ WINGs/dragcommon.c
+--- WindowMaker-0.95.5.orig/WINGs/dragcommon.c
++++ WindowMaker-0.95.5/WINGs/dragcommon.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -220,10 +390,10 @@ Index: WINGs/dragcommon.c
  #include "WINGsP.h"
  
  #define XDND_SOURCE_VERSION(dragInfo) dragInfo->protocolVersion
-Index: WINGs/dragdestination.c
+Index: WindowMaker-0.95.5/WINGs/dragdestination.c
 ===================================================================
---- WINGs/dragdestination.c.orig
-+++ WINGs/dragdestination.c
+--- WindowMaker-0.95.5.orig/WINGs/dragdestination.c
++++ WindowMaker-0.95.5/WINGs/dragdestination.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -233,10 +403,10 @@ Index: WINGs/dragdestination.c
  #include "WINGsP.h"
  #include <X11/Xatom.h>
  
-Index: WINGs/dragsource.c
+Index: WindowMaker-0.95.5/WINGs/dragsource.c
 ===================================================================
---- WINGs/dragsource.c.orig
-+++ WINGs/dragsource.c
+--- WindowMaker-0.95.5.orig/WINGs/dragsource.c
++++ WindowMaker-0.95.5/WINGs/dragsource.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -246,10 +416,10 @@ Index: WINGs/dragsource.c
  #include "wconfig.h"
  #include "WINGsP.h"
  
-Index: WINGs/error.c
+Index: WindowMaker-0.95.5/WINGs/error.c
 ===================================================================
---- WINGs/error.c.orig
-+++ WINGs/error.c
+--- WindowMaker-0.95.5.orig/WINGs/error.c
++++ WindowMaker-0.95.5/WINGs/error.c
 @@ -19,6 +19,10 @@
   *  MA 02110-1301, USA.
   */
@@ -261,10 +431,10 @@ Index: WINGs/error.c
  #include "wconfig.h"
  
  #include <stdarg.h>
-Index: WINGs/findfile.c
+Index: WindowMaker-0.95.5/WINGs/findfile.c
 ===================================================================
---- WINGs/findfile.c.orig
-+++ WINGs/findfile.c
+--- WindowMaker-0.95.5.orig/WINGs/findfile.c
++++ WindowMaker-0.95.5/WINGs/findfile.c
 @@ -19,6 +19,10 @@
   *  MA 02110-1301, USA.
   */
@@ -276,10 +446,10 @@ Index: WINGs/findfile.c
  #include "wconfig.h"
  
  #include "WUtil.h"
-Index: WINGs/handlers.c
+Index: WindowMaker-0.95.5/WINGs/handlers.c
 ===================================================================
---- WINGs/handlers.c.orig
-+++ WINGs/handlers.c
+--- WindowMaker-0.95.5.orig/WINGs/handlers.c
++++ WindowMaker-0.95.5/WINGs/handlers.c
 @@ -3,6 +3,10 @@
   * WINGs internal handlers: timer, idle and input handlers
   */
@@ -291,10 +461,10 @@ Index: WINGs/handlers.c
  #include "wconfig.h"
  #include "WINGsP.h"
  
-Index: WINGs/hashtable.c
+Index: WindowMaker-0.95.5/WINGs/hashtable.c
 ===================================================================
---- WINGs/hashtable.c.orig
-+++ WINGs/hashtable.c
+--- WindowMaker-0.95.5.orig/WINGs/hashtable.c
++++ WindowMaker-0.95.5/WINGs/hashtable.c
 @@ -1,5 +1,9 @@
  #include <config.h>
  
@@ -305,10 +475,10 @@ Index: WINGs/hashtable.c
  #include <sys/types.h>
  #include <string.h>
  #include <stdlib.h>
-Index: WINGs/memory.c
+Index: WindowMaker-0.95.5/WINGs/memory.c
 ===================================================================
---- WINGs/memory.c.orig
-+++ WINGs/memory.c
+--- WindowMaker-0.95.5.orig/WINGs/memory.c
++++ WindowMaker-0.95.5/WINGs/memory.c
 @@ -19,6 +19,10 @@
   *  MA 02110-1301, USA.
   */
@@ -320,10 +490,10 @@ Index: WINGs/memory.c
  #include "wconfig.h"
  #include "WUtil.h"
  
-Index: WINGs/misc.c
+Index: WindowMaker-0.95.5/WINGs/misc.c
 ===================================================================
---- WINGs/misc.c.orig
-+++ WINGs/misc.c
+--- WindowMaker-0.95.5.orig/WINGs/misc.c
++++ WindowMaker-0.95.5/WINGs/misc.c
 @@ -1,6 +1,10 @@
  
  /* Miscelaneous helper functions */
@@ -335,10 +505,10 @@ Index: WINGs/misc.c
  #include "WINGsP.h"
  
  WMRange wmkrange(int start, int count)
-Index: WINGs/notification.c
+Index: WindowMaker-0.95.5/WINGs/notification.c
 ===================================================================
---- WINGs/notification.c.orig
-+++ WINGs/notification.c
+--- WindowMaker-0.95.5.orig/WINGs/notification.c
++++ WindowMaker-0.95.5/WINGs/notification.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -348,10 +518,10 @@ Index: WINGs/notification.c
  #include <stdlib.h>
  #include <assert.h>
  #include <stdio.h>
-Index: WINGs/proplist.c
+Index: WindowMaker-0.95.5/WINGs/proplist.c
 ===================================================================
---- WINGs/proplist.c.orig
-+++ WINGs/proplist.c
+--- WindowMaker-0.95.5.orig/WINGs/proplist.c
++++ WindowMaker-0.95.5/WINGs/proplist.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -361,10 +531,10 @@ Index: WINGs/proplist.c
  #include <sys/types.h>
  #include <sys/stat.h>
  
-Index: WINGs/selection.c
+Index: WindowMaker-0.95.5/WINGs/selection.c
 ===================================================================
---- WINGs/selection.c.orig
-+++ WINGs/selection.c
+--- WindowMaker-0.95.5.orig/WINGs/selection.c
++++ WindowMaker-0.95.5/WINGs/selection.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -374,10 +544,10 @@ Index: WINGs/selection.c
  #include <stdlib.h>
  
  #include <X11/Xatom.h>
-Index: WINGs/string.c
+Index: WindowMaker-0.95.5/WINGs/string.c
 ===================================================================
---- WINGs/string.c.orig
-+++ WINGs/string.c
+--- WindowMaker-0.95.5.orig/WINGs/string.c
++++ WindowMaker-0.95.5/WINGs/string.c
 @@ -6,6 +6,10 @@
  #   undef _XOPEN_SOURCE
  #endif
@@ -389,10 +559,10 @@ Index: WINGs/string.c
  #include "wconfig.h"
  
  #include <string.h>
-Index: WINGs/tree.c
+Index: WindowMaker-0.95.5/WINGs/tree.c
 ===================================================================
---- WINGs/tree.c.orig
-+++ WINGs/tree.c
+--- WindowMaker-0.95.5.orig/WINGs/tree.c
++++ WindowMaker-0.95.5/WINGs/tree.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -402,10 +572,10 @@ Index: WINGs/tree.c
  #include <string.h>
  
  #include "WUtil.h"
-Index: WINGs/userdefaults.c
+Index: WindowMaker-0.95.5/WINGs/userdefaults.c
 ===================================================================
---- WINGs/userdefaults.c.orig
-+++ WINGs/userdefaults.c
+--- WindowMaker-0.95.5.orig/WINGs/userdefaults.c
++++ WindowMaker-0.95.5/WINGs/userdefaults.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -415,10 +585,10 @@ Index: WINGs/userdefaults.c
  #include <stdlib.h>
  #include <string.h>
  #include <strings.h>
-Index: WINGs/usleep.c
+Index: WindowMaker-0.95.5/WINGs/usleep.c
 ===================================================================
---- WINGs/usleep.c.orig
-+++ WINGs/usleep.c
+--- WindowMaker-0.95.5.orig/WINGs/usleep.c
++++ WindowMaker-0.95.5/WINGs/usleep.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -428,10 +598,10 @@ Index: WINGs/usleep.c
  #include <errno.h>
  #include <time.h>
  
-Index: WINGs/wapplication.c
+Index: WindowMaker-0.95.5/WINGs/wapplication.c
 ===================================================================
---- WINGs/wapplication.c.orig
-+++ WINGs/wapplication.c
+--- WindowMaker-0.95.5.orig/WINGs/wapplication.c
++++ WindowMaker-0.95.5/WINGs/wapplication.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -441,10 +611,10 @@ Index: WINGs/wapplication.c
  #include <unistd.h>
  #include <X11/Xlocale.h>
  
-Index: WINGs/wappresource.c
+Index: WindowMaker-0.95.5/WINGs/wappresource.c
 ===================================================================
---- WINGs/wappresource.c.orig
-+++ WINGs/wappresource.c
+--- WindowMaker-0.95.5.orig/WINGs/wappresource.c
++++ WindowMaker-0.95.5/WINGs/wappresource.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -454,10 +624,10 @@ Index: WINGs/wappresource.c
  #include <unistd.h>
  
  #include "WINGsP.h"
-Index: WINGs/wballoon.c
+Index: WindowMaker-0.95.5/WINGs/wballoon.c
 ===================================================================
---- WINGs/wballoon.c.orig
-+++ WINGs/wballoon.c
+--- WindowMaker-0.95.5.orig/WINGs/wballoon.c
++++ WindowMaker-0.95.5/WINGs/wballoon.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -467,10 +637,10 @@ Index: WINGs/wballoon.c
  #include "wconfig.h"
  #include "WINGsP.h"
  
-Index: WINGs/wbox.c
+Index: WindowMaker-0.95.5/WINGs/wbox.c
 ===================================================================
---- WINGs/wbox.c.orig
-+++ WINGs/wbox.c
+--- WindowMaker-0.95.5.orig/WINGs/wbox.c
++++ WindowMaker-0.95.5/WINGs/wbox.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -480,10 +650,10 @@ Index: WINGs/wbox.c
  #include "WINGsP.h"
  
  typedef struct {
-Index: WINGs/wbrowser.c
+Index: WindowMaker-0.95.5/WINGs/wbrowser.c
 ===================================================================
---- WINGs/wbrowser.c.orig
-+++ WINGs/wbrowser.c
+--- WindowMaker-0.95.5.orig/WINGs/wbrowser.c
++++ WindowMaker-0.95.5/WINGs/wbrowser.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -493,10 +663,10 @@ Index: WINGs/wbrowser.c
  #include "WINGsP.h"
  #include <math.h>		/* for : double rint (double) */
  
-Index: WINGs/wbutton.c
+Index: WindowMaker-0.95.5/WINGs/wbutton.c
 ===================================================================
---- WINGs/wbutton.c.orig
-+++ WINGs/wbutton.c
+--- WindowMaker-0.95.5.orig/WINGs/wbutton.c
++++ WindowMaker-0.95.5/WINGs/wbutton.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -506,10 +676,10 @@ Index: WINGs/wbutton.c
  #include "WINGsP.h"
  
  typedef struct W_Button {
-Index: WINGs/wcolor.c
+Index: WindowMaker-0.95.5/WINGs/wcolor.c
 ===================================================================
---- WINGs/wcolor.c.orig
-+++ WINGs/wcolor.c
+--- WindowMaker-0.95.5.orig/WINGs/wcolor.c
++++ WindowMaker-0.95.5/WINGs/wcolor.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -519,10 +689,10 @@ Index: WINGs/wcolor.c
  #include "WINGsP.h"
  
  #include "wconfig.h"
-Index: WINGs/wcolorpanel.c
+Index: WindowMaker-0.95.5/WINGs/wcolorpanel.c
 ===================================================================
---- WINGs/wcolorpanel.c.orig
-+++ WINGs/wcolorpanel.c
+--- WindowMaker-0.95.5.orig/WINGs/wcolorpanel.c
++++ WindowMaker-0.95.5/WINGs/wcolorpanel.c
 @@ -23,6 +23,10 @@
   * 	-	Resizing
   */
@@ -534,10 +704,10 @@ Index: WINGs/wcolorpanel.c
  #include "wconfig.h"
  #include "WINGsP.h"
  #include "rgb.h"
-Index: WINGs/wcolorwell.c
+Index: WindowMaker-0.95.5/WINGs/wcolorwell.c
 ===================================================================
---- WINGs/wcolorwell.c.orig
-+++ WINGs/wcolorwell.c
+--- WindowMaker-0.95.5.orig/WINGs/wcolorwell.c
++++ WindowMaker-0.95.5/WINGs/wcolorwell.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -547,10 +717,10 @@ Index: WINGs/wcolorwell.c
  #include "WINGsP.h"
  
  #define XDND_COLOR_DATA_TYPE "application/X-color"
-Index: WINGs/wevent.c
+Index: WindowMaker-0.95.5/WINGs/wevent.c
 ===================================================================
---- WINGs/wevent.c.orig
-+++ WINGs/wevent.c
+--- WindowMaker-0.95.5.orig/WINGs/wevent.c
++++ WindowMaker-0.95.5/WINGs/wevent.c
 @@ -3,6 +3,10 @@
   * This event handling stuff was inspired on Tk.
   */
@@ -562,10 +732,10 @@ Index: WINGs/wevent.c
  #include "WINGsP.h"
  
  /* table to map event types to event masks */
-Index: WINGs/wfilepanel.c
+Index: WindowMaker-0.95.5/WINGs/wfilepanel.c
 ===================================================================
---- WINGs/wfilepanel.c.orig
-+++ WINGs/wfilepanel.c
+--- WindowMaker-0.95.5.orig/WINGs/wfilepanel.c
++++ WindowMaker-0.95.5/WINGs/wfilepanel.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -575,10 +745,10 @@ Index: WINGs/wfilepanel.c
  #include <sys/types.h>
  #include <sys/stat.h>
  
-Index: WINGs/wfont.c
+Index: WindowMaker-0.95.5/WINGs/wfont.c
 ===================================================================
---- WINGs/wfont.c.orig
-+++ WINGs/wfont.c
+--- WindowMaker-0.95.5.orig/WINGs/wfont.c
++++ WindowMaker-0.95.5/WINGs/wfont.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -588,10 +758,10 @@ Index: WINGs/wfont.c
  #include <stdlib.h>
  
  #include "wconfig.h"
-Index: WINGs/wfontpanel.c
+Index: WindowMaker-0.95.5/WINGs/wfontpanel.c
 ===================================================================
---- WINGs/wfontpanel.c.orig
-+++ WINGs/wfontpanel.c
+--- WindowMaker-0.95.5.orig/WINGs/wfontpanel.c
++++ WindowMaker-0.95.5/WINGs/wfontpanel.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -601,10 +771,10 @@ Index: WINGs/wfontpanel.c
  #include "WINGsP.h"
  #include "WUtil.h"
  #include "wconfig.h"
-Index: WINGs/wframe.c
+Index: WindowMaker-0.95.5/WINGs/wframe.c
 ===================================================================
---- WINGs/wframe.c.orig
-+++ WINGs/wframe.c
+--- WindowMaker-0.95.5.orig/WINGs/wframe.c
++++ WindowMaker-0.95.5/WINGs/wframe.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -614,10 +784,10 @@ Index: WINGs/wframe.c
  #include "WINGsP.h"
  
  typedef struct W_Frame {
-Index: WINGs/widgets.c
+Index: WindowMaker-0.95.5/WINGs/widgets.c
 ===================================================================
---- WINGs/widgets.c.orig
-+++ WINGs/widgets.c
+--- WindowMaker-0.95.5.orig/WINGs/widgets.c
++++ WindowMaker-0.95.5/WINGs/widgets.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -627,10 +797,10 @@ Index: WINGs/widgets.c
  #include "WINGsP.h"
  #include "wconfig.h"
  
-Index: WINGs/winputmethod.c
+Index: WindowMaker-0.95.5/WINGs/winputmethod.c
 ===================================================================
---- WINGs/winputmethod.c.orig
-+++ WINGs/winputmethod.c
+--- WindowMaker-0.95.5.orig/WINGs/winputmethod.c
++++ WindowMaker-0.95.5/WINGs/winputmethod.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -640,10 +810,10 @@ Index: WINGs/winputmethod.c
  #include <X11/Xlib.h>
  
  #include "WINGsP.h"
-Index: WINGs/wlabel.c
+Index: WindowMaker-0.95.5/WINGs/wlabel.c
 ===================================================================
---- WINGs/wlabel.c.orig
-+++ WINGs/wlabel.c
+--- WindowMaker-0.95.5.orig/WINGs/wlabel.c
++++ WindowMaker-0.95.5/WINGs/wlabel.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -653,10 +823,10 @@ Index: WINGs/wlabel.c
  #include "WINGsP.h"
  
  typedef struct W_Label {
-Index: WINGs/wlist.c
+Index: WindowMaker-0.95.5/WINGs/wlist.c
 ===================================================================
---- WINGs/wlist.c.orig
-+++ WINGs/wlist.c
+--- WindowMaker-0.95.5.orig/WINGs/wlist.c
++++ WindowMaker-0.95.5/WINGs/wlist.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -666,10 +836,10 @@ Index: WINGs/wlist.c
  #include "WINGsP.h"
  
  char *WMListDidScrollNotification = "WMListDidScrollNotification";
-Index: WINGs/wmenuitem.c
+Index: WindowMaker-0.95.5/WINGs/wmenuitem.c
 ===================================================================
---- WINGs/wmenuitem.c.orig
-+++ WINGs/wmenuitem.c
+--- WindowMaker-0.95.5.orig/WINGs/wmenuitem.c
++++ WindowMaker-0.95.5/WINGs/wmenuitem.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -679,10 +849,10 @@ Index: WINGs/wmenuitem.c
  #include "WINGsP.h"
  
  typedef struct W_MenuItem {
-Index: WINGs/wmisc.c
+Index: WindowMaker-0.95.5/WINGs/wmisc.c
 ===================================================================
---- WINGs/wmisc.c.orig
-+++ WINGs/wmisc.c
+--- WindowMaker-0.95.5.orig/WINGs/wmisc.c
++++ WindowMaker-0.95.5/WINGs/wmisc.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -692,10 +862,10 @@ Index: WINGs/wmisc.c
  #include "WINGsP.h"
  
  #include <wraster.h>
-Index: WINGs/wpanel.c
+Index: WindowMaker-0.95.5/WINGs/wpanel.c
 ===================================================================
---- WINGs/wpanel.c.orig
-+++ WINGs/wpanel.c
+--- WindowMaker-0.95.5.orig/WINGs/wpanel.c
++++ WindowMaker-0.95.5/WINGs/wpanel.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -705,10 +875,10 @@ Index: WINGs/wpanel.c
  #include "WINGsP.h"
  
  #include <X11/keysym.h>
-Index: WINGs/wpixmap.c
+Index: WindowMaker-0.95.5/WINGs/wpixmap.c
 ===================================================================
---- WINGs/wpixmap.c.orig
-+++ WINGs/wpixmap.c
+--- WindowMaker-0.95.5.orig/WINGs/wpixmap.c
++++ WindowMaker-0.95.5/WINGs/wpixmap.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -718,10 +888,10 @@ Index: WINGs/wpixmap.c
  #include "WINGsP.h"
  
  #include <wraster.h>
-Index: WINGs/wpopupbutton.c
+Index: WindowMaker-0.95.5/WINGs/wpopupbutton.c
 ===================================================================
---- WINGs/wpopupbutton.c.orig
-+++ WINGs/wpopupbutton.c
+--- WindowMaker-0.95.5.orig/WINGs/wpopupbutton.c
++++ WindowMaker-0.95.5/WINGs/wpopupbutton.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -731,10 +901,10 @@ Index: WINGs/wpopupbutton.c
  #include "WINGsP.h"
  
  typedef struct W_PopUpButton {
-Index: WINGs/wprogressindicator.c
+Index: WindowMaker-0.95.5/WINGs/wprogressindicator.c
 ===================================================================
---- WINGs/wprogressindicator.c.orig
-+++ WINGs/wprogressindicator.c
+--- WindowMaker-0.95.5.orig/WINGs/wprogressindicator.c
++++ WindowMaker-0.95.5/WINGs/wprogressindicator.c
 @@ -5,6 +5,10 @@
   * - centralized drawing into one pain function
   */
@@ -746,10 +916,10 @@ Index: WINGs/wprogressindicator.c
  #include "WINGsP.h"
  
  typedef struct W_ProgressIndicator {
-Index: WINGs/wruler.c
+Index: WindowMaker-0.95.5/WINGs/wruler.c
 ===================================================================
---- WINGs/wruler.c.orig
-+++ WINGs/wruler.c
+--- WindowMaker-0.95.5.orig/WINGs/wruler.c
++++ WindowMaker-0.95.5/WINGs/wruler.c
 @@ -19,6 +19,10 @@
   *  MA 02110-1301, USA.
   */
@@ -761,10 +931,10 @@ Index: WINGs/wruler.c
  #include "WINGsP.h"
  #include "wconfig.h"
  
-Index: WINGs/wscroller.c
+Index: WindowMaker-0.95.5/WINGs/wscroller.c
 ===================================================================
---- WINGs/wscroller.c.orig
-+++ WINGs/wscroller.c
+--- WindowMaker-0.95.5.orig/WINGs/wscroller.c
++++ WindowMaker-0.95.5/WINGs/wscroller.c
 @@ -7,6 +7,10 @@
  #   undef _XOPEN_SOURCE
  #endif
@@ -776,10 +946,10 @@ Index: WINGs/wscroller.c
  #include "WINGsP.h"
  
  #include <math.h>
-Index: WINGs/wscrollview.c
+Index: WindowMaker-0.95.5/WINGs/wscrollview.c
 ===================================================================
---- WINGs/wscrollview.c.orig
-+++ WINGs/wscrollview.c
+--- WindowMaker-0.95.5.orig/WINGs/wscrollview.c
++++ WindowMaker-0.95.5/WINGs/wscrollview.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -789,10 +959,10 @@ Index: WINGs/wscrollview.c
  #include "WINGsP.h"
  
  typedef struct W_ScrollView {
-Index: WINGs/wslider.c
+Index: WindowMaker-0.95.5/WINGs/wslider.c
 ===================================================================
---- WINGs/wslider.c.orig
-+++ WINGs/wslider.c
+--- WindowMaker-0.95.5.orig/WINGs/wslider.c
++++ WindowMaker-0.95.5/WINGs/wslider.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -802,10 +972,10 @@ Index: WINGs/wslider.c
  #include "WINGsP.h"
  
  #undef STRICT_NEXT_BEHAVIOUR
-Index: WINGs/wsplitview.c
+Index: WindowMaker-0.95.5/WINGs/wsplitview.c
 ===================================================================
---- WINGs/wsplitview.c.orig
-+++ WINGs/wsplitview.c
+--- WindowMaker-0.95.5.orig/WINGs/wsplitview.c
++++ WindowMaker-0.95.5/WINGs/wsplitview.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -815,10 +985,10 @@ Index: WINGs/wsplitview.c
  #include "WINGsP.h"
  
  /*
-Index: WINGs/wtabview.c
+Index: WindowMaker-0.95.5/WINGs/wtabview.c
 ===================================================================
---- WINGs/wtabview.c.orig
-+++ WINGs/wtabview.c
+--- WindowMaker-0.95.5.orig/WINGs/wtabview.c
++++ WindowMaker-0.95.5/WINGs/wtabview.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -828,10 +998,10 @@ Index: WINGs/wtabview.c
  #include "WINGsP.h"
  
  typedef struct W_TabView {
-Index: WINGs/wtext.c
+Index: WindowMaker-0.95.5/WINGs/wtext.c
 ===================================================================
---- WINGs/wtext.c.orig
-+++ WINGs/wtext.c
+--- WindowMaker-0.95.5.orig/WINGs/wtext.c
++++ WindowMaker-0.95.5/WINGs/wtext.c
 @@ -1,6 +1,10 @@
  
  /*  WINGs WMText: multi-line/font/color/graphic text widget,  by Nwanua. */
@@ -843,10 +1013,10 @@ Index: WINGs/wtext.c
  #include "WINGsP.h"
  #include <ctype.h>
  #include <X11/keysym.h>
-Index: WINGs/wtextfield.c
+Index: WindowMaker-0.95.5/WINGs/wtextfield.c
 ===================================================================
---- WINGs/wtextfield.c.orig
-+++ WINGs/wtextfield.c
+--- WindowMaker-0.95.5.orig/WINGs/wtextfield.c
++++ WindowMaker-0.95.5/WINGs/wtextfield.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -856,10 +1026,10 @@ Index: WINGs/wtextfield.c
  #include "WINGsP.h"
  #include "wconfig.h"
  
-Index: WINGs/wutil.c
+Index: WindowMaker-0.95.5/WINGs/wutil.c
 ===================================================================
---- WINGs/wutil.c.orig
-+++ WINGs/wutil.c
+--- WindowMaker-0.95.5.orig/WINGs/wutil.c
++++ WindowMaker-0.95.5/WINGs/wutil.c
 @@ -3,6 +3,10 @@
   * Handle events for non-GUI based applications
   */
@@ -871,10 +1041,10 @@ Index: WINGs/wutil.c
  #include "WINGsP.h"
  
  void WHandleEvents()
-Index: WINGs/wview.c
+Index: WindowMaker-0.95.5/WINGs/wview.c
 ===================================================================
---- WINGs/wview.c.orig
-+++ WINGs/wview.c
+--- WindowMaker-0.95.5.orig/WINGs/wview.c
++++ WindowMaker-0.95.5/WINGs/wview.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -884,10 +1054,10 @@ Index: WINGs/wview.c
  #include "WINGsP.h"
  
  #include <X11/Xresource.h>
-Index: WINGs/wwindow.c
+Index: WindowMaker-0.95.5/WINGs/wwindow.c
 ===================================================================
---- WINGs/wwindow.c.orig
-+++ WINGs/wwindow.c
+--- WindowMaker-0.95.5.orig/WINGs/wwindow.c
++++ WindowMaker-0.95.5/WINGs/wwindow.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -897,10 +1067,10 @@ Index: WINGs/wwindow.c
  #include <X11/Xmd.h>
  
  #include "WINGsP.h"
-Index: WPrefs.app/Appearance.c
+Index: WindowMaker-0.95.5/WPrefs.app/Appearance.c
 ===================================================================
---- WPrefs.app/Appearance.c.orig
-+++ WPrefs.app/Appearance.c
+--- WindowMaker-0.95.5.orig/WPrefs.app/Appearance.c
++++ WindowMaker-0.95.5/WPrefs.app/Appearance.c
 @@ -19,6 +19,10 @@
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -912,10 +1082,10 @@ Index: WPrefs.app/Appearance.c
  #include "WPrefs.h"
  
  #include <unistd.h>
-Index: WPrefs.app/Configurations.c
+Index: WindowMaker-0.95.5/WPrefs.app/Configurations.c
 ===================================================================
---- WPrefs.app/Configurations.c.orig
-+++ WPrefs.app/Configurations.c
+--- WindowMaker-0.95.5.orig/WPrefs.app/Configurations.c
++++ WindowMaker-0.95.5/WPrefs.app/Configurations.c
 @@ -19,6 +19,10 @@
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -927,10 +1097,10 @@ Index: WPrefs.app/Configurations.c
  #include "WPrefs.h"
  
  typedef struct _Panel {
-Index: WPrefs.app/Expert.c
+Index: WindowMaker-0.95.5/WPrefs.app/Expert.c
 ===================================================================
---- WPrefs.app/Expert.c.orig
-+++ WPrefs.app/Expert.c
+--- WindowMaker-0.95.5.orig/WPrefs.app/Expert.c
++++ WindowMaker-0.95.5/WPrefs.app/Expert.c
 @@ -19,6 +19,10 @@
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -942,10 +1112,10 @@ Index: WPrefs.app/Expert.c
  #include "WPrefs.h"
  
  /* This structure containts the list of all the check-buttons to display in the
-Index: WPrefs.app/Focus.c
+Index: WindowMaker-0.95.5/WPrefs.app/Focus.c
 ===================================================================
---- WPrefs.app/Focus.c.orig
-+++ WPrefs.app/Focus.c
+--- WindowMaker-0.95.5.orig/WPrefs.app/Focus.c
++++ WindowMaker-0.95.5/WPrefs.app/Focus.c
 @@ -19,6 +19,10 @@
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -957,10 +1127,10 @@ Index: WPrefs.app/Focus.c
  #include "WPrefs.h"
  
  typedef struct _Panel {
-Index: WPrefs.app/FontSimple.c
+Index: WindowMaker-0.95.5/WPrefs.app/FontSimple.c
 ===================================================================
---- WPrefs.app/FontSimple.c.orig
-+++ WPrefs.app/FontSimple.c
+--- WindowMaker-0.95.5.orig/WPrefs.app/FontSimple.c
++++ WindowMaker-0.95.5/WPrefs.app/FontSimple.c
 @@ -19,6 +19,10 @@
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -972,10 +1142,10 @@ Index: WPrefs.app/FontSimple.c
  #include "WPrefs.h"
  #include <unistd.h>
  #include <fontconfig/fontconfig.h>
-Index: WPrefs.app/Icons.c
+Index: WindowMaker-0.95.5/WPrefs.app/Icons.c
 ===================================================================
---- WPrefs.app/Icons.c.orig
-+++ WPrefs.app/Icons.c
+--- WindowMaker-0.95.5.orig/WPrefs.app/Icons.c
++++ WindowMaker-0.95.5/WPrefs.app/Icons.c
 @@ -19,6 +19,10 @@
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -987,10 +1157,10 @@ Index: WPrefs.app/Icons.c
  #include "WPrefs.h"
  
  typedef struct _Panel {
-Index: WPrefs.app/KeyboardSettings.c
+Index: WindowMaker-0.95.5/WPrefs.app/KeyboardSettings.c
 ===================================================================
---- WPrefs.app/KeyboardSettings.c.orig
-+++ WPrefs.app/KeyboardSettings.c
+--- WindowMaker-0.95.5.orig/WPrefs.app/KeyboardSettings.c
++++ WindowMaker-0.95.5/WPrefs.app/KeyboardSettings.c
 @@ -19,6 +19,10 @@
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -1002,10 +1172,10 @@ Index: WPrefs.app/KeyboardSettings.c
  #include "WPrefs.h"
  
  typedef struct _Panel {
-Index: WPrefs.app/Menu.c
+Index: WindowMaker-0.95.5/WPrefs.app/Menu.c
 ===================================================================
---- WPrefs.app/Menu.c.orig
-+++ WPrefs.app/Menu.c
+--- WindowMaker-0.95.5.orig/WPrefs.app/Menu.c
++++ WindowMaker-0.95.5/WPrefs.app/Menu.c
 @@ -19,6 +19,10 @@
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -1017,10 +1187,10 @@ Index: WPrefs.app/Menu.c
  #include "WPrefs.h"
  #include <assert.h>
  #include <ctype.h>
-Index: WPrefs.app/MenuPreferences.c
+Index: WindowMaker-0.95.5/WPrefs.app/MenuPreferences.c
 ===================================================================
---- WPrefs.app/MenuPreferences.c.orig
-+++ WPrefs.app/MenuPreferences.c
+--- WindowMaker-0.95.5.orig/WPrefs.app/MenuPreferences.c
++++ WindowMaker-0.95.5/WPrefs.app/MenuPreferences.c
 @@ -19,6 +19,10 @@
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -1032,10 +1202,10 @@ Index: WPrefs.app/MenuPreferences.c
  #include "WPrefs.h"
  
  typedef struct _Panel {
-Index: WPrefs.app/MouseSettings.c
+Index: WindowMaker-0.95.5/WPrefs.app/MouseSettings.c
 ===================================================================
---- WPrefs.app/MouseSettings.c.orig
-+++ WPrefs.app/MouseSettings.c
+--- WindowMaker-0.95.5.orig/WPrefs.app/MouseSettings.c
++++ WindowMaker-0.95.5/WPrefs.app/MouseSettings.c
 @@ -20,6 +20,10 @@
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -1047,10 +1217,10 @@ Index: WPrefs.app/MouseSettings.c
  #include "WPrefs.h"
  
  #include <X11/Xutil.h>
-Index: WPrefs.app/Paths.c
+Index: WindowMaker-0.95.5/WPrefs.app/Paths.c
 ===================================================================
---- WPrefs.app/Paths.c.orig
-+++ WPrefs.app/Paths.c
+--- WindowMaker-0.95.5.orig/WPrefs.app/Paths.c
++++ WindowMaker-0.95.5/WPrefs.app/Paths.c
 @@ -19,6 +19,10 @@
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -1062,10 +1232,10 @@ Index: WPrefs.app/Paths.c
  #include "WPrefs.h"
  #include <unistd.h>
  #include <assert.h>
-Index: WPrefs.app/Preferences.c
+Index: WindowMaker-0.95.5/WPrefs.app/Preferences.c
 ===================================================================
---- WPrefs.app/Preferences.c.orig
-+++ WPrefs.app/Preferences.c
+--- WindowMaker-0.95.5.orig/WPrefs.app/Preferences.c
++++ WindowMaker-0.95.5/WPrefs.app/Preferences.c
 @@ -19,6 +19,10 @@
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -1077,10 +1247,10 @@ Index: WPrefs.app/Preferences.c
  #include "WPrefs.h"
  
  typedef struct _Panel {
-Index: WPrefs.app/TexturePanel.c
+Index: WindowMaker-0.95.5/WPrefs.app/TexturePanel.c
 ===================================================================
---- WPrefs.app/TexturePanel.c.orig
-+++ WPrefs.app/TexturePanel.c
+--- WindowMaker-0.95.5.orig/WPrefs.app/TexturePanel.c
++++ WindowMaker-0.95.5/WPrefs.app/TexturePanel.c
 @@ -20,6 +20,10 @@
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -1092,10 +1262,10 @@ Index: WPrefs.app/TexturePanel.c
  #include <stdio.h>
  #include <stdlib.h>
  #include <string.h>
-Index: WPrefs.app/Themes.c
+Index: WindowMaker-0.95.5/WPrefs.app/Themes.c
 ===================================================================
---- WPrefs.app/Themes.c.orig
-+++ WPrefs.app/Themes.c
+--- WindowMaker-0.95.5.orig/WPrefs.app/Themes.c
++++ WindowMaker-0.95.5/WPrefs.app/Themes.c
 @@ -19,6 +19,10 @@
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -1107,10 +1277,10 @@ Index: WPrefs.app/Themes.c
  #include "WPrefs.h"
  
  #include <unistd.h>
-Index: WPrefs.app/WPrefs.c
+Index: WindowMaker-0.95.5/WPrefs.app/WPrefs.c
 ===================================================================
---- WPrefs.app/WPrefs.c.orig
-+++ WPrefs.app/WPrefs.c
+--- WindowMaker-0.95.5.orig/WPrefs.app/WPrefs.c
++++ WindowMaker-0.95.5/WPrefs.app/WPrefs.c
 @@ -19,6 +19,10 @@
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -1122,10 +1292,10 @@ Index: WPrefs.app/WPrefs.c
  #include "WPrefs.h"
  #include <assert.h>
  
-Index: WPrefs.app/WindowHandling.c
+Index: WindowMaker-0.95.5/WPrefs.app/WindowHandling.c
 ===================================================================
---- WPrefs.app/WindowHandling.c.orig
-+++ WPrefs.app/WindowHandling.c
+--- WindowMaker-0.95.5.orig/WPrefs.app/WindowHandling.c
++++ WindowMaker-0.95.5/WPrefs.app/WindowHandling.c
 @@ -19,6 +19,10 @@
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -1137,10 +1307,10 @@ Index: WPrefs.app/WindowHandling.c
  #include "WPrefs.h"
  
  typedef struct _Panel {
-Index: WPrefs.app/Workspace.c
+Index: WindowMaker-0.95.5/WPrefs.app/Workspace.c
 ===================================================================
---- WPrefs.app/Workspace.c.orig
-+++ WPrefs.app/Workspace.c
+--- WindowMaker-0.95.5.orig/WPrefs.app/Workspace.c
++++ WindowMaker-0.95.5/WPrefs.app/Workspace.c
 @@ -19,6 +19,10 @@
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -1152,10 +1322,10 @@ Index: WPrefs.app/Workspace.c
  #include "WPrefs.h"
  
  typedef struct _Panel {
-Index: WPrefs.app/double.c
+Index: WindowMaker-0.95.5/WPrefs.app/double.c
 ===================================================================
---- WPrefs.app/double.c.orig
-+++ WPrefs.app/double.c
+--- WindowMaker-0.95.5.orig/WPrefs.app/double.c
++++ WindowMaker-0.95.5/WPrefs.app/double.c
 @@ -4,6 +4,10 @@
   *
   */
@@ -1167,10 +1337,10 @@ Index: WPrefs.app/double.c
  #include <WINGs/WINGsP.h>
  #include "WPrefs.h"
  
-Index: WPrefs.app/editmenu.c
+Index: WindowMaker-0.95.5/WPrefs.app/editmenu.c
 ===================================================================
---- WPrefs.app/editmenu.c.orig
-+++ WPrefs.app/editmenu.c
+--- WindowMaker-0.95.5.orig/WPrefs.app/editmenu.c
++++ WindowMaker-0.95.5/WPrefs.app/editmenu.c
 @@ -19,6 +19,10 @@
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -1182,10 +1352,10 @@ Index: WPrefs.app/editmenu.c
  #include <WINGs/WINGsP.h>
  #include <WINGs/WUtil.h>
  #include <stdlib.h>
-Index: WPrefs.app/main.c
+Index: WindowMaker-0.95.5/WPrefs.app/main.c
 ===================================================================
---- WPrefs.app/main.c.orig
-+++ WPrefs.app/main.c
+--- WindowMaker-0.95.5.orig/WPrefs.app/main.c
++++ WindowMaker-0.95.5/WPrefs.app/main.c
 @@ -18,6 +18,10 @@
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -1197,10 +1367,10 @@ Index: WPrefs.app/main.c
  #include "WPrefs.h"
  
  #include <assert.h>
-Index: WPrefs.app/xmodifier.c
+Index: WindowMaker-0.95.5/WPrefs.app/xmodifier.c
 ===================================================================
---- WPrefs.app/xmodifier.c.orig
-+++ WPrefs.app/xmodifier.c
+--- WindowMaker-0.95.5.orig/WPrefs.app/xmodifier.c
++++ WindowMaker-0.95.5/WPrefs.app/xmodifier.c
 @@ -31,6 +31,10 @@ Perpetrator: Sudish Joseph <sj@eng.minds
   Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
   Boston, MA 02110-1301 USA. */
@@ -1212,1160 +1382,10 @@ Index: WPrefs.app/xmodifier.c
  #include <string.h>
  #include <strings.h>
  #include <X11/Xlib.h>
-Index: src/actions.c
+Index: WindowMaker-0.95.5/configure.ac
 ===================================================================
---- src/actions.c.orig
-+++ src/actions.c
-@@ -20,6 +20,10 @@
-  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-  */
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include "wconfig.h"
- 
- #include <X11/Xlib.h>
-Index: src/appicon.c
-===================================================================
---- src/appicon.c.orig
-+++ src/appicon.c
-@@ -20,6 +20,10 @@
-  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-  */
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include "wconfig.h"
- 
- #include <X11/Xlib.h>
-Index: src/application.c
-===================================================================
---- src/application.c.orig
-+++ src/application.c
-@@ -18,6 +18,10 @@
-  *  with this program; if not, write to the Free Software Foundation, Inc.,
-  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-  */
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include "wconfig.h"
- 
- #include <X11/Xlib.h>
-Index: src/appmenu.c
-===================================================================
---- src/appmenu.c.orig
-+++ src/appmenu.c
-@@ -19,6 +19,10 @@
-  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-  */
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include "wconfig.h"
- 
- #include <X11/Xlib.h>
-Index: src/balloon.c
-===================================================================
---- src/balloon.c.orig
-+++ src/balloon.c
-@@ -18,6 +18,10 @@
-  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-  */
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include "wconfig.h"
- 
- #ifdef BALLOON_TEXT
-Index: src/client.c
-===================================================================
---- src/client.c.orig
-+++ src/client.c
-@@ -17,6 +17,10 @@
-  *  with this program; if not, write to the Free Software Foundation, Inc.,
-  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-  */
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include "wconfig.h"
- 
- #include <X11/Xlib.h>
-Index: src/colormap.c
-===================================================================
---- src/colormap.c.orig
-+++ src/colormap.c
-@@ -23,6 +23,10 @@
-  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-  */
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include "wconfig.h"
- 
- #include "WindowMaker.h"
-Index: src/cycling.c
-===================================================================
---- src/cycling.c.orig
-+++ src/cycling.c
-@@ -19,6 +19,10 @@
-  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-  */
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include "wconfig.h"
- 
- #include <stdlib.h>
-Index: src/defaults.c
-===================================================================
---- src/defaults.c.orig
-+++ src/defaults.c
-@@ -20,6 +20,10 @@
-  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-  */
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include "wconfig.h"
- 
- #include <stdio.h>
-Index: src/dialog.c
-===================================================================
---- src/dialog.c.orig
-+++ src/dialog.c
-@@ -20,6 +20,10 @@
-  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-  */
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include "wconfig.h"
- 
- #include <X11/Xlib.h>
-Index: src/dock.c
-===================================================================
---- src/dock.c.orig
-+++ src/dock.c
-@@ -20,6 +20,10 @@
-  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-  */
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include "wconfig.h"
- 
- #include <X11/Xlib.h>
-Index: src/dockedapp.c
-===================================================================
---- src/dockedapp.c.orig
-+++ src/dockedapp.c
-@@ -19,6 +19,10 @@
-  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-  */
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include "wconfig.h"
- 
- #include <X11/Xlib.h>
-Index: src/event.c
-===================================================================
---- src/event.c.orig
-+++ src/event.c
-@@ -19,6 +19,10 @@
-  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-  */
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include "wconfig.h"
- 
- #ifdef HAVE_INOTIFY
-Index: src/framewin.c
-===================================================================
---- src/framewin.c.orig
-+++ src/framewin.c
-@@ -18,6 +18,10 @@
-  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-  */
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include "wconfig.h"
- 
- #include <X11/Xlib.h>
-Index: src/geomview.c
-===================================================================
---- src/geomview.c.orig
-+++ src/geomview.c
-@@ -1,4 +1,8 @@
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include <WINGs/WINGsP.h>
- 
- #include "geomview.h"
-Index: src/icon.c
-===================================================================
---- src/icon.c.orig
-+++ src/icon.c
-@@ -19,6 +19,10 @@
-  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-  */
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include "wconfig.h"
- 
- #include <X11/Xlib.h>
-Index: src/main.c
-===================================================================
---- src/main.c.orig
-+++ src/main.c
-@@ -18,6 +18,10 @@
-  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-  */
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include "wconfig.h"
- 
- #ifdef HAVE_INOTIFY
-Index: src/menu.c
-===================================================================
---- src/menu.c.orig
-+++ src/menu.c
-@@ -20,6 +20,10 @@
-  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-  */
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include "wconfig.h"
- 
- #include <X11/Xlib.h>
-Index: src/misc.c
-===================================================================
---- src/misc.c.orig
-+++ src/misc.c
-@@ -17,6 +17,10 @@
-  *  with this program; if not, write to the Free Software Foundation, Inc.,
-  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-  */
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include "wconfig.h"
- 
- #include <X11/Xlib.h>
-Index: src/monitor.c
-===================================================================
---- src/monitor.c.orig
-+++ src/monitor.c
-@@ -19,6 +19,10 @@
-  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-  */
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include "wconfig.h"
- #include <unistd.h>
- #include <stdlib.h>
-Index: src/motif.c
-===================================================================
---- src/motif.c.orig
-+++ src/motif.c
-@@ -19,6 +19,10 @@
-  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-  */
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include "wconfig.h"
- 
- #ifdef MWM_HINTS
-Index: src/moveres.c
-===================================================================
---- src/moveres.c.orig
-+++ src/moveres.c
-@@ -18,6 +18,10 @@
-  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-  */
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include "wconfig.h"
- 
- #include <X11/Xlib.h>
-Index: src/osdep_bsd.c
-===================================================================
---- src/osdep_bsd.c.orig
-+++ src/osdep_bsd.c
-@@ -11,6 +11,10 @@
- #else /* OPENBSD || NETBSD */
- #   include <sys/param.h>
- #endif
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include <sys/sysctl.h>
- 
- #include <assert.h>
-Index: src/osdep_darwin.c
-===================================================================
---- src/osdep_darwin.c.orig
-+++ src/osdep_darwin.c
-@@ -1,4 +1,8 @@
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include <sys/types.h>
- #include <sys/sysctl.h>
- 
-Index: src/osdep_linux.c
-===================================================================
---- src/osdep_linux.c.orig
-+++ src/osdep_linux.c
-@@ -1,4 +1,8 @@
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include <sys/types.h>
- #include <sys/stat.h>
- 
-Index: src/osdep_stub.c
-===================================================================
---- src/osdep_stub.c.orig
-+++ src/osdep_stub.c
-@@ -1,4 +1,8 @@
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include <sys/utsname.h>
- 
- #include <WINGs/WUtil.h>
-Index: src/pixmap.c
-===================================================================
---- src/pixmap.c.orig
-+++ src/pixmap.c
-@@ -18,6 +18,10 @@
-  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-  */
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include "wconfig.h"
- 
- #include <X11/Xlib.h>
-Index: src/placement.c
-===================================================================
---- src/placement.c.orig
-+++ src/placement.c
-@@ -19,6 +19,10 @@
-  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-  */
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include "wconfig.h"
- 
- #include <X11/Xlib.h>
-Index: src/properties.c
-===================================================================
---- src/properties.c.orig
-+++ src/properties.c
-@@ -18,6 +18,10 @@
-  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-  */
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include "wconfig.h"
- 
- #include <X11/Xlib.h>
-Index: src/resources.c
-===================================================================
---- src/resources.c.orig
-+++ src/resources.c
-@@ -19,6 +19,10 @@
-  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-  */
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include "wconfig.h"
- 
- #include <stdio.h>
-Index: src/rootmenu.c
-===================================================================
---- src/rootmenu.c.orig
-+++ src/rootmenu.c
-@@ -20,6 +20,10 @@
-  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-  */
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include "wconfig.h"
- 
- #include <stdio.h>
-Index: src/screen.c
-===================================================================
---- src/screen.c.orig
-+++ src/screen.c
-@@ -19,6 +19,10 @@
-  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-  */
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include "wconfig.h"
- 
- #include <stdio.h>
-Index: src/session.c
-===================================================================
---- src/session.c.orig
-+++ src/session.c
-@@ -57,6 +57,10 @@
-  * if the Die message is received, exit.
-  */
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include "wconfig.h"
- 
- #include <X11/Xlib.h>
-Index: src/shutdown.c
-===================================================================
---- src/shutdown.c.orig
-+++ src/shutdown.c
-@@ -18,6 +18,10 @@
-  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-  */
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include "wconfig.h"
- 
- #include <stdlib.h>
-Index: src/stacking.c
-===================================================================
---- src/stacking.c.orig
-+++ src/stacking.c
-@@ -19,6 +19,10 @@
-  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-  */
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include "wconfig.h"
- 
- #include <stdio.h>
-Index: src/startup.c
-===================================================================
---- src/startup.c.orig
-+++ src/startup.c
-@@ -19,6 +19,10 @@
-  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-  */
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include "wconfig.h"
- 
- #include <stdio.h>
-Index: src/superfluous.c
-===================================================================
---- src/superfluous.c.orig
-+++ src/superfluous.c
-@@ -19,6 +19,10 @@
-  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-  */
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include "wconfig.h"
- 
- #include <X11/Xlib.h>
-Index: src/switchmenu.c
-===================================================================
---- src/switchmenu.c.orig
-+++ src/switchmenu.c
-@@ -19,6 +19,10 @@
-  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-  */
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include "wconfig.h"
- 
- #include <stdio.h>
-Index: src/switchpanel.c
-===================================================================
---- src/switchpanel.c.orig
-+++ src/switchpanel.c
-@@ -18,6 +18,10 @@
-  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-  */
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include "wconfig.h"
- 
- #include <stdint.h>
-Index: src/texture.c
-===================================================================
---- src/texture.c.orig
-+++ src/texture.c
-@@ -18,6 +18,10 @@
-  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-  */
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include "wconfig.h"
- 
- #include <X11/Xlib.h>
-Index: src/usermenu.c
-===================================================================
---- src/usermenu.c.orig
-+++ src/usermenu.c
-@@ -56,6 +56,10 @@
-  *
-  */
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include "wconfig.h"
- 
- #ifdef USER_MENU
-Index: src/wcore.c
-===================================================================
---- src/wcore.c.orig
-+++ src/wcore.c
-@@ -18,6 +18,10 @@
-  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-  */
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include "wconfig.h"
- 
- #include <X11/Xlib.h>
-Index: src/wdefaults.c
-===================================================================
---- src/wdefaults.c.orig
-+++ src/wdefaults.c
-@@ -19,6 +19,10 @@
-  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-  */
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include "wconfig.h"
- 
- #include <stdio.h>
-Index: src/window.c
-===================================================================
---- src/window.c.orig
-+++ src/window.c
-@@ -19,6 +19,10 @@
-  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-  */
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include "wconfig.h"
- 
- #include <X11/Xlib.h>
-Index: src/winmenu.c
-===================================================================
---- src/winmenu.c.orig
-+++ src/winmenu.c
-@@ -19,6 +19,10 @@
-  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-  */
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include "wconfig.h"
- 
- #include <stdio.h>
-Index: src/winspector.c
-===================================================================
---- src/winspector.c.orig
-+++ src/winspector.c
-@@ -20,6 +20,10 @@
-  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-  */
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include "wconfig.h"
- 
- #include <X11/Xlib.h>
-Index: src/wmspec.c
-===================================================================
---- src/wmspec.c.orig
-+++ src/wmspec.c
-@@ -28,6 +28,10 @@
-  * return to be Success is not enough. -Dan
-  */
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include "wconfig.h"
- 
- #include <X11/Xlib.h>
-Index: src/workspace.c
-===================================================================
---- src/workspace.c.orig
-+++ src/workspace.c
-@@ -18,6 +18,10 @@
-  *  with this program; if not, write to the Free Software Foundation, Inc.,
-  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-  */
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include "wconfig.h"
- 
- #include <X11/Xlib.h>
-Index: src/xdnd.c
-===================================================================
---- src/xdnd.c.orig
-+++ src/xdnd.c
-@@ -1,5 +1,9 @@
- /* Many part of code are ripped of an example from JX's site */
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include "wconfig.h"
- 
- #ifdef XDND
-Index: src/xinerama.c
-===================================================================
---- src/xinerama.c.orig
-+++ src/xinerama.c
-@@ -18,6 +18,10 @@
-  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-  */
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include "wconfig.h"
- 
- #include "xinerama.h"
-Index: src/xmodifier.c
-===================================================================
---- src/xmodifier.c.orig
-+++ src/xmodifier.c
-@@ -27,6 +27,10 @@ Perpetrator: Sudish Joseph <sj@eng.minds
-  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-  Boston, MA 02110-1301 USA. */
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include "wconfig.h"
- 
- #include <string.h>
-Index: src/xutil.c
-===================================================================
---- src/xutil.c.orig
-+++ src/xutil.c
-@@ -19,6 +19,10 @@
-  *  MA 02110-1301, USA.
-  */
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include <X11/Xlib.h>
- #include <stdlib.h>
- #include <X11/Xutil.h>
-Index: test/notest.c
-===================================================================
---- test/notest.c.orig
-+++ test/notest.c
-@@ -3,6 +3,10 @@
-  * TODO: remake
-  */
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include <stdio.h>
- #include <X11/Xlib.h>
- #include <X11/Xutil.h>
-Index: test/wtest.c
-===================================================================
---- test/wtest.c.orig
-+++ test/wtest.c
-@@ -8,6 +8,10 @@
-  * TODO: remake
-  */
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include <stdio.h>
- #include <stdlib.h>
- #include <X11/Xlib.h>
-Index: util/convertfonts.c
-===================================================================
---- util/convertfonts.c.orig
-+++ util/convertfonts.c
-@@ -23,6 +23,10 @@
- #define _GNU_SOURCE		/* getopt_long */
- #endif
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include <sys/stat.h>
- 
- #include <getopt.h>
-Index: util/fontconv.c
-===================================================================
---- util/fontconv.c.orig
-+++ util/fontconv.c
-@@ -1,4 +1,8 @@
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-Index: util/geticonset.c
-===================================================================
---- util/geticonset.c.orig
-+++ util/geticonset.c
-@@ -23,6 +23,10 @@
- #define _GNU_SOURCE		/* getopt_long */
- #endif
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include <getopt.h>
- #include <stdio.h>
- #include <stdlib.h>
-Index: util/getstyle.c
-===================================================================
---- util/getstyle.c.orig
-+++ util/getstyle.c
-@@ -23,6 +23,10 @@
- #define _GNU_SOURCE		/* getopt_long */
- #endif
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include <sys/types.h>
- #include <sys/stat.h>
- 
-Index: util/seticons.c
-===================================================================
---- util/seticons.c.orig
-+++ util/seticons.c
-@@ -23,6 +23,10 @@
- #define _GNU_SOURCE		/* getopt_long */
- #endif
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include <getopt.h>
- #include <stdio.h>
- #include <stdlib.h>
-Index: util/setstyle.c
-===================================================================
---- util/setstyle.c.orig
-+++ util/setstyle.c
-@@ -23,6 +23,10 @@
- #define _GNU_SOURCE		/* getopt_long */
- #endif
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include <sys/stat.h>
- 
- #include <getopt.h>
-Index: util/wdread.c
-===================================================================
---- util/wdread.c.orig
-+++ util/wdread.c
-@@ -28,6 +28,10 @@
-  * WindowMaker defaults DB reader
-  */
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include <getopt.h>
- #include <limits.h>
- #include <stdio.h>
-Index: util/wdwrite.c
-===================================================================
---- util/wdwrite.c.orig
-+++ util/wdwrite.c
-@@ -28,6 +28,10 @@
-  */
- 
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include <getopt.h>
- #include <limits.h>
- #include <stdio.h>
-Index: util/wmagnify.c
-===================================================================
---- util/wmagnify.c.orig
-+++ util/wmagnify.c
-@@ -7,6 +7,10 @@
-  */
- #include <config.h>
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include <X11/Xproto.h>
- 
- #include <WINGs/WINGs.h>
-Index: util/wmgenmenu.c
-===================================================================
---- util/wmgenmenu.c.orig
-+++ util/wmgenmenu.c
-@@ -4,6 +4,10 @@
- #define _GNU_SOURCE		/* getopt_long */
- #endif
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include <ctype.h>
- #include <getopt.h>
- #include <limits.h>
-Index: util/wmmenugen.c
-===================================================================
---- util/wmmenugen.c.orig
-+++ util/wmmenugen.c
-@@ -18,6 +18,10 @@
-  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-  */
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include <sys/types.h>
- #include <sys/stat.h>
- 
-Index: util/wmmenugen_misc.c
-===================================================================
---- util/wmmenugen_misc.c.orig
-+++ util/wmmenugen_misc.c
-@@ -20,6 +20,10 @@
-  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-  */
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include <libgen.h>
- #include <stdlib.h>
- #include <string.h>
-Index: util/wmmenugen_parse_wmconfig.c
-===================================================================
---- util/wmmenugen_parse_wmconfig.c.orig
-+++ util/wmmenugen_parse_wmconfig.c
-@@ -20,6 +20,10 @@
-  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-  */
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include <sys/types.h>
- #include <sys/stat.h>
- 
-Index: util/wmmenugen_parse_xdg.c
-===================================================================
---- util/wmmenugen_parse_xdg.c.orig
-+++ util/wmmenugen_parse_xdg.c
-@@ -36,6 +36,10 @@
-  * Basic validation of the .desktop file is done.
-  */
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include <sys/types.h>
- #include <sys/stat.h>
- 
-Index: util/wxcopy.c
-===================================================================
---- util/wxcopy.c.orig
-+++ util/wxcopy.c
-@@ -18,6 +18,10 @@
-  *  MA 02110-1301, USA.
-  */
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-Index: wmlib/app.c
-===================================================================
---- wmlib/app.c.orig
-+++ wmlib/app.c
-@@ -20,6 +20,10 @@
-  *  MA 02110-1301, USA.
-  */
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include <X11/Xlib.h>
- #include <stdlib.h>
- #include <string.h>
-Index: wmlib/command.c
-===================================================================
---- wmlib/command.c.orig
-+++ wmlib/command.c
-@@ -20,6 +20,10 @@
-  *  MA 02110-1301, USA.
-  */
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include <X11/Xlib.h>
- #include <stdlib.h>
- 
-Index: wmlib/event.c
-===================================================================
---- wmlib/event.c.orig
-+++ wmlib/event.c
-@@ -20,6 +20,10 @@
-  *  MA 02110-1301, USA.
-  */
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include <stdlib.h>
- #include <stdio.h>
- #include <X11/Xlib.h>
-Index: wmlib/menu.c
-===================================================================
---- wmlib/menu.c.orig
-+++ wmlib/menu.c
-@@ -20,6 +20,10 @@
-  *  MA 02110-1301, USA.
-  */
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include <stdlib.h>
- #include <stdio.h>
- #include <string.h>
-Index: wrlib/alpha_combine.c
-===================================================================
---- wrlib/alpha_combine.c.orig
-+++ wrlib/alpha_combine.c
-@@ -18,6 +18,10 @@
-  *  MA 02110-1301, USA.
-  */
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include "wraster.h"
- 
- void RCombineAlpha(unsigned char *d, unsigned char *s, int s_has_alpha,
-Index: wrlib/tests/testdraw.c
-===================================================================
---- wrlib/tests/testdraw.c.orig
-+++ wrlib/tests/testdraw.c
-@@ -1,4 +1,8 @@
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include <X11/Xlib.h>
- #include "wraster.h"
- #include <stdio.h>
-Index: wrlib/tests/testgrad.c
-===================================================================
---- wrlib/tests/testgrad.c.orig
-+++ wrlib/tests/testgrad.c
-@@ -1,4 +1,8 @@
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include <X11/Xlib.h>
- #include "wraster.h"
- #include <stdio.h>
-Index: wrlib/tests/testrot.c
-===================================================================
---- wrlib/tests/testrot.c.orig
-+++ wrlib/tests/testrot.c
-@@ -1,4 +1,8 @@
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include <X11/Xlib.h>
- #include "wraster.h"
- #include <stdlib.h>
-Index: wrlib/tests/view.c
-===================================================================
---- wrlib/tests/view.c.orig
-+++ wrlib/tests/view.c
-@@ -1,3 +1,7 @@
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include <X11/Xlib.h>
- #include "wraster.h"
- #include <stdlib.h>
-Index: configure.ac
-===================================================================
---- configure.ac.orig
-+++ configure.ac
+--- WindowMaker-0.95.5.orig/configure.ac
++++ WindowMaker-0.95.5/configure.ac
 @@ -67,8 +67,9 @@ dnl AC_CANONICAL_HOST -- already done by
  
  dnl Checks for programs.
@@ -2378,10 +1398,1109 @@ Index: configure.ac
  AC_PROG_LN_S
  AC_PROG_GCC_TRADITIONAL
  AC_PROG_LIBTOOL
-Index: wrlib/gif.c
+Index: WindowMaker-0.95.5/src/actions.c
 ===================================================================
---- wrlib/gif.c.orig
-+++ wrlib/gif.c
+--- WindowMaker-0.95.5.orig/src/actions.c
++++ WindowMaker-0.95.5/src/actions.c
+@@ -20,6 +20,10 @@
+  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  */
+ 
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
+ #include "wconfig.h"
+ 
+ #include <X11/Xlib.h>
+Index: WindowMaker-0.95.5/src/appicon.c
+===================================================================
+--- WindowMaker-0.95.5.orig/src/appicon.c
++++ WindowMaker-0.95.5/src/appicon.c
+@@ -20,6 +20,10 @@
+  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  */
+ 
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
+ #include "wconfig.h"
+ 
+ #include <X11/Xlib.h>
+Index: WindowMaker-0.95.5/src/application.c
+===================================================================
+--- WindowMaker-0.95.5.orig/src/application.c
++++ WindowMaker-0.95.5/src/application.c
+@@ -18,6 +18,10 @@
+  *  with this program; if not, write to the Free Software Foundation, Inc.,
+  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  */
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
+ #include "wconfig.h"
+ 
+ #include <X11/Xlib.h>
+Index: WindowMaker-0.95.5/src/appmenu.c
+===================================================================
+--- WindowMaker-0.95.5.orig/src/appmenu.c
++++ WindowMaker-0.95.5/src/appmenu.c
+@@ -19,6 +19,10 @@
+  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  */
+ 
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
+ #include "wconfig.h"
+ 
+ #include <X11/Xlib.h>
+Index: WindowMaker-0.95.5/src/balloon.c
+===================================================================
+--- WindowMaker-0.95.5.orig/src/balloon.c
++++ WindowMaker-0.95.5/src/balloon.c
+@@ -18,6 +18,10 @@
+  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  */
+ 
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
+ #include "wconfig.h"
+ 
+ #ifdef BALLOON_TEXT
+Index: WindowMaker-0.95.5/src/client.c
+===================================================================
+--- WindowMaker-0.95.5.orig/src/client.c
++++ WindowMaker-0.95.5/src/client.c
+@@ -17,6 +17,10 @@
+  *  with this program; if not, write to the Free Software Foundation, Inc.,
+  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  */
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
+ #include "wconfig.h"
+ 
+ #include <X11/Xlib.h>
+Index: WindowMaker-0.95.5/src/colormap.c
+===================================================================
+--- WindowMaker-0.95.5.orig/src/colormap.c
++++ WindowMaker-0.95.5/src/colormap.c
+@@ -23,6 +23,10 @@
+  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  */
+ 
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
+ #include "wconfig.h"
+ 
+ #include "WindowMaker.h"
+Index: WindowMaker-0.95.5/src/cycling.c
+===================================================================
+--- WindowMaker-0.95.5.orig/src/cycling.c
++++ WindowMaker-0.95.5/src/cycling.c
+@@ -19,6 +19,10 @@
+  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  */
+ 
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
+ #include "wconfig.h"
+ 
+ #include <stdlib.h>
+Index: WindowMaker-0.95.5/src/defaults.c
+===================================================================
+--- WindowMaker-0.95.5.orig/src/defaults.c
++++ WindowMaker-0.95.5/src/defaults.c
+@@ -20,6 +20,10 @@
+  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  */
+ 
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
+ #include "wconfig.h"
+ 
+ #include <stdio.h>
+Index: WindowMaker-0.95.5/src/dialog.c
+===================================================================
+--- WindowMaker-0.95.5.orig/src/dialog.c
++++ WindowMaker-0.95.5/src/dialog.c
+@@ -20,6 +20,10 @@
+  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  */
+ 
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
+ #include "wconfig.h"
+ 
+ #include <X11/Xlib.h>
+Index: WindowMaker-0.95.5/src/dock.c
+===================================================================
+--- WindowMaker-0.95.5.orig/src/dock.c
++++ WindowMaker-0.95.5/src/dock.c
+@@ -20,6 +20,10 @@
+  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  */
+ 
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
+ #include "wconfig.h"
+ 
+ #include <X11/Xlib.h>
+Index: WindowMaker-0.95.5/src/dockedapp.c
+===================================================================
+--- WindowMaker-0.95.5.orig/src/dockedapp.c
++++ WindowMaker-0.95.5/src/dockedapp.c
+@@ -19,6 +19,10 @@
+  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  */
+ 
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
+ #include "wconfig.h"
+ 
+ #include <X11/Xlib.h>
+Index: WindowMaker-0.95.5/src/event.c
+===================================================================
+--- WindowMaker-0.95.5.orig/src/event.c
++++ WindowMaker-0.95.5/src/event.c
+@@ -19,6 +19,10 @@
+  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  */
+ 
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
+ #include "wconfig.h"
+ 
+ #ifdef HAVE_INOTIFY
+Index: WindowMaker-0.95.5/src/framewin.c
+===================================================================
+--- WindowMaker-0.95.5.orig/src/framewin.c
++++ WindowMaker-0.95.5/src/framewin.c
+@@ -18,6 +18,10 @@
+  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  */
+ 
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
+ #include "wconfig.h"
+ 
+ #include <X11/Xlib.h>
+Index: WindowMaker-0.95.5/src/geomview.c
+===================================================================
+--- WindowMaker-0.95.5.orig/src/geomview.c
++++ WindowMaker-0.95.5/src/geomview.c
+@@ -1,4 +1,8 @@
+ 
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
+ #include <WINGs/WINGsP.h>
+ 
+ #include "geomview.h"
+Index: WindowMaker-0.95.5/src/icon.c
+===================================================================
+--- WindowMaker-0.95.5.orig/src/icon.c
++++ WindowMaker-0.95.5/src/icon.c
+@@ -19,6 +19,10 @@
+  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  */
+ 
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
+ #include "wconfig.h"
+ 
+ #include <X11/Xlib.h>
+Index: WindowMaker-0.95.5/src/main.c
+===================================================================
+--- WindowMaker-0.95.5.orig/src/main.c
++++ WindowMaker-0.95.5/src/main.c
+@@ -18,6 +18,10 @@
+  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  */
+ 
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
+ #include "wconfig.h"
+ 
+ #ifdef HAVE_INOTIFY
+Index: WindowMaker-0.95.5/src/menu.c
+===================================================================
+--- WindowMaker-0.95.5.orig/src/menu.c
++++ WindowMaker-0.95.5/src/menu.c
+@@ -20,6 +20,10 @@
+  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  */
+ 
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
+ #include "wconfig.h"
+ 
+ #include <X11/Xlib.h>
+Index: WindowMaker-0.95.5/src/misc.c
+===================================================================
+--- WindowMaker-0.95.5.orig/src/misc.c
++++ WindowMaker-0.95.5/src/misc.c
+@@ -17,6 +17,10 @@
+  *  with this program; if not, write to the Free Software Foundation, Inc.,
+  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  */
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
+ #include "wconfig.h"
+ 
+ #include <X11/Xlib.h>
+Index: WindowMaker-0.95.5/src/monitor.c
+===================================================================
+--- WindowMaker-0.95.5.orig/src/monitor.c
++++ WindowMaker-0.95.5/src/monitor.c
+@@ -19,6 +19,10 @@
+  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  */
+ 
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
+ #include "wconfig.h"
+ #include <unistd.h>
+ #include <stdlib.h>
+Index: WindowMaker-0.95.5/src/motif.c
+===================================================================
+--- WindowMaker-0.95.5.orig/src/motif.c
++++ WindowMaker-0.95.5/src/motif.c
+@@ -19,6 +19,10 @@
+  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  */
+ 
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
+ #include "wconfig.h"
+ 
+ #ifdef MWM_HINTS
+Index: WindowMaker-0.95.5/src/moveres.c
+===================================================================
+--- WindowMaker-0.95.5.orig/src/moveres.c
++++ WindowMaker-0.95.5/src/moveres.c
+@@ -18,6 +18,10 @@
+  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  */
+ 
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
+ #include "wconfig.h"
+ 
+ #include <X11/Xlib.h>
+Index: WindowMaker-0.95.5/src/osdep_bsd.c
+===================================================================
+--- WindowMaker-0.95.5.orig/src/osdep_bsd.c
++++ WindowMaker-0.95.5/src/osdep_bsd.c
+@@ -11,6 +11,10 @@
+ #else /* OPENBSD || NETBSD */
+ #   include <sys/param.h>
+ #endif
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
+ #include <sys/sysctl.h>
+ 
+ #include <assert.h>
+Index: WindowMaker-0.95.5/src/osdep_darwin.c
+===================================================================
+--- WindowMaker-0.95.5.orig/src/osdep_darwin.c
++++ WindowMaker-0.95.5/src/osdep_darwin.c
+@@ -1,4 +1,8 @@
+ 
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
+ #include <sys/types.h>
+ #include <sys/sysctl.h>
+ 
+Index: WindowMaker-0.95.5/src/osdep_linux.c
+===================================================================
+--- WindowMaker-0.95.5.orig/src/osdep_linux.c
++++ WindowMaker-0.95.5/src/osdep_linux.c
+@@ -1,4 +1,8 @@
+ 
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ 
+Index: WindowMaker-0.95.5/src/osdep_stub.c
+===================================================================
+--- WindowMaker-0.95.5.orig/src/osdep_stub.c
++++ WindowMaker-0.95.5/src/osdep_stub.c
+@@ -1,4 +1,8 @@
+ 
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
+ #include <sys/utsname.h>
+ 
+ #include <WINGs/WUtil.h>
+Index: WindowMaker-0.95.5/src/pixmap.c
+===================================================================
+--- WindowMaker-0.95.5.orig/src/pixmap.c
++++ WindowMaker-0.95.5/src/pixmap.c
+@@ -18,6 +18,10 @@
+  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  */
+ 
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
+ #include "wconfig.h"
+ 
+ #include <X11/Xlib.h>
+Index: WindowMaker-0.95.5/src/placement.c
+===================================================================
+--- WindowMaker-0.95.5.orig/src/placement.c
++++ WindowMaker-0.95.5/src/placement.c
+@@ -19,6 +19,10 @@
+  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  */
+ 
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
+ #include "wconfig.h"
+ 
+ #include <X11/Xlib.h>
+Index: WindowMaker-0.95.5/src/properties.c
+===================================================================
+--- WindowMaker-0.95.5.orig/src/properties.c
++++ WindowMaker-0.95.5/src/properties.c
+@@ -18,6 +18,10 @@
+  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  */
+ 
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
+ #include "wconfig.h"
+ 
+ #include <X11/Xlib.h>
+Index: WindowMaker-0.95.5/src/resources.c
+===================================================================
+--- WindowMaker-0.95.5.orig/src/resources.c
++++ WindowMaker-0.95.5/src/resources.c
+@@ -19,6 +19,10 @@
+  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  */
+ 
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
+ #include "wconfig.h"
+ 
+ #include <stdio.h>
+Index: WindowMaker-0.95.5/src/rootmenu.c
+===================================================================
+--- WindowMaker-0.95.5.orig/src/rootmenu.c
++++ WindowMaker-0.95.5/src/rootmenu.c
+@@ -20,6 +20,10 @@
+  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  */
+ 
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
+ #include "wconfig.h"
+ 
+ #include <stdio.h>
+Index: WindowMaker-0.95.5/src/screen.c
+===================================================================
+--- WindowMaker-0.95.5.orig/src/screen.c
++++ WindowMaker-0.95.5/src/screen.c
+@@ -19,6 +19,10 @@
+  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  */
+ 
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
+ #include "wconfig.h"
+ 
+ #include <stdio.h>
+Index: WindowMaker-0.95.5/src/session.c
+===================================================================
+--- WindowMaker-0.95.5.orig/src/session.c
++++ WindowMaker-0.95.5/src/session.c
+@@ -57,6 +57,10 @@
+  * if the Die message is received, exit.
+  */
+ 
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
+ #include "wconfig.h"
+ 
+ #include <X11/Xlib.h>
+Index: WindowMaker-0.95.5/src/shutdown.c
+===================================================================
+--- WindowMaker-0.95.5.orig/src/shutdown.c
++++ WindowMaker-0.95.5/src/shutdown.c
+@@ -18,6 +18,10 @@
+  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  */
+ 
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
+ #include "wconfig.h"
+ 
+ #include <stdlib.h>
+Index: WindowMaker-0.95.5/src/stacking.c
+===================================================================
+--- WindowMaker-0.95.5.orig/src/stacking.c
++++ WindowMaker-0.95.5/src/stacking.c
+@@ -19,6 +19,10 @@
+  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  */
+ 
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
+ #include "wconfig.h"
+ 
+ #include <stdio.h>
+Index: WindowMaker-0.95.5/src/startup.c
+===================================================================
+--- WindowMaker-0.95.5.orig/src/startup.c
++++ WindowMaker-0.95.5/src/startup.c
+@@ -19,6 +19,10 @@
+  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  */
+ 
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
+ #include "wconfig.h"
+ 
+ #include <stdio.h>
+Index: WindowMaker-0.95.5/src/superfluous.c
+===================================================================
+--- WindowMaker-0.95.5.orig/src/superfluous.c
++++ WindowMaker-0.95.5/src/superfluous.c
+@@ -19,6 +19,10 @@
+  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  */
+ 
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
+ #include "wconfig.h"
+ 
+ #include <X11/Xlib.h>
+Index: WindowMaker-0.95.5/src/switchmenu.c
+===================================================================
+--- WindowMaker-0.95.5.orig/src/switchmenu.c
++++ WindowMaker-0.95.5/src/switchmenu.c
+@@ -19,6 +19,10 @@
+  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  */
+ 
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
+ #include "wconfig.h"
+ 
+ #include <stdio.h>
+Index: WindowMaker-0.95.5/src/switchpanel.c
+===================================================================
+--- WindowMaker-0.95.5.orig/src/switchpanel.c
++++ WindowMaker-0.95.5/src/switchpanel.c
+@@ -18,6 +18,10 @@
+  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  */
+ 
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
+ #include "wconfig.h"
+ 
+ #include <stdint.h>
+Index: WindowMaker-0.95.5/src/texture.c
+===================================================================
+--- WindowMaker-0.95.5.orig/src/texture.c
++++ WindowMaker-0.95.5/src/texture.c
+@@ -18,6 +18,10 @@
+  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  */
+ 
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
+ #include "wconfig.h"
+ 
+ #include <X11/Xlib.h>
+Index: WindowMaker-0.95.5/src/usermenu.c
+===================================================================
+--- WindowMaker-0.95.5.orig/src/usermenu.c
++++ WindowMaker-0.95.5/src/usermenu.c
+@@ -56,6 +56,10 @@
+  *
+  */
+ 
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
+ #include "wconfig.h"
+ 
+ #ifdef USER_MENU
+Index: WindowMaker-0.95.5/src/wcore.c
+===================================================================
+--- WindowMaker-0.95.5.orig/src/wcore.c
++++ WindowMaker-0.95.5/src/wcore.c
+@@ -18,6 +18,10 @@
+  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  */
+ 
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
+ #include "wconfig.h"
+ 
+ #include <X11/Xlib.h>
+Index: WindowMaker-0.95.5/src/wdefaults.c
+===================================================================
+--- WindowMaker-0.95.5.orig/src/wdefaults.c
++++ WindowMaker-0.95.5/src/wdefaults.c
+@@ -19,6 +19,10 @@
+  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  */
+ 
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
+ #include "wconfig.h"
+ 
+ #include <stdio.h>
+Index: WindowMaker-0.95.5/src/window.c
+===================================================================
+--- WindowMaker-0.95.5.orig/src/window.c
++++ WindowMaker-0.95.5/src/window.c
+@@ -19,6 +19,10 @@
+  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  */
+ 
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
+ #include "wconfig.h"
+ 
+ #include <X11/Xlib.h>
+Index: WindowMaker-0.95.5/src/winmenu.c
+===================================================================
+--- WindowMaker-0.95.5.orig/src/winmenu.c
++++ WindowMaker-0.95.5/src/winmenu.c
+@@ -19,6 +19,10 @@
+  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  */
+ 
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
+ #include "wconfig.h"
+ 
+ #include <stdio.h>
+Index: WindowMaker-0.95.5/src/winspector.c
+===================================================================
+--- WindowMaker-0.95.5.orig/src/winspector.c
++++ WindowMaker-0.95.5/src/winspector.c
+@@ -20,6 +20,10 @@
+  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  */
+ 
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
+ #include "wconfig.h"
+ 
+ #include <X11/Xlib.h>
+Index: WindowMaker-0.95.5/src/wmspec.c
+===================================================================
+--- WindowMaker-0.95.5.orig/src/wmspec.c
++++ WindowMaker-0.95.5/src/wmspec.c
+@@ -28,6 +28,10 @@
+  * return to be Success is not enough. -Dan
+  */
+ 
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
+ #include "wconfig.h"
+ 
+ #include <X11/Xlib.h>
+Index: WindowMaker-0.95.5/src/workspace.c
+===================================================================
+--- WindowMaker-0.95.5.orig/src/workspace.c
++++ WindowMaker-0.95.5/src/workspace.c
+@@ -18,6 +18,10 @@
+  *  with this program; if not, write to the Free Software Foundation, Inc.,
+  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  */
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
+ #include "wconfig.h"
+ 
+ #include <X11/Xlib.h>
+Index: WindowMaker-0.95.5/src/xdnd.c
+===================================================================
+--- WindowMaker-0.95.5.orig/src/xdnd.c
++++ WindowMaker-0.95.5/src/xdnd.c
+@@ -1,5 +1,9 @@
+ /* Many part of code are ripped of an example from JX's site */
+ 
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
+ #include "wconfig.h"
+ 
+ #ifdef XDND
+Index: WindowMaker-0.95.5/src/xinerama.c
+===================================================================
+--- WindowMaker-0.95.5.orig/src/xinerama.c
++++ WindowMaker-0.95.5/src/xinerama.c
+@@ -18,6 +18,10 @@
+  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  */
+ 
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
+ #include "wconfig.h"
+ 
+ #include "xinerama.h"
+Index: WindowMaker-0.95.5/src/xmodifier.c
+===================================================================
+--- WindowMaker-0.95.5.orig/src/xmodifier.c
++++ WindowMaker-0.95.5/src/xmodifier.c
+@@ -27,6 +27,10 @@ Perpetrator: Sudish Joseph <sj@eng.minds
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301 USA. */
+ 
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
+ #include "wconfig.h"
+ 
+ #include <string.h>
+Index: WindowMaker-0.95.5/src/xutil.c
+===================================================================
+--- WindowMaker-0.95.5.orig/src/xutil.c
++++ WindowMaker-0.95.5/src/xutil.c
+@@ -19,6 +19,10 @@
+  *  MA 02110-1301, USA.
+  */
+ 
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
+ #include <X11/Xlib.h>
+ #include <stdlib.h>
+ #include <X11/Xutil.h>
+Index: WindowMaker-0.95.5/test/notest.c
+===================================================================
+--- WindowMaker-0.95.5.orig/test/notest.c
++++ WindowMaker-0.95.5/test/notest.c
+@@ -3,6 +3,10 @@
+  * TODO: remake
+  */
+ 
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
+ #include <stdio.h>
+ #include <X11/Xlib.h>
+ #include <X11/Xutil.h>
+Index: WindowMaker-0.95.5/test/wtest.c
+===================================================================
+--- WindowMaker-0.95.5.orig/test/wtest.c
++++ WindowMaker-0.95.5/test/wtest.c
+@@ -8,6 +8,10 @@
+  * TODO: remake
+  */
+ 
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <X11/Xlib.h>
+Index: WindowMaker-0.95.5/util/convertfonts.c
+===================================================================
+--- WindowMaker-0.95.5.orig/util/convertfonts.c
++++ WindowMaker-0.95.5/util/convertfonts.c
+@@ -23,6 +23,10 @@
+ #define _GNU_SOURCE		/* getopt_long */
+ #endif
+ 
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
+ #include <sys/stat.h>
+ 
+ #include <getopt.h>
+Index: WindowMaker-0.95.5/util/fontconv.c
+===================================================================
+--- WindowMaker-0.95.5.orig/util/fontconv.c
++++ WindowMaker-0.95.5/util/fontconv.c
+@@ -1,4 +1,8 @@
+ 
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+Index: WindowMaker-0.95.5/util/geticonset.c
+===================================================================
+--- WindowMaker-0.95.5.orig/util/geticonset.c
++++ WindowMaker-0.95.5/util/geticonset.c
+@@ -23,6 +23,10 @@
+ #define _GNU_SOURCE		/* getopt_long */
+ #endif
+ 
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
+ #include <getopt.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+Index: WindowMaker-0.95.5/util/getstyle.c
+===================================================================
+--- WindowMaker-0.95.5.orig/util/getstyle.c
++++ WindowMaker-0.95.5/util/getstyle.c
+@@ -23,6 +23,10 @@
+ #define _GNU_SOURCE		/* getopt_long */
+ #endif
+ 
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ 
+Index: WindowMaker-0.95.5/util/seticons.c
+===================================================================
+--- WindowMaker-0.95.5.orig/util/seticons.c
++++ WindowMaker-0.95.5/util/seticons.c
+@@ -23,6 +23,10 @@
+ #define _GNU_SOURCE		/* getopt_long */
+ #endif
+ 
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
+ #include <getopt.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+Index: WindowMaker-0.95.5/util/setstyle.c
+===================================================================
+--- WindowMaker-0.95.5.orig/util/setstyle.c
++++ WindowMaker-0.95.5/util/setstyle.c
+@@ -23,6 +23,10 @@
+ #define _GNU_SOURCE		/* getopt_long */
+ #endif
+ 
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
+ #include <sys/stat.h>
+ 
+ #include <getopt.h>
+Index: WindowMaker-0.95.5/util/wdread.c
+===================================================================
+--- WindowMaker-0.95.5.orig/util/wdread.c
++++ WindowMaker-0.95.5/util/wdread.c
+@@ -28,6 +28,10 @@
+  * WindowMaker defaults DB reader
+  */
+ 
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
+ #include <getopt.h>
+ #include <limits.h>
+ #include <stdio.h>
+Index: WindowMaker-0.95.5/util/wdwrite.c
+===================================================================
+--- WindowMaker-0.95.5.orig/util/wdwrite.c
++++ WindowMaker-0.95.5/util/wdwrite.c
+@@ -28,6 +28,10 @@
+  */
+ 
+ 
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
+ #include <getopt.h>
+ #include <limits.h>
+ #include <stdio.h>
+Index: WindowMaker-0.95.5/util/wmagnify.c
+===================================================================
+--- WindowMaker-0.95.5.orig/util/wmagnify.c
++++ WindowMaker-0.95.5/util/wmagnify.c
+@@ -7,6 +7,10 @@
+  */
+ #include <config.h>
+ 
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
+ #include <X11/Xproto.h>
+ 
+ #include <WINGs/WINGs.h>
+Index: WindowMaker-0.95.5/util/wmgenmenu.c
+===================================================================
+--- WindowMaker-0.95.5.orig/util/wmgenmenu.c
++++ WindowMaker-0.95.5/util/wmgenmenu.c
+@@ -4,6 +4,10 @@
+ #define _GNU_SOURCE		/* getopt_long */
+ #endif
+ 
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
+ #include <ctype.h>
+ #include <getopt.h>
+ #include <limits.h>
+Index: WindowMaker-0.95.5/util/wmmenugen.c
+===================================================================
+--- WindowMaker-0.95.5.orig/util/wmmenugen.c
++++ WindowMaker-0.95.5/util/wmmenugen.c
+@@ -18,6 +18,10 @@
+  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  */
+ 
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ 
+Index: WindowMaker-0.95.5/util/wmmenugen_misc.c
+===================================================================
+--- WindowMaker-0.95.5.orig/util/wmmenugen_misc.c
++++ WindowMaker-0.95.5/util/wmmenugen_misc.c
+@@ -20,6 +20,10 @@
+  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  */
+ 
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
+ #include <libgen.h>
+ #include <stdlib.h>
+ #include <string.h>
+Index: WindowMaker-0.95.5/util/wmmenugen_parse_wmconfig.c
+===================================================================
+--- WindowMaker-0.95.5.orig/util/wmmenugen_parse_wmconfig.c
++++ WindowMaker-0.95.5/util/wmmenugen_parse_wmconfig.c
+@@ -20,6 +20,10 @@
+  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  */
+ 
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ 
+Index: WindowMaker-0.95.5/util/wmmenugen_parse_xdg.c
+===================================================================
+--- WindowMaker-0.95.5.orig/util/wmmenugen_parse_xdg.c
++++ WindowMaker-0.95.5/util/wmmenugen_parse_xdg.c
+@@ -36,6 +36,10 @@
+  * Basic validation of the .desktop file is done.
+  */
+ 
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ 
+Index: WindowMaker-0.95.5/util/wxcopy.c
+===================================================================
+--- WindowMaker-0.95.5.orig/util/wxcopy.c
++++ WindowMaker-0.95.5/util/wxcopy.c
+@@ -18,6 +18,10 @@
+  *  MA 02110-1301, USA.
+  */
+ 
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+Index: WindowMaker-0.95.5/wmlib/app.c
+===================================================================
+--- WindowMaker-0.95.5.orig/wmlib/app.c
++++ WindowMaker-0.95.5/wmlib/app.c
+@@ -20,6 +20,10 @@
+  *  MA 02110-1301, USA.
+  */
+ 
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
+ #include <X11/Xlib.h>
+ #include <stdlib.h>
+ #include <string.h>
+Index: WindowMaker-0.95.5/wmlib/command.c
+===================================================================
+--- WindowMaker-0.95.5.orig/wmlib/command.c
++++ WindowMaker-0.95.5/wmlib/command.c
+@@ -20,6 +20,10 @@
+  *  MA 02110-1301, USA.
+  */
+ 
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
+ #include <X11/Xlib.h>
+ #include <stdlib.h>
+ 
+Index: WindowMaker-0.95.5/wmlib/event.c
+===================================================================
+--- WindowMaker-0.95.5.orig/wmlib/event.c
++++ WindowMaker-0.95.5/wmlib/event.c
+@@ -20,6 +20,10 @@
+  *  MA 02110-1301, USA.
+  */
+ 
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <X11/Xlib.h>
+Index: WindowMaker-0.95.5/wmlib/menu.c
+===================================================================
+--- WindowMaker-0.95.5.orig/wmlib/menu.c
++++ WindowMaker-0.95.5/wmlib/menu.c
+@@ -20,6 +20,10 @@
+  *  MA 02110-1301, USA.
+  */
+ 
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <string.h>
+Index: WindowMaker-0.95.5/wrlib/alpha_combine.c
+===================================================================
+--- WindowMaker-0.95.5.orig/wrlib/alpha_combine.c
++++ WindowMaker-0.95.5/wrlib/alpha_combine.c
+@@ -18,6 +18,10 @@
+  *  MA 02110-1301, USA.
+  */
+ 
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
+ #include "wraster.h"
+ 
+ void RCombineAlpha(unsigned char *d, unsigned char *s, int s_has_alpha,
+Index: WindowMaker-0.95.5/wrlib/gif.c
+===================================================================
+--- WindowMaker-0.95.5.orig/wrlib/gif.c
++++ WindowMaker-0.95.5/wrlib/gif.c
 @@ -52,17 +52,24 @@ RImage *RLoadGIF(const char *file, int i
  	unsigned char rmap[256];
  	unsigned char gmap[256];
@@ -2409,7 +2528,19 @@ Index: wrlib/gif.c
  		case D_GIF_ERR_OPEN_FAILED:
  			RErrorCode = RERR_OPEN;
  			break;
-@@ -199,7 +206,11 @@ RImage *RLoadGIF(const char *file, int i
+@@ -77,7 +84,11 @@ RImage *RLoadGIF(const char *file, int i
+ 	}
+ 
+ 	if (gif->SWidth < 1 || gif->SHeight < 1) {
++#if defined(GIFLIB_MAJOR) && (GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1 || GIFLIB_MAJOR > 5)
++		DGifCloseFile(gif, NULL);
++#else
+ 		DGifCloseFile(gif);
++#endif
+ 		RErrorCode = RERR_BADIMAGEFILE;
+ 		return NULL;
+ 	}
+@@ -199,7 +210,11 @@ RImage *RLoadGIF(const char *file, int i
  	/* yuck! */
  	goto did_not_get_any_errors;
   giferr:
@@ -2421,3 +2552,69 @@ Index: wrlib/gif.c
  	case D_GIF_ERR_OPEN_FAILED:
  		RErrorCode = RERR_OPEN;
  		break;
+@@ -219,8 +234,13 @@ RImage *RLoadGIF(const char *file, int i
+ 	if (buffer)
+ 		free(buffer);
+ 
+-	if (gif)
++	if (gif) {
++#if defined(GIFLIB_MAJOR) && (GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1 || GIFLIB_MAJOR > 5)
++		DGifCloseFile(gif, NULL);
++#else
+ 		DGifCloseFile(gif);
++#endif
++	}
+ 
+ 	return image;
+ }
+Index: WindowMaker-0.95.5/wrlib/tests/testdraw.c
+===================================================================
+--- WindowMaker-0.95.5.orig/wrlib/tests/testdraw.c
++++ WindowMaker-0.95.5/wrlib/tests/testdraw.c
+@@ -1,4 +1,8 @@
+ 
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
+ #include <X11/Xlib.h>
+ #include "wraster.h"
+ #include <stdio.h>
+Index: WindowMaker-0.95.5/wrlib/tests/testgrad.c
+===================================================================
+--- WindowMaker-0.95.5.orig/wrlib/tests/testgrad.c
++++ WindowMaker-0.95.5/wrlib/tests/testgrad.c
+@@ -1,4 +1,8 @@
+ 
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
+ #include <X11/Xlib.h>
+ #include "wraster.h"
+ #include <stdio.h>
+Index: WindowMaker-0.95.5/wrlib/tests/testrot.c
+===================================================================
+--- WindowMaker-0.95.5.orig/wrlib/tests/testrot.c
++++ WindowMaker-0.95.5/wrlib/tests/testrot.c
+@@ -1,4 +1,8 @@
+ 
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
+ #include <X11/Xlib.h>
+ #include "wraster.h"
+ #include <stdlib.h>
+Index: WindowMaker-0.95.5/wrlib/tests/view.c
+===================================================================
+--- WindowMaker-0.95.5.orig/wrlib/tests/view.c
++++ WindowMaker-0.95.5/wrlib/tests/view.c
+@@ -1,3 +1,7 @@
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
+ #include <X11/Xlib.h>
+ #include "wraster.h"
+ #include <stdlib.h>