diff --git a/WindowMaker-0.95.6.tar.gz b/WindowMaker-0.95.6.tar.gz
deleted file mode 100644
index 05aae77..0000000
--- a/WindowMaker-0.95.6.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:435b0b4a318a3a00e8267f02cdbd826ad547b1f54259d193ce43e9a77ce06dc4
-size 3004856
diff --git a/WindowMaker-0.95.7.tar.gz b/WindowMaker-0.95.7.tar.gz
new file mode 100644
index 0000000..f1b9e81
--- /dev/null
+++ b/WindowMaker-0.95.7.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:842d486c4b212b19d10dbae2c315c6ff20c6e651471eaa45214b3b832d8097a9
+size 3238325
diff --git a/WindowMaker.changes b/WindowMaker.changes
index f2927a9..1db2065 100644
--- a/WindowMaker.changes
+++ b/WindowMaker.changes
@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Tue Mar 22 13:03:08 UTC 2016 - kmroz@suse.com
+
+- Fix build breakace related to giflib < 5.1.
+
+-------------------------------------------------------------------
+Tue Mar 22 10:09:48 UTC 2016 - kmroz@suse.com
+
+- Update to WindowMaker-0.95.7
+  - Small modification of wm-giflib.patch.
+  - Spec file fixes.
+- Removed: WindowMaker-0.96.6.tar.gz
+- Added: WindowMaker-0.96.7.tar.gz
+
 -------------------------------------------------------------------
 Mon Oct  5 09:24:02 UTC 2015 - mvetter@suse.com
 
diff --git a/WindowMaker.spec b/WindowMaker.spec
index e50278b..e6da396 100644
--- a/WindowMaker.spec
+++ b/WindowMaker.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package WindowMaker
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -20,7 +20,7 @@ Name:           WindowMaker
 Summary:        A Colorful and Flexible Window Manager
 License:        GPL-2.0+ and LGPL-2.1+ and SUSE-Public-Domain
 Group:          System/GUI/Other
-Version:        0.95.6
+Version:        0.95.7
 Release:        0
 # 81eefca4ef70414d73048300058e5007f402dd7f
 # f846b7cdd39749b5291d4559185a229b752b4fed
@@ -123,7 +123,7 @@ export CFLAGS="$RPM_OPT_FLAGS $(freetype-config --cflags)"
   --with-pic\
   --sysconfdir=/etc/X11 \
   --enable-xinerama \
-  --with-nlsdir=/usr/share/locale \
+  --localedir=/usr/share/locale \
   --with-pixmapdir=/usr/share/%{name}/Pixmaps \
   --with-gnustepdir=/usr/lib/GNUstep
 
@@ -173,7 +173,7 @@ cd ..
 
 %files -f %{name}.lang
 %defattr(-,root,root)
-%doc AUTHORS BUGFORM BUGS COPYING COPYING.WTFPL ChangeLog FAQ FAQ.I18N
+%doc AUTHORS BUGFORM BUGS COPYING COPYING.WTFPL ChangeLog FAQ
 %doc NEWS README* TODO
 %doc menu_orig
 %dir /etc/X11/%{name}
diff --git a/wm-giflib.patch b/wm-giflib.patch
index cf4698d..e535a36 100644
--- a/wm-giflib.patch
+++ b/wm-giflib.patch
@@ -161,17 +161,16 @@
  wmlib/event.c                   |    4 ++++
  wmlib/menu.c                    |    4 ++++
  wrlib/alpha_combine.c           |    4 ++++
- wrlib/load_gif.c                |    7 +++++--
  wrlib/tests/testdraw.c          |    4 ++++
  wrlib/tests/testgrad.c          |    4 ++++
  wrlib/tests/testrot.c           |    4 ++++
  wrlib/tests/view.c              |    4 ++++
  167 files changed, 668 insertions(+), 3 deletions(-)
 
-Index: WindowMaker-0.95.6/WINGs/Examples/colorpick.c
+Index: WindowMaker-0.95.7/WINGs/Examples/colorpick.c
 ===================================================================
---- WindowMaker-0.95.6.orig/WINGs/Examples/colorpick.c
-+++ WindowMaker-0.95.6/WINGs/Examples/colorpick.c
+--- WindowMaker-0.95.7.orig/WINGs/Examples/colorpick.c
++++ WindowMaker-0.95.7/WINGs/Examples/colorpick.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -181,10 +180,10 @@ Index: WindowMaker-0.95.6/WINGs/Examples/colorpick.c
  #include <stdlib.h>
  #include <stdio.h>
  #include <WINGs/WINGs.h>
-Index: WindowMaker-0.95.6/WINGs/Examples/fontl.c
+Index: WindowMaker-0.95.7/WINGs/Examples/fontl.c
 ===================================================================
---- WindowMaker-0.95.6.orig/WINGs/Examples/fontl.c
-+++ WindowMaker-0.95.6/WINGs/Examples/fontl.c
+--- WindowMaker-0.95.7.orig/WINGs/Examples/fontl.c
++++ WindowMaker-0.95.7/WINGs/Examples/fontl.c
 @@ -18,6 +18,10 @@
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -196,10 +195,10 @@ Index: WindowMaker-0.95.6/WINGs/Examples/fontl.c
  #include <stdlib.h>
  #include <stdio.h>
  #include <stdint.h>
-Index: WindowMaker-0.95.6/WINGs/Examples/puzzle.c
+Index: WindowMaker-0.95.7/WINGs/Examples/puzzle.c
 ===================================================================
---- WindowMaker-0.95.6.orig/WINGs/Examples/puzzle.c
-+++ WindowMaker-0.95.6/WINGs/Examples/puzzle.c
+--- WindowMaker-0.95.7.orig/WINGs/Examples/puzzle.c
++++ WindowMaker-0.95.7/WINGs/Examples/puzzle.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -209,10 +208,10 @@ Index: WindowMaker-0.95.6/WINGs/Examples/puzzle.c
  #include <stdlib.h>
  #include <stdio.h>
  #include <WINGs/WINGs.h>
-Index: WindowMaker-0.95.6/WINGs/Extras/test.c
+Index: WindowMaker-0.95.7/WINGs/Extras/test.c
 ===================================================================
---- WindowMaker-0.95.6.orig/WINGs/Extras/test.c
-+++ WindowMaker-0.95.6/WINGs/Extras/test.c
+--- WindowMaker-0.95.7.orig/WINGs/Extras/test.c
++++ WindowMaker-0.95.7/WINGs/Extras/test.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -222,10 +221,10 @@ Index: WindowMaker-0.95.6/WINGs/Extras/test.c
  #include <WINGs/WINGs.h>
  #include <stdio.h>
  #include <stdint.h>
-Index: WindowMaker-0.95.6/WINGs/Extras/wtabledelegates.c
+Index: WindowMaker-0.95.7/WINGs/Extras/wtabledelegates.c
 ===================================================================
---- WindowMaker-0.95.6.orig/WINGs/Extras/wtabledelegates.c
-+++ WindowMaker-0.95.6/WINGs/Extras/wtabledelegates.c
+--- WindowMaker-0.95.7.orig/WINGs/Extras/wtabledelegates.c
++++ WindowMaker-0.95.7/WINGs/Extras/wtabledelegates.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -235,10 +234,10 @@ Index: WindowMaker-0.95.6/WINGs/Extras/wtabledelegates.c
  #include <stdint.h>
  #include <WINGs/WINGsP.h>
  
-Index: WindowMaker-0.95.6/WINGs/Extras/wtableview.c
+Index: WindowMaker-0.95.7/WINGs/Extras/wtableview.c
 ===================================================================
---- WindowMaker-0.95.6.orig/WINGs/Extras/wtableview.c
-+++ WindowMaker-0.95.6/WINGs/Extras/wtableview.c
+--- WindowMaker-0.95.7.orig/WINGs/Extras/wtableview.c
++++ WindowMaker-0.95.7/WINGs/Extras/wtableview.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -248,10 +247,10 @@ Index: WindowMaker-0.95.6/WINGs/Extras/wtableview.c
  #include <WINGs/WINGsP.h>
  #include <X11/cursorfont.h>
  #include <stdint.h>
-Index: WindowMaker-0.95.6/WINGs/Tests/mywidget.c
+Index: WindowMaker-0.95.7/WINGs/Tests/mywidget.c
 ===================================================================
---- WindowMaker-0.95.6.orig/WINGs/Tests/mywidget.c
-+++ WindowMaker-0.95.6/WINGs/Tests/mywidget.c
+--- WindowMaker-0.95.7.orig/WINGs/Tests/mywidget.c
++++ WindowMaker-0.95.7/WINGs/Tests/mywidget.c
 @@ -13,6 +13,10 @@
   *
   *
@@ -263,10 +262,10 @@ Index: WindowMaker-0.95.6/WINGs/Tests/mywidget.c
  #include <WINGs/WINGsP.h>
  
  /*
-Index: WindowMaker-0.95.6/WINGs/Tests/testmywidget.c
+Index: WindowMaker-0.95.7/WINGs/Tests/testmywidget.c
 ===================================================================
---- WindowMaker-0.95.6.orig/WINGs/Tests/testmywidget.c
-+++ WindowMaker-0.95.6/WINGs/Tests/testmywidget.c
+--- WindowMaker-0.95.7.orig/WINGs/Tests/testmywidget.c
++++ WindowMaker-0.95.7/WINGs/Tests/testmywidget.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -276,10 +275,10 @@ Index: WindowMaker-0.95.6/WINGs/Tests/testmywidget.c
  #include <WINGs/WINGs.h>
  #include <stdlib.h>
  
-Index: WindowMaker-0.95.6/WINGs/Tests/wmfile.c
+Index: WindowMaker-0.95.7/WINGs/Tests/wmfile.c
 ===================================================================
---- WindowMaker-0.95.6.orig/WINGs/Tests/wmfile.c
-+++ WindowMaker-0.95.6/WINGs/Tests/wmfile.c
+--- WindowMaker-0.95.7.orig/WINGs/Tests/wmfile.c
++++ WindowMaker-0.95.7/WINGs/Tests/wmfile.c
 @@ -11,6 +11,10 @@
   -----------------------------------------------------------------------
   */
@@ -291,10 +290,10 @@ Index: WindowMaker-0.95.6/WINGs/Tests/wmfile.c
  #include <WINGs/WINGs.h>
  
  #include <unistd.h>
-Index: WindowMaker-0.95.6/WINGs/Tests/wmquery.c
+Index: WindowMaker-0.95.7/WINGs/Tests/wmquery.c
 ===================================================================
---- WindowMaker-0.95.6.orig/WINGs/Tests/wmquery.c
-+++ WindowMaker-0.95.6/WINGs/Tests/wmquery.c
+--- WindowMaker-0.95.7.orig/WINGs/Tests/wmquery.c
++++ WindowMaker-0.95.7/WINGs/Tests/wmquery.c
 @@ -3,6 +3,10 @@
   * Author: Len Trigg <trigg@cs.waikato.ac.nz>
   */
@@ -306,10 +305,10 @@ Index: WindowMaker-0.95.6/WINGs/Tests/wmquery.c
  #include <WINGs/WINGs.h>
  
  #include <unistd.h>
-Index: WindowMaker-0.95.6/WINGs/Tests/wtest.c
+Index: WindowMaker-0.95.7/WINGs/Tests/wtest.c
 ===================================================================
---- WindowMaker-0.95.6.orig/WINGs/Tests/wtest.c
-+++ WindowMaker-0.95.6/WINGs/Tests/wtest.c
+--- WindowMaker-0.95.7.orig/WINGs/Tests/wtest.c
++++ WindowMaker-0.95.7/WINGs/Tests/wtest.c
 @@ -2,6 +2,10 @@
   * WINGs test application
   */
@@ -321,10 +320,10 @@ Index: WindowMaker-0.95.6/WINGs/Tests/wtest.c
  #include <WINGs/WINGs.h>
  
  #include <stdio.h>
-Index: WindowMaker-0.95.6/WINGs/array.c
+Index: WindowMaker-0.95.7/WINGs/array.c
 ===================================================================
---- WindowMaker-0.95.6.orig/WINGs/array.c
-+++ WindowMaker-0.95.6/WINGs/array.c
+--- WindowMaker-0.95.7.orig/WINGs/array.c
++++ WindowMaker-0.95.7/WINGs/array.c
 @@ -8,6 +8,10 @@
   * proper credit is always appreciated :)
   */
@@ -336,10 +335,10 @@ Index: WindowMaker-0.95.6/WINGs/array.c
  #include <stdlib.h>
  #include <string.h>
  
-Index: WindowMaker-0.95.6/WINGs/bagtree.c
+Index: WindowMaker-0.95.7/WINGs/bagtree.c
 ===================================================================
---- WindowMaker-0.95.6.orig/WINGs/bagtree.c
-+++ WindowMaker-0.95.6/WINGs/bagtree.c
+--- WindowMaker-0.95.7.orig/WINGs/bagtree.c
++++ WindowMaker-0.95.7/WINGs/bagtree.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -349,10 +348,10 @@ Index: WindowMaker-0.95.6/WINGs/bagtree.c
  #include <stdlib.h>
  #include <string.h>
  
-Index: WindowMaker-0.95.6/WINGs/configuration.c
+Index: WindowMaker-0.95.7/WINGs/configuration.c
 ===================================================================
---- WindowMaker-0.95.6.orig/WINGs/configuration.c
-+++ WindowMaker-0.95.6/WINGs/configuration.c
+--- WindowMaker-0.95.7.orig/WINGs/configuration.c
++++ WindowMaker-0.95.7/WINGs/configuration.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -362,10 +361,10 @@ Index: WindowMaker-0.95.6/WINGs/configuration.c
  #include "WINGsP.h"
  #include "wconfig.h"
  
-Index: WindowMaker-0.95.6/WINGs/data.c
+Index: WindowMaker-0.95.7/WINGs/data.c
 ===================================================================
---- WindowMaker-0.95.6.orig/WINGs/data.c
-+++ WindowMaker-0.95.6/WINGs/data.c
+--- WindowMaker-0.95.7.orig/WINGs/data.c
++++ WindowMaker-0.95.7/WINGs/data.c
 @@ -19,6 +19,10 @@
   *  MA 02110-1301, USA.
   */
@@ -377,11 +376,12 @@ Index: WindowMaker-0.95.6/WINGs/data.c
  #include <string.h>
  #include "WUtil.h"
  
-Index: WindowMaker-0.95.6/WINGs/dragcommon.c
+Index: WindowMaker-0.95.7/WINGs/dragcommon.c
 ===================================================================
---- WindowMaker-0.95.6.orig/WINGs/dragcommon.c
-+++ WindowMaker-0.95.6/WINGs/dragcommon.c
-@@ -1,4 +1,8 @@
+--- WindowMaker-0.95.7.orig/WINGs/dragcommon.c
++++ WindowMaker-0.95.7/WINGs/dragcommon.c
+@@ -1,5 +1,9 @@
+ #include "wconfig.h"
  
 +#ifdef HAVE_CONFIG_H
 +#include "config.h"
@@ -390,10 +390,10 @@ Index: WindowMaker-0.95.6/WINGs/dragcommon.c
  #include "WINGsP.h"
  
  #define XDND_SOURCE_VERSION(dragInfo) dragInfo->protocolVersion
-Index: WindowMaker-0.95.6/WINGs/dragdestination.c
+Index: WindowMaker-0.95.7/WINGs/dragdestination.c
 ===================================================================
---- WindowMaker-0.95.6.orig/WINGs/dragdestination.c
-+++ WindowMaker-0.95.6/WINGs/dragdestination.c
+--- WindowMaker-0.95.7.orig/WINGs/dragdestination.c
++++ WindowMaker-0.95.7/WINGs/dragdestination.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -403,10 +403,10 @@ Index: WindowMaker-0.95.6/WINGs/dragdestination.c
  #include "WINGsP.h"
  #include <X11/Xatom.h>
  
-Index: WindowMaker-0.95.6/WINGs/dragsource.c
+Index: WindowMaker-0.95.7/WINGs/dragsource.c
 ===================================================================
---- WindowMaker-0.95.6.orig/WINGs/dragsource.c
-+++ WindowMaker-0.95.6/WINGs/dragsource.c
+--- WindowMaker-0.95.7.orig/WINGs/dragsource.c
++++ WindowMaker-0.95.7/WINGs/dragsource.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -416,10 +416,10 @@ Index: WindowMaker-0.95.6/WINGs/dragsource.c
  #include "wconfig.h"
  #include "WINGsP.h"
  
-Index: WindowMaker-0.95.6/WINGs/error.c
+Index: WindowMaker-0.95.7/WINGs/error.c
 ===================================================================
---- WindowMaker-0.95.6.orig/WINGs/error.c
-+++ WindowMaker-0.95.6/WINGs/error.c
+--- WindowMaker-0.95.7.orig/WINGs/error.c
++++ WindowMaker-0.95.7/WINGs/error.c
 @@ -19,6 +19,10 @@
   *  MA 02110-1301, USA.
   */
@@ -431,10 +431,10 @@ Index: WindowMaker-0.95.6/WINGs/error.c
  #include "wconfig.h"
  
  #include <stdarg.h>
-Index: WindowMaker-0.95.6/WINGs/findfile.c
+Index: WindowMaker-0.95.7/WINGs/findfile.c
 ===================================================================
---- WindowMaker-0.95.6.orig/WINGs/findfile.c
-+++ WindowMaker-0.95.6/WINGs/findfile.c
+--- WindowMaker-0.95.7.orig/WINGs/findfile.c
++++ WindowMaker-0.95.7/WINGs/findfile.c
 @@ -19,6 +19,10 @@
   *  MA 02110-1301, USA.
   */
@@ -446,10 +446,10 @@ Index: WindowMaker-0.95.6/WINGs/findfile.c
  #include "wconfig.h"
  
  #include "WUtil.h"
-Index: WindowMaker-0.95.6/WINGs/handlers.c
+Index: WindowMaker-0.95.7/WINGs/handlers.c
 ===================================================================
---- WindowMaker-0.95.6.orig/WINGs/handlers.c
-+++ WindowMaker-0.95.6/WINGs/handlers.c
+--- WindowMaker-0.95.7.orig/WINGs/handlers.c
++++ WindowMaker-0.95.7/WINGs/handlers.c
 @@ -3,6 +3,10 @@
   * WINGs internal handlers: timer, idle and input handlers
   */
@@ -461,10 +461,10 @@ Index: WindowMaker-0.95.6/WINGs/handlers.c
  #include "wconfig.h"
  #include "WINGsP.h"
  
-Index: WindowMaker-0.95.6/WINGs/hashtable.c
+Index: WindowMaker-0.95.7/WINGs/hashtable.c
 ===================================================================
---- WindowMaker-0.95.6.orig/WINGs/hashtable.c
-+++ WindowMaker-0.95.6/WINGs/hashtable.c
+--- WindowMaker-0.95.7.orig/WINGs/hashtable.c
++++ WindowMaker-0.95.7/WINGs/hashtable.c
 @@ -1,5 +1,9 @@
  #include <config.h>
  
@@ -475,10 +475,10 @@ Index: WindowMaker-0.95.6/WINGs/hashtable.c
  #include <sys/types.h>
  #include <string.h>
  #include <stdlib.h>
-Index: WindowMaker-0.95.6/WINGs/memory.c
+Index: WindowMaker-0.95.7/WINGs/memory.c
 ===================================================================
---- WindowMaker-0.95.6.orig/WINGs/memory.c
-+++ WindowMaker-0.95.6/WINGs/memory.c
+--- WindowMaker-0.95.7.orig/WINGs/memory.c
++++ WindowMaker-0.95.7/WINGs/memory.c
 @@ -19,6 +19,10 @@
   *  MA 02110-1301, USA.
   */
@@ -490,10 +490,10 @@ Index: WindowMaker-0.95.6/WINGs/memory.c
  #include "wconfig.h"
  #include "WUtil.h"
  
-Index: WindowMaker-0.95.6/WINGs/misc.c
+Index: WindowMaker-0.95.7/WINGs/misc.c
 ===================================================================
---- WindowMaker-0.95.6.orig/WINGs/misc.c
-+++ WindowMaker-0.95.6/WINGs/misc.c
+--- WindowMaker-0.95.7.orig/WINGs/misc.c
++++ WindowMaker-0.95.7/WINGs/misc.c
 @@ -20,6 +20,10 @@
  
  /* Miscelaneous helper functions */
@@ -505,10 +505,10 @@ Index: WindowMaker-0.95.6/WINGs/misc.c
  #include <WUtil.h>
  
  #include "error.h"
-Index: WindowMaker-0.95.6/WINGs/notification.c
+Index: WindowMaker-0.95.7/WINGs/notification.c
 ===================================================================
---- WindowMaker-0.95.6.orig/WINGs/notification.c
-+++ WindowMaker-0.95.6/WINGs/notification.c
+--- WindowMaker-0.95.7.orig/WINGs/notification.c
++++ WindowMaker-0.95.7/WINGs/notification.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -518,10 +518,10 @@ Index: WindowMaker-0.95.6/WINGs/notification.c
  #include <stdlib.h>
  #include <assert.h>
  #include <stdio.h>
-Index: WindowMaker-0.95.6/WINGs/proplist.c
+Index: WindowMaker-0.95.7/WINGs/proplist.c
 ===================================================================
---- WindowMaker-0.95.6.orig/WINGs/proplist.c
-+++ WindowMaker-0.95.6/WINGs/proplist.c
+--- WindowMaker-0.95.7.orig/WINGs/proplist.c
++++ WindowMaker-0.95.7/WINGs/proplist.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -531,10 +531,10 @@ Index: WindowMaker-0.95.6/WINGs/proplist.c
  #include <sys/types.h>
  #include <sys/stat.h>
  
-Index: WindowMaker-0.95.6/WINGs/selection.c
+Index: WindowMaker-0.95.7/WINGs/selection.c
 ===================================================================
---- WindowMaker-0.95.6.orig/WINGs/selection.c
-+++ WindowMaker-0.95.6/WINGs/selection.c
+--- WindowMaker-0.95.7.orig/WINGs/selection.c
++++ WindowMaker-0.95.7/WINGs/selection.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -544,10 +544,10 @@ Index: WindowMaker-0.95.6/WINGs/selection.c
  #include <stdlib.h>
  
  #include <X11/Xatom.h>
-Index: WindowMaker-0.95.6/WINGs/string.c
+Index: WindowMaker-0.95.7/WINGs/string.c
 ===================================================================
---- WindowMaker-0.95.6.orig/WINGs/string.c
-+++ WindowMaker-0.95.6/WINGs/string.c
+--- WindowMaker-0.95.7.orig/WINGs/string.c
++++ WindowMaker-0.95.7/WINGs/string.c
 @@ -6,6 +6,10 @@
  #   undef _XOPEN_SOURCE
  #endif
@@ -559,10 +559,10 @@ Index: WindowMaker-0.95.6/WINGs/string.c
  #include "wconfig.h"
  
  #include <string.h>
-Index: WindowMaker-0.95.6/WINGs/tree.c
+Index: WindowMaker-0.95.7/WINGs/tree.c
 ===================================================================
---- WindowMaker-0.95.6.orig/WINGs/tree.c
-+++ WindowMaker-0.95.6/WINGs/tree.c
+--- WindowMaker-0.95.7.orig/WINGs/tree.c
++++ WindowMaker-0.95.7/WINGs/tree.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -572,10 +572,10 @@ Index: WindowMaker-0.95.6/WINGs/tree.c
  #include <string.h>
  
  #include "WUtil.h"
-Index: WindowMaker-0.95.6/WINGs/userdefaults.c
+Index: WindowMaker-0.95.7/WINGs/userdefaults.c
 ===================================================================
---- WindowMaker-0.95.6.orig/WINGs/userdefaults.c
-+++ WindowMaker-0.95.6/WINGs/userdefaults.c
+--- WindowMaker-0.95.7.orig/WINGs/userdefaults.c
++++ WindowMaker-0.95.7/WINGs/userdefaults.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -585,10 +585,10 @@ Index: WindowMaker-0.95.6/WINGs/userdefaults.c
  #include <stdlib.h>
  #include <string.h>
  #include <strings.h>
-Index: WindowMaker-0.95.6/WINGs/usleep.c
+Index: WindowMaker-0.95.7/WINGs/usleep.c
 ===================================================================
---- WindowMaker-0.95.6.orig/WINGs/usleep.c
-+++ WindowMaker-0.95.6/WINGs/usleep.c
+--- WindowMaker-0.95.7.orig/WINGs/usleep.c
++++ WindowMaker-0.95.7/WINGs/usleep.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -598,10 +598,10 @@ Index: WindowMaker-0.95.6/WINGs/usleep.c
  #include <errno.h>
  #include <time.h>
  
-Index: WindowMaker-0.95.6/WINGs/wapplication.c
+Index: WindowMaker-0.95.7/WINGs/wapplication.c
 ===================================================================
---- WindowMaker-0.95.6.orig/WINGs/wapplication.c
-+++ WindowMaker-0.95.6/WINGs/wapplication.c
+--- WindowMaker-0.95.7.orig/WINGs/wapplication.c
++++ WindowMaker-0.95.7/WINGs/wapplication.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -611,10 +611,10 @@ Index: WindowMaker-0.95.6/WINGs/wapplication.c
  #include <unistd.h>
  #include <X11/Xlocale.h>
  
-Index: WindowMaker-0.95.6/WINGs/wappresource.c
+Index: WindowMaker-0.95.7/WINGs/wappresource.c
 ===================================================================
---- WindowMaker-0.95.6.orig/WINGs/wappresource.c
-+++ WindowMaker-0.95.6/WINGs/wappresource.c
+--- WindowMaker-0.95.7.orig/WINGs/wappresource.c
++++ WindowMaker-0.95.7/WINGs/wappresource.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -624,10 +624,10 @@ Index: WindowMaker-0.95.6/WINGs/wappresource.c
  #include <unistd.h>
  
  #include "WINGsP.h"
-Index: WindowMaker-0.95.6/WINGs/wballoon.c
+Index: WindowMaker-0.95.7/WINGs/wballoon.c
 ===================================================================
---- WindowMaker-0.95.6.orig/WINGs/wballoon.c
-+++ WindowMaker-0.95.6/WINGs/wballoon.c
+--- WindowMaker-0.95.7.orig/WINGs/wballoon.c
++++ WindowMaker-0.95.7/WINGs/wballoon.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -637,10 +637,10 @@ Index: WindowMaker-0.95.6/WINGs/wballoon.c
  #include "wconfig.h"
  #include "WINGsP.h"
  
-Index: WindowMaker-0.95.6/WINGs/wbox.c
+Index: WindowMaker-0.95.7/WINGs/wbox.c
 ===================================================================
---- WindowMaker-0.95.6.orig/WINGs/wbox.c
-+++ WindowMaker-0.95.6/WINGs/wbox.c
+--- WindowMaker-0.95.7.orig/WINGs/wbox.c
++++ WindowMaker-0.95.7/WINGs/wbox.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -650,10 +650,10 @@ Index: WindowMaker-0.95.6/WINGs/wbox.c
  #include "WINGsP.h"
  
  typedef struct {
-Index: WindowMaker-0.95.6/WINGs/wbrowser.c
+Index: WindowMaker-0.95.7/WINGs/wbrowser.c
 ===================================================================
---- WindowMaker-0.95.6.orig/WINGs/wbrowser.c
-+++ WindowMaker-0.95.6/WINGs/wbrowser.c
+--- WindowMaker-0.95.7.orig/WINGs/wbrowser.c
++++ WindowMaker-0.95.7/WINGs/wbrowser.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -663,10 +663,10 @@ Index: WindowMaker-0.95.6/WINGs/wbrowser.c
  #include "WINGsP.h"
  #include <math.h>		/* for : double rint (double) */
  
-Index: WindowMaker-0.95.6/WINGs/wbutton.c
+Index: WindowMaker-0.95.7/WINGs/wbutton.c
 ===================================================================
---- WindowMaker-0.95.6.orig/WINGs/wbutton.c
-+++ WindowMaker-0.95.6/WINGs/wbutton.c
+--- WindowMaker-0.95.7.orig/WINGs/wbutton.c
++++ WindowMaker-0.95.7/WINGs/wbutton.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -676,10 +676,10 @@ Index: WindowMaker-0.95.6/WINGs/wbutton.c
  #include "WINGsP.h"
  
  typedef struct W_Button {
-Index: WindowMaker-0.95.6/WINGs/wcolor.c
+Index: WindowMaker-0.95.7/WINGs/wcolor.c
 ===================================================================
---- WindowMaker-0.95.6.orig/WINGs/wcolor.c
-+++ WindowMaker-0.95.6/WINGs/wcolor.c
+--- WindowMaker-0.95.7.orig/WINGs/wcolor.c
++++ WindowMaker-0.95.7/WINGs/wcolor.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -689,10 +689,10 @@ Index: WindowMaker-0.95.6/WINGs/wcolor.c
  #include "WINGsP.h"
  
  #include "wconfig.h"
-Index: WindowMaker-0.95.6/WINGs/wcolorpanel.c
+Index: WindowMaker-0.95.7/WINGs/wcolorpanel.c
 ===================================================================
---- WindowMaker-0.95.6.orig/WINGs/wcolorpanel.c
-+++ WindowMaker-0.95.6/WINGs/wcolorpanel.c
+--- WindowMaker-0.95.7.orig/WINGs/wcolorpanel.c
++++ WindowMaker-0.95.7/WINGs/wcolorpanel.c
 @@ -23,6 +23,10 @@
   * 	-	Resizing
   */
@@ -704,10 +704,10 @@ Index: WindowMaker-0.95.6/WINGs/wcolorpanel.c
  #include "wconfig.h"
  #include "WINGsP.h"
  #include "rgb.h"
-Index: WindowMaker-0.95.6/WINGs/wcolorwell.c
+Index: WindowMaker-0.95.7/WINGs/wcolorwell.c
 ===================================================================
---- WindowMaker-0.95.6.orig/WINGs/wcolorwell.c
-+++ WindowMaker-0.95.6/WINGs/wcolorwell.c
+--- WindowMaker-0.95.7.orig/WINGs/wcolorwell.c
++++ WindowMaker-0.95.7/WINGs/wcolorwell.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -717,10 +717,10 @@ Index: WindowMaker-0.95.6/WINGs/wcolorwell.c
  #include "WINGsP.h"
  
  #define XDND_COLOR_DATA_TYPE "application/X-color"
-Index: WindowMaker-0.95.6/WINGs/wevent.c
+Index: WindowMaker-0.95.7/WINGs/wevent.c
 ===================================================================
---- WindowMaker-0.95.6.orig/WINGs/wevent.c
-+++ WindowMaker-0.95.6/WINGs/wevent.c
+--- WindowMaker-0.95.7.orig/WINGs/wevent.c
++++ WindowMaker-0.95.7/WINGs/wevent.c
 @@ -3,6 +3,10 @@
   * This event handling stuff was inspired on Tk.
   */
@@ -732,10 +732,10 @@ Index: WindowMaker-0.95.6/WINGs/wevent.c
  #include "WINGsP.h"
  
  /* table to map event types to event masks */
-Index: WindowMaker-0.95.6/WINGs/wfilepanel.c
+Index: WindowMaker-0.95.7/WINGs/wfilepanel.c
 ===================================================================
---- WindowMaker-0.95.6.orig/WINGs/wfilepanel.c
-+++ WindowMaker-0.95.6/WINGs/wfilepanel.c
+--- WindowMaker-0.95.7.orig/WINGs/wfilepanel.c
++++ WindowMaker-0.95.7/WINGs/wfilepanel.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -745,10 +745,10 @@ Index: WindowMaker-0.95.6/WINGs/wfilepanel.c
  #include <sys/types.h>
  #include <sys/stat.h>
  
-Index: WindowMaker-0.95.6/WINGs/wfont.c
+Index: WindowMaker-0.95.7/WINGs/wfont.c
 ===================================================================
---- WindowMaker-0.95.6.orig/WINGs/wfont.c
-+++ WindowMaker-0.95.6/WINGs/wfont.c
+--- WindowMaker-0.95.7.orig/WINGs/wfont.c
++++ WindowMaker-0.95.7/WINGs/wfont.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -758,10 +758,10 @@ Index: WindowMaker-0.95.6/WINGs/wfont.c
  #include <stdlib.h>
  
  #include "wconfig.h"
-Index: WindowMaker-0.95.6/WINGs/wfontpanel.c
+Index: WindowMaker-0.95.7/WINGs/wfontpanel.c
 ===================================================================
---- WindowMaker-0.95.6.orig/WINGs/wfontpanel.c
-+++ WindowMaker-0.95.6/WINGs/wfontpanel.c
+--- WindowMaker-0.95.7.orig/WINGs/wfontpanel.c
++++ WindowMaker-0.95.7/WINGs/wfontpanel.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -771,10 +771,10 @@ Index: WindowMaker-0.95.6/WINGs/wfontpanel.c
  #include "WINGsP.h"
  #include "WUtil.h"
  #include "wconfig.h"
-Index: WindowMaker-0.95.6/WINGs/wframe.c
+Index: WindowMaker-0.95.7/WINGs/wframe.c
 ===================================================================
---- WindowMaker-0.95.6.orig/WINGs/wframe.c
-+++ WindowMaker-0.95.6/WINGs/wframe.c
+--- WindowMaker-0.95.7.orig/WINGs/wframe.c
++++ WindowMaker-0.95.7/WINGs/wframe.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -784,10 +784,10 @@ Index: WindowMaker-0.95.6/WINGs/wframe.c
  #include "WINGsP.h"
  
  typedef struct W_Frame {
-Index: WindowMaker-0.95.6/WINGs/widgets.c
+Index: WindowMaker-0.95.7/WINGs/widgets.c
 ===================================================================
---- WindowMaker-0.95.6.orig/WINGs/widgets.c
-+++ WindowMaker-0.95.6/WINGs/widgets.c
+--- WindowMaker-0.95.7.orig/WINGs/widgets.c
++++ WindowMaker-0.95.7/WINGs/widgets.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -797,10 +797,10 @@ Index: WindowMaker-0.95.6/WINGs/widgets.c
  #include "WINGsP.h"
  #include "wconfig.h"
  
-Index: WindowMaker-0.95.6/WINGs/winputmethod.c
+Index: WindowMaker-0.95.7/WINGs/winputmethod.c
 ===================================================================
---- WindowMaker-0.95.6.orig/WINGs/winputmethod.c
-+++ WindowMaker-0.95.6/WINGs/winputmethod.c
+--- WindowMaker-0.95.7.orig/WINGs/winputmethod.c
++++ WindowMaker-0.95.7/WINGs/winputmethod.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -809,11 +809,11 @@ Index: WindowMaker-0.95.6/WINGs/winputmethod.c
 +
  #include <X11/Xlib.h>
  
- #include "WINGsP.h"
-Index: WindowMaker-0.95.6/WINGs/wlabel.c
+ #include "wconfig.h"
+Index: WindowMaker-0.95.7/WINGs/wlabel.c
 ===================================================================
---- WindowMaker-0.95.6.orig/WINGs/wlabel.c
-+++ WindowMaker-0.95.6/WINGs/wlabel.c
+--- WindowMaker-0.95.7.orig/WINGs/wlabel.c
++++ WindowMaker-0.95.7/WINGs/wlabel.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -823,10 +823,10 @@ Index: WindowMaker-0.95.6/WINGs/wlabel.c
  #include "WINGsP.h"
  
  typedef struct W_Label {
-Index: WindowMaker-0.95.6/WINGs/wlist.c
+Index: WindowMaker-0.95.7/WINGs/wlist.c
 ===================================================================
---- WindowMaker-0.95.6.orig/WINGs/wlist.c
-+++ WindowMaker-0.95.6/WINGs/wlist.c
+--- WindowMaker-0.95.7.orig/WINGs/wlist.c
++++ WindowMaker-0.95.7/WINGs/wlist.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -836,10 +836,10 @@ Index: WindowMaker-0.95.6/WINGs/wlist.c
  #include "WINGsP.h"
  
  char *WMListDidScrollNotification = "WMListDidScrollNotification";
-Index: WindowMaker-0.95.6/WINGs/wmenuitem.c
+Index: WindowMaker-0.95.7/WINGs/wmenuitem.c
 ===================================================================
---- WindowMaker-0.95.6.orig/WINGs/wmenuitem.c
-+++ WindowMaker-0.95.6/WINGs/wmenuitem.c
+--- WindowMaker-0.95.7.orig/WINGs/wmenuitem.c
++++ WindowMaker-0.95.7/WINGs/wmenuitem.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -849,10 +849,10 @@ Index: WindowMaker-0.95.6/WINGs/wmenuitem.c
  #include "WINGsP.h"
  
  typedef struct W_MenuItem {
-Index: WindowMaker-0.95.6/WINGs/wmisc.c
+Index: WindowMaker-0.95.7/WINGs/wmisc.c
 ===================================================================
---- WindowMaker-0.95.6.orig/WINGs/wmisc.c
-+++ WindowMaker-0.95.6/WINGs/wmisc.c
+--- WindowMaker-0.95.7.orig/WINGs/wmisc.c
++++ WindowMaker-0.95.7/WINGs/wmisc.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -862,10 +862,10 @@ Index: WindowMaker-0.95.6/WINGs/wmisc.c
  #include "WINGsP.h"
  
  #include <wraster.h>
-Index: WindowMaker-0.95.6/WINGs/wpanel.c
+Index: WindowMaker-0.95.7/WINGs/wpanel.c
 ===================================================================
---- WindowMaker-0.95.6.orig/WINGs/wpanel.c
-+++ WindowMaker-0.95.6/WINGs/wpanel.c
+--- WindowMaker-0.95.7.orig/WINGs/wpanel.c
++++ WindowMaker-0.95.7/WINGs/wpanel.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -875,10 +875,10 @@ Index: WindowMaker-0.95.6/WINGs/wpanel.c
  #include "WINGsP.h"
  
  #include <X11/keysym.h>
-Index: WindowMaker-0.95.6/WINGs/wpixmap.c
+Index: WindowMaker-0.95.7/WINGs/wpixmap.c
 ===================================================================
---- WindowMaker-0.95.6.orig/WINGs/wpixmap.c
-+++ WindowMaker-0.95.6/WINGs/wpixmap.c
+--- WindowMaker-0.95.7.orig/WINGs/wpixmap.c
++++ WindowMaker-0.95.7/WINGs/wpixmap.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -888,10 +888,10 @@ Index: WindowMaker-0.95.6/WINGs/wpixmap.c
  #include "WINGsP.h"
  
  #include <wraster.h>
-Index: WindowMaker-0.95.6/WINGs/wpopupbutton.c
+Index: WindowMaker-0.95.7/WINGs/wpopupbutton.c
 ===================================================================
---- WindowMaker-0.95.6.orig/WINGs/wpopupbutton.c
-+++ WindowMaker-0.95.6/WINGs/wpopupbutton.c
+--- WindowMaker-0.95.7.orig/WINGs/wpopupbutton.c
++++ WindowMaker-0.95.7/WINGs/wpopupbutton.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -901,10 +901,10 @@ Index: WindowMaker-0.95.6/WINGs/wpopupbutton.c
  #include "WINGsP.h"
  
  typedef struct W_PopUpButton {
-Index: WindowMaker-0.95.6/WINGs/wprogressindicator.c
+Index: WindowMaker-0.95.7/WINGs/wprogressindicator.c
 ===================================================================
---- WindowMaker-0.95.6.orig/WINGs/wprogressindicator.c
-+++ WindowMaker-0.95.6/WINGs/wprogressindicator.c
+--- WindowMaker-0.95.7.orig/WINGs/wprogressindicator.c
++++ WindowMaker-0.95.7/WINGs/wprogressindicator.c
 @@ -5,6 +5,10 @@
   * - centralized drawing into one pain function
   */
@@ -916,10 +916,10 @@ Index: WindowMaker-0.95.6/WINGs/wprogressindicator.c
  #include "WINGsP.h"
  
  typedef struct W_ProgressIndicator {
-Index: WindowMaker-0.95.6/WINGs/wruler.c
+Index: WindowMaker-0.95.7/WINGs/wruler.c
 ===================================================================
---- WindowMaker-0.95.6.orig/WINGs/wruler.c
-+++ WindowMaker-0.95.6/WINGs/wruler.c
+--- WindowMaker-0.95.7.orig/WINGs/wruler.c
++++ WindowMaker-0.95.7/WINGs/wruler.c
 @@ -19,6 +19,10 @@
   *  MA 02110-1301, USA.
   */
@@ -931,10 +931,10 @@ Index: WindowMaker-0.95.6/WINGs/wruler.c
  #include "WINGsP.h"
  #include "wconfig.h"
  
-Index: WindowMaker-0.95.6/WINGs/wscroller.c
+Index: WindowMaker-0.95.7/WINGs/wscroller.c
 ===================================================================
---- WindowMaker-0.95.6.orig/WINGs/wscroller.c
-+++ WindowMaker-0.95.6/WINGs/wscroller.c
+--- WindowMaker-0.95.7.orig/WINGs/wscroller.c
++++ WindowMaker-0.95.7/WINGs/wscroller.c
 @@ -7,6 +7,10 @@
  #   undef _XOPEN_SOURCE
  #endif
@@ -946,10 +946,10 @@ Index: WindowMaker-0.95.6/WINGs/wscroller.c
  #include "WINGsP.h"
  
  #include <math.h>
-Index: WindowMaker-0.95.6/WINGs/wscrollview.c
+Index: WindowMaker-0.95.7/WINGs/wscrollview.c
 ===================================================================
---- WindowMaker-0.95.6.orig/WINGs/wscrollview.c
-+++ WindowMaker-0.95.6/WINGs/wscrollview.c
+--- WindowMaker-0.95.7.orig/WINGs/wscrollview.c
++++ WindowMaker-0.95.7/WINGs/wscrollview.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -959,10 +959,10 @@ Index: WindowMaker-0.95.6/WINGs/wscrollview.c
  #include "WINGsP.h"
  
  typedef struct W_ScrollView {
-Index: WindowMaker-0.95.6/WINGs/wslider.c
+Index: WindowMaker-0.95.7/WINGs/wslider.c
 ===================================================================
---- WindowMaker-0.95.6.orig/WINGs/wslider.c
-+++ WindowMaker-0.95.6/WINGs/wslider.c
+--- WindowMaker-0.95.7.orig/WINGs/wslider.c
++++ WindowMaker-0.95.7/WINGs/wslider.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -972,10 +972,10 @@ Index: WindowMaker-0.95.6/WINGs/wslider.c
  #include "WINGsP.h"
  
  #undef STRICT_NEXT_BEHAVIOUR
-Index: WindowMaker-0.95.6/WINGs/wsplitview.c
+Index: WindowMaker-0.95.7/WINGs/wsplitview.c
 ===================================================================
---- WindowMaker-0.95.6.orig/WINGs/wsplitview.c
-+++ WindowMaker-0.95.6/WINGs/wsplitview.c
+--- WindowMaker-0.95.7.orig/WINGs/wsplitview.c
++++ WindowMaker-0.95.7/WINGs/wsplitview.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -985,10 +985,10 @@ Index: WindowMaker-0.95.6/WINGs/wsplitview.c
  #include "WINGsP.h"
  
  /*
-Index: WindowMaker-0.95.6/WINGs/wtabview.c
+Index: WindowMaker-0.95.7/WINGs/wtabview.c
 ===================================================================
---- WindowMaker-0.95.6.orig/WINGs/wtabview.c
-+++ WindowMaker-0.95.6/WINGs/wtabview.c
+--- WindowMaker-0.95.7.orig/WINGs/wtabview.c
++++ WindowMaker-0.95.7/WINGs/wtabview.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -998,10 +998,10 @@ Index: WindowMaker-0.95.6/WINGs/wtabview.c
  #include "WINGsP.h"
  
  typedef struct W_TabView {
-Index: WindowMaker-0.95.6/WINGs/wtext.c
+Index: WindowMaker-0.95.7/WINGs/wtext.c
 ===================================================================
---- WindowMaker-0.95.6.orig/WINGs/wtext.c
-+++ WindowMaker-0.95.6/WINGs/wtext.c
+--- WindowMaker-0.95.7.orig/WINGs/wtext.c
++++ WindowMaker-0.95.7/WINGs/wtext.c
 @@ -1,6 +1,10 @@
  
  /*  WINGs WMText: multi-line/font/color/graphic text widget,  by Nwanua. */
@@ -1013,10 +1013,10 @@ Index: WindowMaker-0.95.6/WINGs/wtext.c
  #include "WINGsP.h"
  #include <ctype.h>
  #include <X11/keysym.h>
-Index: WindowMaker-0.95.6/WINGs/wtextfield.c
+Index: WindowMaker-0.95.7/WINGs/wtextfield.c
 ===================================================================
---- WindowMaker-0.95.6.orig/WINGs/wtextfield.c
-+++ WindowMaker-0.95.6/WINGs/wtextfield.c
+--- WindowMaker-0.95.7.orig/WINGs/wtextfield.c
++++ WindowMaker-0.95.7/WINGs/wtextfield.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -1026,10 +1026,10 @@ Index: WindowMaker-0.95.6/WINGs/wtextfield.c
  #include "WINGsP.h"
  #include "wconfig.h"
  
-Index: WindowMaker-0.95.6/WINGs/wutil.c
+Index: WindowMaker-0.95.7/WINGs/wutil.c
 ===================================================================
---- WindowMaker-0.95.6.orig/WINGs/wutil.c
-+++ WindowMaker-0.95.6/WINGs/wutil.c
+--- WindowMaker-0.95.7.orig/WINGs/wutil.c
++++ WindowMaker-0.95.7/WINGs/wutil.c
 @@ -3,6 +3,10 @@
   * Handle events for non-GUI based applications
   */
@@ -1041,10 +1041,10 @@ Index: WindowMaker-0.95.6/WINGs/wutil.c
  #include "WINGsP.h"
  
  void WHandleEvents()
-Index: WindowMaker-0.95.6/WINGs/wview.c
+Index: WindowMaker-0.95.7/WINGs/wview.c
 ===================================================================
---- WindowMaker-0.95.6.orig/WINGs/wview.c
-+++ WindowMaker-0.95.6/WINGs/wview.c
+--- WindowMaker-0.95.7.orig/WINGs/wview.c
++++ WindowMaker-0.95.7/WINGs/wview.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -1054,10 +1054,10 @@ Index: WindowMaker-0.95.6/WINGs/wview.c
  #include "WINGsP.h"
  
  #include <X11/Xresource.h>
-Index: WindowMaker-0.95.6/WINGs/wwindow.c
+Index: WindowMaker-0.95.7/WINGs/wwindow.c
 ===================================================================
---- WindowMaker-0.95.6.orig/WINGs/wwindow.c
-+++ WindowMaker-0.95.6/WINGs/wwindow.c
+--- WindowMaker-0.95.7.orig/WINGs/wwindow.c
++++ WindowMaker-0.95.7/WINGs/wwindow.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -1066,11 +1066,11 @@ Index: WindowMaker-0.95.6/WINGs/wwindow.c
 +
  #include <X11/Xmd.h>
  
- #include "WINGsP.h"
-Index: WindowMaker-0.95.6/WPrefs.app/Appearance.c
+ #include "wconfig.h"
+Index: WindowMaker-0.95.7/WPrefs.app/Appearance.c
 ===================================================================
---- WindowMaker-0.95.6.orig/WPrefs.app/Appearance.c
-+++ WindowMaker-0.95.6/WPrefs.app/Appearance.c
+--- WindowMaker-0.95.7.orig/WPrefs.app/Appearance.c
++++ WindowMaker-0.95.7/WPrefs.app/Appearance.c
 @@ -19,6 +19,10 @@
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -1082,10 +1082,10 @@ Index: WindowMaker-0.95.6/WPrefs.app/Appearance.c
  #include "WPrefs.h"
  
  #include <unistd.h>
-Index: WindowMaker-0.95.6/WPrefs.app/Configurations.c
+Index: WindowMaker-0.95.7/WPrefs.app/Configurations.c
 ===================================================================
---- WindowMaker-0.95.6.orig/WPrefs.app/Configurations.c
-+++ WindowMaker-0.95.6/WPrefs.app/Configurations.c
+--- WindowMaker-0.95.7.orig/WPrefs.app/Configurations.c
++++ WindowMaker-0.95.7/WPrefs.app/Configurations.c
 @@ -19,6 +19,10 @@
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -1097,10 +1097,10 @@ Index: WindowMaker-0.95.6/WPrefs.app/Configurations.c
  #include "WPrefs.h"
  
  typedef struct _Panel {
-Index: WindowMaker-0.95.6/WPrefs.app/Expert.c
+Index: WindowMaker-0.95.7/WPrefs.app/Expert.c
 ===================================================================
---- WindowMaker-0.95.6.orig/WPrefs.app/Expert.c
-+++ WindowMaker-0.95.6/WPrefs.app/Expert.c
+--- WindowMaker-0.95.7.orig/WPrefs.app/Expert.c
++++ WindowMaker-0.95.7/WPrefs.app/Expert.c
 @@ -20,6 +20,10 @@
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -1112,10 +1112,10 @@ Index: WindowMaker-0.95.6/WPrefs.app/Expert.c
  #include "WPrefs.h"
  
  /* This structure containts the list of all the check-buttons to display in the
-Index: WindowMaker-0.95.6/WPrefs.app/Focus.c
+Index: WindowMaker-0.95.7/WPrefs.app/Focus.c
 ===================================================================
---- WindowMaker-0.95.6.orig/WPrefs.app/Focus.c
-+++ WindowMaker-0.95.6/WPrefs.app/Focus.c
+--- WindowMaker-0.95.7.orig/WPrefs.app/Focus.c
++++ WindowMaker-0.95.7/WPrefs.app/Focus.c
 @@ -19,6 +19,10 @@
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -1127,10 +1127,10 @@ Index: WindowMaker-0.95.6/WPrefs.app/Focus.c
  #include "WPrefs.h"
  
  typedef struct _Panel {
-Index: WindowMaker-0.95.6/WPrefs.app/FontSimple.c
+Index: WindowMaker-0.95.7/WPrefs.app/FontSimple.c
 ===================================================================
---- WindowMaker-0.95.6.orig/WPrefs.app/FontSimple.c
-+++ WindowMaker-0.95.6/WPrefs.app/FontSimple.c
+--- WindowMaker-0.95.7.orig/WPrefs.app/FontSimple.c
++++ WindowMaker-0.95.7/WPrefs.app/FontSimple.c
 @@ -19,6 +19,10 @@
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -1142,10 +1142,25 @@ Index: WindowMaker-0.95.6/WPrefs.app/FontSimple.c
  #include "WPrefs.h"
  #include <unistd.h>
  #include <fontconfig/fontconfig.h>
-Index: WindowMaker-0.95.6/WPrefs.app/Icons.c
+Index: WindowMaker-0.95.7/WPrefs.app/Icons.c
 ===================================================================
---- WindowMaker-0.95.6.orig/WPrefs.app/Icons.c
-+++ WindowMaker-0.95.6/WPrefs.app/Icons.c
+--- WindowMaker-0.95.7.orig/WPrefs.app/Icons.c
++++ WindowMaker-0.95.7/WPrefs.app/Icons.c
+@@ -19,6 +19,10 @@
+  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  */
+ 
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
+ #include "WPrefs.h"
+ 
+ 
+Index: WindowMaker-0.95.7/WPrefs.app/KeyboardSettings.c
+===================================================================
+--- WindowMaker-0.95.7.orig/WPrefs.app/KeyboardSettings.c
++++ WindowMaker-0.95.7/WPrefs.app/KeyboardSettings.c
 @@ -19,6 +19,10 @@
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -1157,25 +1172,10 @@ Index: WindowMaker-0.95.6/WPrefs.app/Icons.c
  #include "WPrefs.h"
  
  typedef struct _Panel {
-Index: WindowMaker-0.95.6/WPrefs.app/KeyboardSettings.c
+Index: WindowMaker-0.95.7/WPrefs.app/Menu.c
 ===================================================================
---- WindowMaker-0.95.6.orig/WPrefs.app/KeyboardSettings.c
-+++ WindowMaker-0.95.6/WPrefs.app/KeyboardSettings.c
-@@ -19,6 +19,10 @@
-  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-  */
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include "WPrefs.h"
- 
- typedef struct _Panel {
-Index: WindowMaker-0.95.6/WPrefs.app/Menu.c
-===================================================================
---- WindowMaker-0.95.6.orig/WPrefs.app/Menu.c
-+++ WindowMaker-0.95.6/WPrefs.app/Menu.c
+--- WindowMaker-0.95.7.orig/WPrefs.app/Menu.c
++++ WindowMaker-0.95.7/WPrefs.app/Menu.c
 @@ -19,6 +19,10 @@
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -1187,10 +1187,10 @@ Index: WindowMaker-0.95.6/WPrefs.app/Menu.c
  #include "WPrefs.h"
  #include <assert.h>
  #include <ctype.h>
-Index: WindowMaker-0.95.6/WPrefs.app/MenuPreferences.c
+Index: WindowMaker-0.95.7/WPrefs.app/MenuPreferences.c
 ===================================================================
---- WindowMaker-0.95.6.orig/WPrefs.app/MenuPreferences.c
-+++ WindowMaker-0.95.6/WPrefs.app/MenuPreferences.c
+--- WindowMaker-0.95.7.orig/WPrefs.app/MenuPreferences.c
++++ WindowMaker-0.95.7/WPrefs.app/MenuPreferences.c
 @@ -19,6 +19,10 @@
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -1202,10 +1202,10 @@ Index: WindowMaker-0.95.6/WPrefs.app/MenuPreferences.c
  #include "WPrefs.h"
  
  typedef struct _Panel {
-Index: WindowMaker-0.95.6/WPrefs.app/MouseSettings.c
+Index: WindowMaker-0.95.7/WPrefs.app/MouseSettings.c
 ===================================================================
---- WindowMaker-0.95.6.orig/WPrefs.app/MouseSettings.c
-+++ WindowMaker-0.95.6/WPrefs.app/MouseSettings.c
+--- WindowMaker-0.95.7.orig/WPrefs.app/MouseSettings.c
++++ WindowMaker-0.95.7/WPrefs.app/MouseSettings.c
 @@ -20,6 +20,10 @@
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -1217,10 +1217,10 @@ Index: WindowMaker-0.95.6/WPrefs.app/MouseSettings.c
  #include "WPrefs.h"
  
  #include <X11/Xutil.h>
-Index: WindowMaker-0.95.6/WPrefs.app/Paths.c
+Index: WindowMaker-0.95.7/WPrefs.app/Paths.c
 ===================================================================
---- WindowMaker-0.95.6.orig/WPrefs.app/Paths.c
-+++ WindowMaker-0.95.6/WPrefs.app/Paths.c
+--- WindowMaker-0.95.7.orig/WPrefs.app/Paths.c
++++ WindowMaker-0.95.7/WPrefs.app/Paths.c
 @@ -19,6 +19,10 @@
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -1232,10 +1232,10 @@ Index: WindowMaker-0.95.6/WPrefs.app/Paths.c
  #include "WPrefs.h"
  #include <unistd.h>
  #include <assert.h>
-Index: WindowMaker-0.95.6/WPrefs.app/Preferences.c
+Index: WindowMaker-0.95.7/WPrefs.app/Preferences.c
 ===================================================================
---- WindowMaker-0.95.6.orig/WPrefs.app/Preferences.c
-+++ WindowMaker-0.95.6/WPrefs.app/Preferences.c
+--- WindowMaker-0.95.7.orig/WPrefs.app/Preferences.c
++++ WindowMaker-0.95.7/WPrefs.app/Preferences.c
 @@ -19,6 +19,10 @@
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -1246,11 +1246,11 @@ Index: WindowMaker-0.95.6/WPrefs.app/Preferences.c
 +
  #include "WPrefs.h"
  
- typedef struct _Panel {
-Index: WindowMaker-0.95.6/WPrefs.app/TexturePanel.c
+ 
+Index: WindowMaker-0.95.7/WPrefs.app/TexturePanel.c
 ===================================================================
---- WindowMaker-0.95.6.orig/WPrefs.app/TexturePanel.c
-+++ WindowMaker-0.95.6/WPrefs.app/TexturePanel.c
+--- WindowMaker-0.95.7.orig/WPrefs.app/TexturePanel.c
++++ WindowMaker-0.95.7/WPrefs.app/TexturePanel.c
 @@ -20,6 +20,10 @@
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -1262,10 +1262,10 @@ Index: WindowMaker-0.95.6/WPrefs.app/TexturePanel.c
  #include <stdio.h>
  #include <stdlib.h>
  #include <string.h>
-Index: WindowMaker-0.95.6/WPrefs.app/Themes.c
+Index: WindowMaker-0.95.7/WPrefs.app/Themes.c
 ===================================================================
---- WindowMaker-0.95.6.orig/WPrefs.app/Themes.c
-+++ WindowMaker-0.95.6/WPrefs.app/Themes.c
+--- WindowMaker-0.95.7.orig/WPrefs.app/Themes.c
++++ WindowMaker-0.95.7/WPrefs.app/Themes.c
 @@ -19,6 +19,10 @@
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -1277,10 +1277,10 @@ Index: WindowMaker-0.95.6/WPrefs.app/Themes.c
  #include "WPrefs.h"
  
  #include <unistd.h>
-Index: WindowMaker-0.95.6/WPrefs.app/WPrefs.c
+Index: WindowMaker-0.95.7/WPrefs.app/WPrefs.c
 ===================================================================
---- WindowMaker-0.95.6.orig/WPrefs.app/WPrefs.c
-+++ WindowMaker-0.95.6/WPrefs.app/WPrefs.c
+--- WindowMaker-0.95.7.orig/WPrefs.app/WPrefs.c
++++ WindowMaker-0.95.7/WPrefs.app/WPrefs.c
 @@ -21,6 +21,10 @@
  
  #include "config.h"
@@ -1292,10 +1292,10 @@ Index: WindowMaker-0.95.6/WPrefs.app/WPrefs.c
  #include "WPrefs.h"
  #include <assert.h>
  
-Index: WindowMaker-0.95.6/WPrefs.app/WindowHandling.c
+Index: WindowMaker-0.95.7/WPrefs.app/WindowHandling.c
 ===================================================================
---- WindowMaker-0.95.6.orig/WPrefs.app/WindowHandling.c
-+++ WindowMaker-0.95.6/WPrefs.app/WindowHandling.c
+--- WindowMaker-0.95.7.orig/WPrefs.app/WindowHandling.c
++++ WindowMaker-0.95.7/WPrefs.app/WindowHandling.c
 @@ -19,6 +19,10 @@
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -1307,10 +1307,10 @@ Index: WindowMaker-0.95.6/WPrefs.app/WindowHandling.c
  #include "WPrefs.h"
  
  typedef struct _Panel {
-Index: WindowMaker-0.95.6/WPrefs.app/Workspace.c
+Index: WindowMaker-0.95.7/WPrefs.app/Workspace.c
 ===================================================================
---- WindowMaker-0.95.6.orig/WPrefs.app/Workspace.c
-+++ WindowMaker-0.95.6/WPrefs.app/Workspace.c
+--- WindowMaker-0.95.7.orig/WPrefs.app/Workspace.c
++++ WindowMaker-0.95.7/WPrefs.app/Workspace.c
 @@ -19,6 +19,10 @@
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -1322,10 +1322,10 @@ Index: WindowMaker-0.95.6/WPrefs.app/Workspace.c
  #include "WPrefs.h"
  
  typedef struct _Panel {
-Index: WindowMaker-0.95.6/WPrefs.app/double.c
+Index: WindowMaker-0.95.7/WPrefs.app/double.c
 ===================================================================
---- WindowMaker-0.95.6.orig/WPrefs.app/double.c
-+++ WindowMaker-0.95.6/WPrefs.app/double.c
+--- WindowMaker-0.95.7.orig/WPrefs.app/double.c
++++ WindowMaker-0.95.7/WPrefs.app/double.c
 @@ -4,6 +4,10 @@
   *
   */
@@ -1337,10 +1337,10 @@ Index: WindowMaker-0.95.6/WPrefs.app/double.c
  #include <WINGs/WINGsP.h>
  #include "WPrefs.h"
  
-Index: WindowMaker-0.95.6/WPrefs.app/editmenu.c
+Index: WindowMaker-0.95.7/WPrefs.app/editmenu.c
 ===================================================================
---- WindowMaker-0.95.6.orig/WPrefs.app/editmenu.c
-+++ WindowMaker-0.95.6/WPrefs.app/editmenu.c
+--- WindowMaker-0.95.7.orig/WPrefs.app/editmenu.c
++++ WindowMaker-0.95.7/WPrefs.app/editmenu.c
 @@ -19,6 +19,10 @@
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -1352,10 +1352,10 @@ Index: WindowMaker-0.95.6/WPrefs.app/editmenu.c
  #include <WINGs/WINGsP.h>
  #include <WINGs/WUtil.h>
  #include <stdlib.h>
-Index: WindowMaker-0.95.6/WPrefs.app/main.c
+Index: WindowMaker-0.95.7/WPrefs.app/main.c
 ===================================================================
---- WindowMaker-0.95.6.orig/WPrefs.app/main.c
-+++ WindowMaker-0.95.6/WPrefs.app/main.c
+--- WindowMaker-0.95.7.orig/WPrefs.app/main.c
++++ WindowMaker-0.95.7/WPrefs.app/main.c
 @@ -20,6 +20,10 @@
  
  #include "config.h"
@@ -1367,10 +1367,10 @@ Index: WindowMaker-0.95.6/WPrefs.app/main.c
  #include "WPrefs.h"
  
  #include <assert.h>
-Index: WindowMaker-0.95.6/WPrefs.app/xmodifier.c
+Index: WindowMaker-0.95.7/WPrefs.app/xmodifier.c
 ===================================================================
---- WindowMaker-0.95.6.orig/WPrefs.app/xmodifier.c
-+++ WindowMaker-0.95.6/WPrefs.app/xmodifier.c
+--- WindowMaker-0.95.7.orig/WPrefs.app/xmodifier.c
++++ WindowMaker-0.95.7/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. */
@@ -1382,13 +1382,13 @@ Index: WindowMaker-0.95.6/WPrefs.app/xmodifier.c
  #include <string.h>
  #include <strings.h>
  #include <X11/Xlib.h>
-Index: WindowMaker-0.95.6/configure.ac
+Index: WindowMaker-0.95.7/configure.ac
 ===================================================================
---- WindowMaker-0.95.6.orig/configure.ac
-+++ WindowMaker-0.95.6/configure.ac
-@@ -67,7 +67,9 @@ dnl AC_CANONICAL_HOST -- already done by
+--- WindowMaker-0.95.7.orig/configure.ac
++++ WindowMaker-0.95.7/configure.ac
+@@ -94,7 +94,9 @@ AC_SUBST(WUTIL_VERSION)
  
- dnl Checks for programs.
+ dnl Checks for programs
  dnl ===================
 -AC_PROG_CC
 +AC_PROG_CC_STDC
@@ -1397,10 +1397,10 @@ Index: WindowMaker-0.95.6/configure.ac
  WM_PROG_CC_C11
  AC_PROG_LN_S
  AC_PROG_GCC_TRADITIONAL
-Index: WindowMaker-0.95.6/src/actions.c
+Index: WindowMaker-0.95.7/src/actions.c
 ===================================================================
---- WindowMaker-0.95.6.orig/src/actions.c
-+++ WindowMaker-0.95.6/src/actions.c
+--- WindowMaker-0.95.7.orig/src/actions.c
++++ WindowMaker-0.95.7/src/actions.c
 @@ -21,6 +21,10 @@
   *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -1412,10 +1412,10 @@ Index: WindowMaker-0.95.6/src/actions.c
  #include "wconfig.h"
  
  #include <X11/Xlib.h>
-Index: WindowMaker-0.95.6/src/appicon.c
+Index: WindowMaker-0.95.7/src/appicon.c
 ===================================================================
---- WindowMaker-0.95.6.orig/src/appicon.c
-+++ WindowMaker-0.95.6/src/appicon.c
+--- WindowMaker-0.95.7.orig/src/appicon.c
++++ WindowMaker-0.95.7/src/appicon.c
 @@ -20,6 +20,10 @@
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -1427,10 +1427,10 @@ Index: WindowMaker-0.95.6/src/appicon.c
  #include "wconfig.h"
  
  #include <X11/Xlib.h>
-Index: WindowMaker-0.95.6/src/application.c
+Index: WindowMaker-0.95.7/src/application.c
 ===================================================================
---- WindowMaker-0.95.6.orig/src/application.c
-+++ WindowMaker-0.95.6/src/application.c
+--- WindowMaker-0.95.7.orig/src/application.c
++++ WindowMaker-0.95.7/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.
@@ -1442,10 +1442,10 @@ Index: WindowMaker-0.95.6/src/application.c
  #include "wconfig.h"
  
  #include <X11/Xlib.h>
-Index: WindowMaker-0.95.6/src/appmenu.c
+Index: WindowMaker-0.95.7/src/appmenu.c
 ===================================================================
---- WindowMaker-0.95.6.orig/src/appmenu.c
-+++ WindowMaker-0.95.6/src/appmenu.c
+--- WindowMaker-0.95.7.orig/src/appmenu.c
++++ WindowMaker-0.95.7/src/appmenu.c
 @@ -19,6 +19,10 @@
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -1457,10 +1457,10 @@ Index: WindowMaker-0.95.6/src/appmenu.c
  #include "wconfig.h"
  
  #include <X11/Xlib.h>
-Index: WindowMaker-0.95.6/src/balloon.c
+Index: WindowMaker-0.95.7/src/balloon.c
 ===================================================================
---- WindowMaker-0.95.6.orig/src/balloon.c
-+++ WindowMaker-0.95.6/src/balloon.c
+--- WindowMaker-0.95.7.orig/src/balloon.c
++++ WindowMaker-0.95.7/src/balloon.c
 @@ -19,6 +19,10 @@
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -1472,10 +1472,10 @@ Index: WindowMaker-0.95.6/src/balloon.c
  #include "wconfig.h"
  
  #ifdef BALLOON_TEXT
-Index: WindowMaker-0.95.6/src/client.c
+Index: WindowMaker-0.95.7/src/client.c
 ===================================================================
---- WindowMaker-0.95.6.orig/src/client.c
-+++ WindowMaker-0.95.6/src/client.c
+--- WindowMaker-0.95.7.orig/src/client.c
++++ WindowMaker-0.95.7/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.
@@ -1487,10 +1487,10 @@ Index: WindowMaker-0.95.6/src/client.c
  #include "wconfig.h"
  
  #include <X11/Xlib.h>
-Index: WindowMaker-0.95.6/src/colormap.c
+Index: WindowMaker-0.95.7/src/colormap.c
 ===================================================================
---- WindowMaker-0.95.6.orig/src/colormap.c
-+++ WindowMaker-0.95.6/src/colormap.c
+--- WindowMaker-0.95.7.orig/src/colormap.c
++++ WindowMaker-0.95.7/src/colormap.c
 @@ -23,6 +23,10 @@
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -1502,10 +1502,10 @@ Index: WindowMaker-0.95.6/src/colormap.c
  #include "wconfig.h"
  
  #include "WindowMaker.h"
-Index: WindowMaker-0.95.6/src/cycling.c
+Index: WindowMaker-0.95.7/src/cycling.c
 ===================================================================
---- WindowMaker-0.95.6.orig/src/cycling.c
-+++ WindowMaker-0.95.6/src/cycling.c
+--- WindowMaker-0.95.7.orig/src/cycling.c
++++ WindowMaker-0.95.7/src/cycling.c
 @@ -19,6 +19,10 @@
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -1517,11 +1517,11 @@ Index: WindowMaker-0.95.6/src/cycling.c
  #include "wconfig.h"
  
  #include <stdlib.h>
-Index: WindowMaker-0.95.6/src/defaults.c
+Index: WindowMaker-0.95.7/src/defaults.c
 ===================================================================
---- WindowMaker-0.95.6.orig/src/defaults.c
-+++ WindowMaker-0.95.6/src/defaults.c
-@@ -20,6 +20,10 @@
+--- WindowMaker-0.95.7.orig/src/defaults.c
++++ WindowMaker-0.95.7/src/defaults.c
+@@ -22,6 +22,10 @@
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
  
@@ -1532,10 +1532,10 @@ Index: WindowMaker-0.95.6/src/defaults.c
  #include "wconfig.h"
  
  #include <stdio.h>
-Index: WindowMaker-0.95.6/src/dialog.c
+Index: WindowMaker-0.95.7/src/dialog.c
 ===================================================================
---- WindowMaker-0.95.6.orig/src/dialog.c
-+++ WindowMaker-0.95.6/src/dialog.c
+--- WindowMaker-0.95.7.orig/src/dialog.c
++++ WindowMaker-0.95.7/src/dialog.c
 @@ -21,6 +21,10 @@
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -1547,10 +1547,10 @@ Index: WindowMaker-0.95.6/src/dialog.c
  #include "wconfig.h"
  
  #include <X11/Xlib.h>
-Index: WindowMaker-0.95.6/src/dock.c
+Index: WindowMaker-0.95.7/src/dock.c
 ===================================================================
---- WindowMaker-0.95.6.orig/src/dock.c
-+++ WindowMaker-0.95.6/src/dock.c
+--- WindowMaker-0.95.7.orig/src/dock.c
++++ WindowMaker-0.95.7/src/dock.c
 @@ -20,6 +20,10 @@
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -1562,10 +1562,10 @@ Index: WindowMaker-0.95.6/src/dock.c
  #include "wconfig.h"
  
  #include <X11/Xlib.h>
-Index: WindowMaker-0.95.6/src/dockedapp.c
+Index: WindowMaker-0.95.7/src/dockedapp.c
 ===================================================================
---- WindowMaker-0.95.6.orig/src/dockedapp.c
-+++ WindowMaker-0.95.6/src/dockedapp.c
+--- WindowMaker-0.95.7.orig/src/dockedapp.c
++++ WindowMaker-0.95.7/src/dockedapp.c
 @@ -19,6 +19,10 @@
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -1577,10 +1577,10 @@ Index: WindowMaker-0.95.6/src/dockedapp.c
  #include "wconfig.h"
  
  #include <X11/Xlib.h>
-Index: WindowMaker-0.95.6/src/event.c
+Index: WindowMaker-0.95.7/src/event.c
 ===================================================================
---- WindowMaker-0.95.6.orig/src/event.c
-+++ WindowMaker-0.95.6/src/event.c
+--- WindowMaker-0.95.7.orig/src/event.c
++++ WindowMaker-0.95.7/src/event.c
 @@ -20,6 +20,10 @@
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -1592,10 +1592,10 @@ Index: WindowMaker-0.95.6/src/event.c
  #include "wconfig.h"
  
  #ifdef HAVE_INOTIFY
-Index: WindowMaker-0.95.6/src/framewin.c
+Index: WindowMaker-0.95.7/src/framewin.c
 ===================================================================
---- WindowMaker-0.95.6.orig/src/framewin.c
-+++ WindowMaker-0.95.6/src/framewin.c
+--- WindowMaker-0.95.7.orig/src/framewin.c
++++ WindowMaker-0.95.7/src/framewin.c
 @@ -18,6 +18,10 @@
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -1607,10 +1607,10 @@ Index: WindowMaker-0.95.6/src/framewin.c
  #include "wconfig.h"
  
  #include <X11/Xlib.h>
-Index: WindowMaker-0.95.6/src/geomview.c
+Index: WindowMaker-0.95.7/src/geomview.c
 ===================================================================
---- WindowMaker-0.95.6.orig/src/geomview.c
-+++ WindowMaker-0.95.6/src/geomview.c
+--- WindowMaker-0.95.7.orig/src/geomview.c
++++ WindowMaker-0.95.7/src/geomview.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -1620,10 +1620,10 @@ Index: WindowMaker-0.95.6/src/geomview.c
  #include <WINGs/WINGsP.h>
  
  #include "geomview.h"
-Index: WindowMaker-0.95.6/src/icon.c
+Index: WindowMaker-0.95.7/src/icon.c
 ===================================================================
---- WindowMaker-0.95.6.orig/src/icon.c
-+++ WindowMaker-0.95.6/src/icon.c
+--- WindowMaker-0.95.7.orig/src/icon.c
++++ WindowMaker-0.95.7/src/icon.c
 @@ -19,6 +19,10 @@
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -1635,10 +1635,10 @@ Index: WindowMaker-0.95.6/src/icon.c
  #include "wconfig.h"
  
  #include <X11/Xlib.h>
-Index: WindowMaker-0.95.6/src/main.c
+Index: WindowMaker-0.95.7/src/main.c
 ===================================================================
---- WindowMaker-0.95.6.orig/src/main.c
-+++ WindowMaker-0.95.6/src/main.c
+--- WindowMaker-0.95.7.orig/src/main.c
++++ WindowMaker-0.95.7/src/main.c
 @@ -18,6 +18,10 @@
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -1650,10 +1650,10 @@ Index: WindowMaker-0.95.6/src/main.c
  #include "wconfig.h"
  
  #ifdef HAVE_INOTIFY
-Index: WindowMaker-0.95.6/src/menu.c
+Index: WindowMaker-0.95.7/src/menu.c
 ===================================================================
---- WindowMaker-0.95.6.orig/src/menu.c
-+++ WindowMaker-0.95.6/src/menu.c
+--- WindowMaker-0.95.7.orig/src/menu.c
++++ WindowMaker-0.95.7/src/menu.c
 @@ -20,6 +20,10 @@
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -1665,10 +1665,10 @@ Index: WindowMaker-0.95.6/src/menu.c
  #include "wconfig.h"
  
  #include <X11/Xlib.h>
-Index: WindowMaker-0.95.6/src/misc.c
+Index: WindowMaker-0.95.7/src/misc.c
 ===================================================================
---- WindowMaker-0.95.6.orig/src/misc.c
-+++ WindowMaker-0.95.6/src/misc.c
+--- WindowMaker-0.95.7.orig/src/misc.c
++++ WindowMaker-0.95.7/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.
@@ -1680,10 +1680,10 @@ Index: WindowMaker-0.95.6/src/misc.c
  #include "wconfig.h"
  
  #include <X11/Xlib.h>
-Index: WindowMaker-0.95.6/src/monitor.c
+Index: WindowMaker-0.95.7/src/monitor.c
 ===================================================================
---- WindowMaker-0.95.6.orig/src/monitor.c
-+++ WindowMaker-0.95.6/src/monitor.c
+--- WindowMaker-0.95.7.orig/src/monitor.c
++++ WindowMaker-0.95.7/src/monitor.c
 @@ -19,6 +19,10 @@
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -1695,10 +1695,10 @@ Index: WindowMaker-0.95.6/src/monitor.c
  #include "wconfig.h"
  #include <unistd.h>
  #include <stdlib.h>
-Index: WindowMaker-0.95.6/src/motif.c
+Index: WindowMaker-0.95.7/src/motif.c
 ===================================================================
---- WindowMaker-0.95.6.orig/src/motif.c
-+++ WindowMaker-0.95.6/src/motif.c
+--- WindowMaker-0.95.7.orig/src/motif.c
++++ WindowMaker-0.95.7/src/motif.c
 @@ -19,6 +19,10 @@
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -1709,11 +1709,11 @@ Index: WindowMaker-0.95.6/src/motif.c
 +
  #include "wconfig.h"
  
- #ifdef MWM_HINTS
-Index: WindowMaker-0.95.6/src/moveres.c
+ #include <X11/Xlib.h>
+Index: WindowMaker-0.95.7/src/moveres.c
 ===================================================================
---- WindowMaker-0.95.6.orig/src/moveres.c
-+++ WindowMaker-0.95.6/src/moveres.c
+--- WindowMaker-0.95.7.orig/src/moveres.c
++++ WindowMaker-0.95.7/src/moveres.c
 @@ -18,6 +18,10 @@
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -1725,10 +1725,10 @@ Index: WindowMaker-0.95.6/src/moveres.c
  #include "wconfig.h"
  
  #include <X11/Xlib.h>
-Index: WindowMaker-0.95.6/src/osdep_bsd.c
+Index: WindowMaker-0.95.7/src/osdep_bsd.c
 ===================================================================
---- WindowMaker-0.95.6.orig/src/osdep_bsd.c
-+++ WindowMaker-0.95.6/src/osdep_bsd.c
+--- WindowMaker-0.95.7.orig/src/osdep_bsd.c
++++ WindowMaker-0.95.7/src/osdep_bsd.c
 @@ -11,6 +11,10 @@
  #else /* OPENBSD || NETBSD */
  #   include <sys/param.h>
@@ -1740,10 +1740,10 @@ Index: WindowMaker-0.95.6/src/osdep_bsd.c
  #include <sys/sysctl.h>
  
  #include <assert.h>
-Index: WindowMaker-0.95.6/src/osdep_darwin.c
+Index: WindowMaker-0.95.7/src/osdep_darwin.c
 ===================================================================
---- WindowMaker-0.95.6.orig/src/osdep_darwin.c
-+++ WindowMaker-0.95.6/src/osdep_darwin.c
+--- WindowMaker-0.95.7.orig/src/osdep_darwin.c
++++ WindowMaker-0.95.7/src/osdep_darwin.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -1753,10 +1753,10 @@ Index: WindowMaker-0.95.6/src/osdep_darwin.c
  #include <sys/types.h>
  #include <sys/sysctl.h>
  
-Index: WindowMaker-0.95.6/src/osdep_linux.c
+Index: WindowMaker-0.95.7/src/osdep_linux.c
 ===================================================================
---- WindowMaker-0.95.6.orig/src/osdep_linux.c
-+++ WindowMaker-0.95.6/src/osdep_linux.c
+--- WindowMaker-0.95.7.orig/src/osdep_linux.c
++++ WindowMaker-0.95.7/src/osdep_linux.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -1766,10 +1766,10 @@ Index: WindowMaker-0.95.6/src/osdep_linux.c
  #include <sys/types.h>
  #include <sys/stat.h>
  
-Index: WindowMaker-0.95.6/src/osdep_stub.c
+Index: WindowMaker-0.95.7/src/osdep_stub.c
 ===================================================================
---- WindowMaker-0.95.6.orig/src/osdep_stub.c
-+++ WindowMaker-0.95.6/src/osdep_stub.c
+--- WindowMaker-0.95.7.orig/src/osdep_stub.c
++++ WindowMaker-0.95.7/src/osdep_stub.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -1779,10 +1779,10 @@ Index: WindowMaker-0.95.6/src/osdep_stub.c
  #include <sys/utsname.h>
  
  #include <WINGs/WUtil.h>
-Index: WindowMaker-0.95.6/src/pixmap.c
+Index: WindowMaker-0.95.7/src/pixmap.c
 ===================================================================
---- WindowMaker-0.95.6.orig/src/pixmap.c
-+++ WindowMaker-0.95.6/src/pixmap.c
+--- WindowMaker-0.95.7.orig/src/pixmap.c
++++ WindowMaker-0.95.7/src/pixmap.c
 @@ -18,6 +18,10 @@
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -1794,10 +1794,10 @@ Index: WindowMaker-0.95.6/src/pixmap.c
  #include "wconfig.h"
  
  #include <X11/Xlib.h>
-Index: WindowMaker-0.95.6/src/placement.c
+Index: WindowMaker-0.95.7/src/placement.c
 ===================================================================
---- WindowMaker-0.95.6.orig/src/placement.c
-+++ WindowMaker-0.95.6/src/placement.c
+--- WindowMaker-0.95.7.orig/src/placement.c
++++ WindowMaker-0.95.7/src/placement.c
 @@ -19,6 +19,10 @@
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -1809,10 +1809,10 @@ Index: WindowMaker-0.95.6/src/placement.c
  #include "wconfig.h"
  
  #include <X11/Xlib.h>
-Index: WindowMaker-0.95.6/src/properties.c
+Index: WindowMaker-0.95.7/src/properties.c
 ===================================================================
---- WindowMaker-0.95.6.orig/src/properties.c
-+++ WindowMaker-0.95.6/src/properties.c
+--- WindowMaker-0.95.7.orig/src/properties.c
++++ WindowMaker-0.95.7/src/properties.c
 @@ -18,6 +18,10 @@
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -1824,10 +1824,10 @@ Index: WindowMaker-0.95.6/src/properties.c
  #include "wconfig.h"
  
  #include <X11/Xlib.h>
-Index: WindowMaker-0.95.6/src/resources.c
+Index: WindowMaker-0.95.7/src/resources.c
 ===================================================================
---- WindowMaker-0.95.6.orig/src/resources.c
-+++ WindowMaker-0.95.6/src/resources.c
+--- WindowMaker-0.95.7.orig/src/resources.c
++++ WindowMaker-0.95.7/src/resources.c
 @@ -19,6 +19,10 @@
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -1839,11 +1839,11 @@ Index: WindowMaker-0.95.6/src/resources.c
  #include "wconfig.h"
  
  #include <stdio.h>
-Index: WindowMaker-0.95.6/src/rootmenu.c
+Index: WindowMaker-0.95.7/src/rootmenu.c
 ===================================================================
---- WindowMaker-0.95.6.orig/src/rootmenu.c
-+++ WindowMaker-0.95.6/src/rootmenu.c
-@@ -20,6 +20,10 @@
+--- WindowMaker-0.95.7.orig/src/rootmenu.c
++++ WindowMaker-0.95.7/src/rootmenu.c
+@@ -21,6 +21,10 @@
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
  
@@ -1854,10 +1854,10 @@ Index: WindowMaker-0.95.6/src/rootmenu.c
  #include "wconfig.h"
  
  #include <stdio.h>
-Index: WindowMaker-0.95.6/src/screen.c
+Index: WindowMaker-0.95.7/src/screen.c
 ===================================================================
---- WindowMaker-0.95.6.orig/src/screen.c
-+++ WindowMaker-0.95.6/src/screen.c
+--- WindowMaker-0.95.7.orig/src/screen.c
++++ WindowMaker-0.95.7/src/screen.c
 @@ -19,6 +19,10 @@
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -1869,10 +1869,10 @@ Index: WindowMaker-0.95.6/src/screen.c
  #include "wconfig.h"
  
  #include <stdio.h>
-Index: WindowMaker-0.95.6/src/session.c
+Index: WindowMaker-0.95.7/src/session.c
 ===================================================================
---- WindowMaker-0.95.6.orig/src/session.c
-+++ WindowMaker-0.95.6/src/session.c
+--- WindowMaker-0.95.7.orig/src/session.c
++++ WindowMaker-0.95.7/src/session.c
 @@ -57,6 +57,10 @@
   * if the Die message is received, exit.
   */
@@ -1884,10 +1884,10 @@ Index: WindowMaker-0.95.6/src/session.c
  #include "wconfig.h"
  
  #include <X11/Xlib.h>
-Index: WindowMaker-0.95.6/src/shutdown.c
+Index: WindowMaker-0.95.7/src/shutdown.c
 ===================================================================
---- WindowMaker-0.95.6.orig/src/shutdown.c
-+++ WindowMaker-0.95.6/src/shutdown.c
+--- WindowMaker-0.95.7.orig/src/shutdown.c
++++ WindowMaker-0.95.7/src/shutdown.c
 @@ -18,6 +18,10 @@
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -1899,10 +1899,10 @@ Index: WindowMaker-0.95.6/src/shutdown.c
  #include "wconfig.h"
  
  #include <stdlib.h>
-Index: WindowMaker-0.95.6/src/stacking.c
+Index: WindowMaker-0.95.7/src/stacking.c
 ===================================================================
---- WindowMaker-0.95.6.orig/src/stacking.c
-+++ WindowMaker-0.95.6/src/stacking.c
+--- WindowMaker-0.95.7.orig/src/stacking.c
++++ WindowMaker-0.95.7/src/stacking.c
 @@ -19,6 +19,10 @@
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -1914,10 +1914,10 @@ Index: WindowMaker-0.95.6/src/stacking.c
  #include "wconfig.h"
  
  #include <stdio.h>
-Index: WindowMaker-0.95.6/src/startup.c
+Index: WindowMaker-0.95.7/src/startup.c
 ===================================================================
---- WindowMaker-0.95.6.orig/src/startup.c
-+++ WindowMaker-0.95.6/src/startup.c
+--- WindowMaker-0.95.7.orig/src/startup.c
++++ WindowMaker-0.95.7/src/startup.c
 @@ -19,6 +19,10 @@
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -1929,10 +1929,10 @@ Index: WindowMaker-0.95.6/src/startup.c
  #include "wconfig.h"
  
  #include <stdio.h>
-Index: WindowMaker-0.95.6/src/superfluous.c
+Index: WindowMaker-0.95.7/src/superfluous.c
 ===================================================================
---- WindowMaker-0.95.6.orig/src/superfluous.c
-+++ WindowMaker-0.95.6/src/superfluous.c
+--- WindowMaker-0.95.7.orig/src/superfluous.c
++++ WindowMaker-0.95.7/src/superfluous.c
 @@ -19,6 +19,10 @@
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -1944,10 +1944,10 @@ Index: WindowMaker-0.95.6/src/superfluous.c
  #include "wconfig.h"
  
  #include <X11/Xlib.h>
-Index: WindowMaker-0.95.6/src/switchmenu.c
+Index: WindowMaker-0.95.7/src/switchmenu.c
 ===================================================================
---- WindowMaker-0.95.6.orig/src/switchmenu.c
-+++ WindowMaker-0.95.6/src/switchmenu.c
+--- WindowMaker-0.95.7.orig/src/switchmenu.c
++++ WindowMaker-0.95.7/src/switchmenu.c
 @@ -19,6 +19,10 @@
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -1959,10 +1959,10 @@ Index: WindowMaker-0.95.6/src/switchmenu.c
  #include "wconfig.h"
  
  #include <stdio.h>
-Index: WindowMaker-0.95.6/src/switchpanel.c
+Index: WindowMaker-0.95.7/src/switchpanel.c
 ===================================================================
---- WindowMaker-0.95.6.orig/src/switchpanel.c
-+++ WindowMaker-0.95.6/src/switchpanel.c
+--- WindowMaker-0.95.7.orig/src/switchpanel.c
++++ WindowMaker-0.95.7/src/switchpanel.c
 @@ -18,6 +18,10 @@
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -1974,10 +1974,10 @@ Index: WindowMaker-0.95.6/src/switchpanel.c
  #include "wconfig.h"
  
  #include <stdint.h>
-Index: WindowMaker-0.95.6/src/texture.c
+Index: WindowMaker-0.95.7/src/texture.c
 ===================================================================
---- WindowMaker-0.95.6.orig/src/texture.c
-+++ WindowMaker-0.95.6/src/texture.c
+--- WindowMaker-0.95.7.orig/src/texture.c
++++ WindowMaker-0.95.7/src/texture.c
 @@ -18,6 +18,10 @@
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -1989,10 +1989,10 @@ Index: WindowMaker-0.95.6/src/texture.c
  #include "wconfig.h"
  
  #include <X11/Xlib.h>
-Index: WindowMaker-0.95.6/src/usermenu.c
+Index: WindowMaker-0.95.7/src/usermenu.c
 ===================================================================
---- WindowMaker-0.95.6.orig/src/usermenu.c
-+++ WindowMaker-0.95.6/src/usermenu.c
+--- WindowMaker-0.95.7.orig/src/usermenu.c
++++ WindowMaker-0.95.7/src/usermenu.c
 @@ -56,6 +56,10 @@
   *
   */
@@ -2004,10 +2004,10 @@ Index: WindowMaker-0.95.6/src/usermenu.c
  #include "wconfig.h"
  
  #ifdef USER_MENU
-Index: WindowMaker-0.95.6/src/wcore.c
+Index: WindowMaker-0.95.7/src/wcore.c
 ===================================================================
---- WindowMaker-0.95.6.orig/src/wcore.c
-+++ WindowMaker-0.95.6/src/wcore.c
+--- WindowMaker-0.95.7.orig/src/wcore.c
++++ WindowMaker-0.95.7/src/wcore.c
 @@ -18,6 +18,10 @@
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -2019,10 +2019,10 @@ Index: WindowMaker-0.95.6/src/wcore.c
  #include "wconfig.h"
  
  #include <X11/Xlib.h>
-Index: WindowMaker-0.95.6/src/wdefaults.c
+Index: WindowMaker-0.95.7/src/wdefaults.c
 ===================================================================
---- WindowMaker-0.95.6.orig/src/wdefaults.c
-+++ WindowMaker-0.95.6/src/wdefaults.c
+--- WindowMaker-0.95.7.orig/src/wdefaults.c
++++ WindowMaker-0.95.7/src/wdefaults.c
 @@ -19,6 +19,10 @@
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -2034,10 +2034,10 @@ Index: WindowMaker-0.95.6/src/wdefaults.c
  #include "wconfig.h"
  
  #include <stdio.h>
-Index: WindowMaker-0.95.6/src/window.c
+Index: WindowMaker-0.95.7/src/window.c
 ===================================================================
---- WindowMaker-0.95.6.orig/src/window.c
-+++ WindowMaker-0.95.6/src/window.c
+--- WindowMaker-0.95.7.orig/src/window.c
++++ WindowMaker-0.95.7/src/window.c
 @@ -19,6 +19,10 @@
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -2049,10 +2049,10 @@ Index: WindowMaker-0.95.6/src/window.c
  #include "wconfig.h"
  
  #include <X11/Xlib.h>
-Index: WindowMaker-0.95.6/src/winmenu.c
+Index: WindowMaker-0.95.7/src/winmenu.c
 ===================================================================
---- WindowMaker-0.95.6.orig/src/winmenu.c
-+++ WindowMaker-0.95.6/src/winmenu.c
+--- WindowMaker-0.95.7.orig/src/winmenu.c
++++ WindowMaker-0.95.7/src/winmenu.c
 @@ -19,6 +19,10 @@
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -2064,10 +2064,10 @@ Index: WindowMaker-0.95.6/src/winmenu.c
  #include "wconfig.h"
  
  #include <stdio.h>
-Index: WindowMaker-0.95.6/src/winspector.c
+Index: WindowMaker-0.95.7/src/winspector.c
 ===================================================================
---- WindowMaker-0.95.6.orig/src/winspector.c
-+++ WindowMaker-0.95.6/src/winspector.c
+--- WindowMaker-0.95.7.orig/src/winspector.c
++++ WindowMaker-0.95.7/src/winspector.c
 @@ -20,6 +20,10 @@
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -2079,10 +2079,10 @@ Index: WindowMaker-0.95.6/src/winspector.c
  #include "wconfig.h"
  
  #include <X11/Xlib.h>
-Index: WindowMaker-0.95.6/src/wmspec.c
+Index: WindowMaker-0.95.7/src/wmspec.c
 ===================================================================
---- WindowMaker-0.95.6.orig/src/wmspec.c
-+++ WindowMaker-0.95.6/src/wmspec.c
+--- WindowMaker-0.95.7.orig/src/wmspec.c
++++ WindowMaker-0.95.7/src/wmspec.c
 @@ -28,6 +28,10 @@
   * return to be Success is not enough. -Dan
   */
@@ -2094,10 +2094,10 @@ Index: WindowMaker-0.95.6/src/wmspec.c
  #include "wconfig.h"
  
  #include <X11/Xlib.h>
-Index: WindowMaker-0.95.6/src/workspace.c
+Index: WindowMaker-0.95.7/src/workspace.c
 ===================================================================
---- WindowMaker-0.95.6.orig/src/workspace.c
-+++ WindowMaker-0.95.6/src/workspace.c
+--- WindowMaker-0.95.7.orig/src/workspace.c
++++ WindowMaker-0.95.7/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.
@@ -2109,25 +2109,10 @@ Index: WindowMaker-0.95.6/src/workspace.c
  #include "wconfig.h"
  
  #include <X11/Xlib.h>
-Index: WindowMaker-0.95.6/src/xdnd.c
+Index: WindowMaker-0.95.7/src/xinerama.c
 ===================================================================
---- WindowMaker-0.95.6.orig/src/xdnd.c
-+++ WindowMaker-0.95.6/src/xdnd.c
-@@ -20,6 +20,10 @@
- 
- /* 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.6/src/xinerama.c
-===================================================================
---- WindowMaker-0.95.6.orig/src/xinerama.c
-+++ WindowMaker-0.95.6/src/xinerama.c
+--- WindowMaker-0.95.7.orig/src/xinerama.c
++++ WindowMaker-0.95.7/src/xinerama.c
 @@ -18,6 +18,10 @@
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -2139,10 +2124,10 @@ Index: WindowMaker-0.95.6/src/xinerama.c
  #include "wconfig.h"
  
  #include "xinerama.h"
-Index: WindowMaker-0.95.6/src/xmodifier.c
+Index: WindowMaker-0.95.7/src/xmodifier.c
 ===================================================================
---- WindowMaker-0.95.6.orig/src/xmodifier.c
-+++ WindowMaker-0.95.6/src/xmodifier.c
+--- WindowMaker-0.95.7.orig/src/xmodifier.c
++++ WindowMaker-0.95.7/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. */
@@ -2154,10 +2139,10 @@ Index: WindowMaker-0.95.6/src/xmodifier.c
  #include "wconfig.h"
  
  #include <string.h>
-Index: WindowMaker-0.95.6/src/xutil.c
+Index: WindowMaker-0.95.7/src/xutil.c
 ===================================================================
---- WindowMaker-0.95.6.orig/src/xutil.c
-+++ WindowMaker-0.95.6/src/xutil.c
+--- WindowMaker-0.95.7.orig/src/xutil.c
++++ WindowMaker-0.95.7/src/xutil.c
 @@ -19,6 +19,10 @@
   *  MA 02110-1301, USA.
   */
@@ -2169,10 +2154,10 @@ Index: WindowMaker-0.95.6/src/xutil.c
  #include <X11/Xlib.h>
  #include <stdlib.h>
  #include <X11/Xutil.h>
-Index: WindowMaker-0.95.6/test/notest.c
+Index: WindowMaker-0.95.7/test/notest.c
 ===================================================================
---- WindowMaker-0.95.6.orig/test/notest.c
-+++ WindowMaker-0.95.6/test/notest.c
+--- WindowMaker-0.95.7.orig/test/notest.c
++++ WindowMaker-0.95.7/test/notest.c
 @@ -3,6 +3,10 @@
   * TODO: remake
   */
@@ -2184,10 +2169,10 @@ Index: WindowMaker-0.95.6/test/notest.c
  #include <stdio.h>
  #include <X11/Xlib.h>
  #include <X11/Xutil.h>
-Index: WindowMaker-0.95.6/test/wtest.c
+Index: WindowMaker-0.95.7/test/wtest.c
 ===================================================================
---- WindowMaker-0.95.6.orig/test/wtest.c
-+++ WindowMaker-0.95.6/test/wtest.c
+--- WindowMaker-0.95.7.orig/test/wtest.c
++++ WindowMaker-0.95.7/test/wtest.c
 @@ -10,6 +10,10 @@
  
  #include "config.h"
@@ -2199,10 +2184,10 @@ Index: WindowMaker-0.95.6/test/wtest.c
  #include <stdio.h>
  #include <stdlib.h>
  #include <X11/Xlib.h>
-Index: WindowMaker-0.95.6/util/convertfonts.c
+Index: WindowMaker-0.95.7/util/convertfonts.c
 ===================================================================
---- WindowMaker-0.95.6.orig/util/convertfonts.c
-+++ WindowMaker-0.95.6/util/convertfonts.c
+--- WindowMaker-0.95.7.orig/util/convertfonts.c
++++ WindowMaker-0.95.7/util/convertfonts.c
 @@ -25,6 +25,10 @@
  
  #include "config.h"
@@ -2214,10 +2199,10 @@ Index: WindowMaker-0.95.6/util/convertfonts.c
  #include <sys/stat.h>
  
  #include <getopt.h>
-Index: WindowMaker-0.95.6/util/fontconv.c
+Index: WindowMaker-0.95.7/util/fontconv.c
 ===================================================================
---- WindowMaker-0.95.6.orig/util/fontconv.c
-+++ WindowMaker-0.95.6/util/fontconv.c
+--- WindowMaker-0.95.7.orig/util/fontconv.c
++++ WindowMaker-0.95.7/util/fontconv.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -2227,10 +2212,10 @@ Index: WindowMaker-0.95.6/util/fontconv.c
  #include <stdio.h>
  #include <stdlib.h>
  #include <string.h>
-Index: WindowMaker-0.95.6/util/geticonset.c
+Index: WindowMaker-0.95.7/util/geticonset.c
 ===================================================================
---- WindowMaker-0.95.6.orig/util/geticonset.c
-+++ WindowMaker-0.95.6/util/geticonset.c
+--- WindowMaker-0.95.7.orig/util/geticonset.c
++++ WindowMaker-0.95.7/util/geticonset.c
 @@ -25,6 +25,10 @@
  
  #include "config.h"
@@ -2242,10 +2227,10 @@ Index: WindowMaker-0.95.6/util/geticonset.c
  #include <getopt.h>
  #include <stdio.h>
  #include <stdlib.h>
-Index: WindowMaker-0.95.6/util/getstyle.c
+Index: WindowMaker-0.95.7/util/getstyle.c
 ===================================================================
---- WindowMaker-0.95.6.orig/util/getstyle.c
-+++ WindowMaker-0.95.6/util/getstyle.c
+--- WindowMaker-0.95.7.orig/util/getstyle.c
++++ WindowMaker-0.95.7/util/getstyle.c
 @@ -25,6 +25,10 @@
  
  #include "config.h"
@@ -2257,10 +2242,10 @@ Index: WindowMaker-0.95.6/util/getstyle.c
  #include <sys/types.h>
  #include <sys/stat.h>
  
-Index: WindowMaker-0.95.6/util/seticons.c
+Index: WindowMaker-0.95.7/util/seticons.c
 ===================================================================
---- WindowMaker-0.95.6.orig/util/seticons.c
-+++ WindowMaker-0.95.6/util/seticons.c
+--- WindowMaker-0.95.7.orig/util/seticons.c
++++ WindowMaker-0.95.7/util/seticons.c
 @@ -25,6 +25,10 @@
  
  #include "config.h"
@@ -2272,10 +2257,10 @@ Index: WindowMaker-0.95.6/util/seticons.c
  #include <getopt.h>
  #include <stdio.h>
  #include <stdlib.h>
-Index: WindowMaker-0.95.6/util/setstyle.c
+Index: WindowMaker-0.95.7/util/setstyle.c
 ===================================================================
---- WindowMaker-0.95.6.orig/util/setstyle.c
-+++ WindowMaker-0.95.6/util/setstyle.c
+--- WindowMaker-0.95.7.orig/util/setstyle.c
++++ WindowMaker-0.95.7/util/setstyle.c
 @@ -25,6 +25,10 @@
  
  #include "config.h"
@@ -2287,10 +2272,10 @@ Index: WindowMaker-0.95.6/util/setstyle.c
  #include <sys/stat.h>
  
  #include <getopt.h>
-Index: WindowMaker-0.95.6/util/wdread.c
+Index: WindowMaker-0.95.7/util/wdread.c
 ===================================================================
---- WindowMaker-0.95.6.orig/util/wdread.c
-+++ WindowMaker-0.95.6/util/wdread.c
+--- WindowMaker-0.95.7.orig/util/wdread.c
++++ WindowMaker-0.95.7/util/wdread.c
 @@ -29,6 +29,10 @@
   */
  #include "config.h"
@@ -2302,10 +2287,10 @@ Index: WindowMaker-0.95.6/util/wdread.c
  #include <getopt.h>
  #include <limits.h>
  #include <stdio.h>
-Index: WindowMaker-0.95.6/util/wdwrite.c
+Index: WindowMaker-0.95.7/util/wdwrite.c
 ===================================================================
---- WindowMaker-0.95.6.orig/util/wdwrite.c
-+++ WindowMaker-0.95.6/util/wdwrite.c
+--- WindowMaker-0.95.7.orig/util/wdwrite.c
++++ WindowMaker-0.95.7/util/wdwrite.c
 @@ -28,6 +28,10 @@
   */
  #include "config.h"
@@ -2317,10 +2302,10 @@ Index: WindowMaker-0.95.6/util/wdwrite.c
  #include <getopt.h>
  #include <limits.h>
  #include <stdio.h>
-Index: WindowMaker-0.95.6/util/wmagnify.c
+Index: WindowMaker-0.95.7/util/wmagnify.c
 ===================================================================
---- WindowMaker-0.95.6.orig/util/wmagnify.c
-+++ WindowMaker-0.95.6/util/wmagnify.c
+--- WindowMaker-0.95.7.orig/util/wmagnify.c
++++ WindowMaker-0.95.7/util/wmagnify.c
 @@ -7,6 +7,10 @@
   */
  #include <config.h>
@@ -2332,10 +2317,10 @@ Index: WindowMaker-0.95.6/util/wmagnify.c
  #include <X11/Xproto.h>
  
  #include <WINGs/WINGs.h>
-Index: WindowMaker-0.95.6/util/wmgenmenu.c
+Index: WindowMaker-0.95.7/util/wmgenmenu.c
 ===================================================================
---- WindowMaker-0.95.6.orig/util/wmgenmenu.c
-+++ WindowMaker-0.95.6/util/wmgenmenu.c
+--- WindowMaker-0.95.7.orig/util/wmgenmenu.c
++++ WindowMaker-0.95.7/util/wmgenmenu.c
 @@ -6,6 +6,10 @@
  
  #include "config.h"
@@ -2347,10 +2332,10 @@ Index: WindowMaker-0.95.6/util/wmgenmenu.c
  #include <ctype.h>
  #include <getopt.h>
  #include <limits.h>
-Index: WindowMaker-0.95.6/util/wmmenugen.c
+Index: WindowMaker-0.95.7/util/wmmenugen.c
 ===================================================================
---- WindowMaker-0.95.6.orig/util/wmmenugen.c
-+++ WindowMaker-0.95.6/util/wmmenugen.c
+--- WindowMaker-0.95.7.orig/util/wmmenugen.c
++++ WindowMaker-0.95.7/util/wmmenugen.c
 @@ -18,6 +18,10 @@
   * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -2362,10 +2347,10 @@ Index: WindowMaker-0.95.6/util/wmmenugen.c
  #include <sys/types.h>
  #include <sys/stat.h>
  
-Index: WindowMaker-0.95.6/util/wmmenugen_misc.c
+Index: WindowMaker-0.95.7/util/wmmenugen_misc.c
 ===================================================================
---- WindowMaker-0.95.6.orig/util/wmmenugen_misc.c
-+++ WindowMaker-0.95.6/util/wmmenugen_misc.c
+--- WindowMaker-0.95.7.orig/util/wmmenugen_misc.c
++++ WindowMaker-0.95.7/util/wmmenugen_misc.c
 @@ -20,6 +20,10 @@
   * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -2377,10 +2362,10 @@ Index: WindowMaker-0.95.6/util/wmmenugen_misc.c
  #include <libgen.h>
  #include <stdlib.h>
  #include <string.h>
-Index: WindowMaker-0.95.6/util/wmmenugen_parse_wmconfig.c
+Index: WindowMaker-0.95.7/util/wmmenugen_parse_wmconfig.c
 ===================================================================
---- WindowMaker-0.95.6.orig/util/wmmenugen_parse_wmconfig.c
-+++ WindowMaker-0.95.6/util/wmmenugen_parse_wmconfig.c
+--- WindowMaker-0.95.7.orig/util/wmmenugen_parse_wmconfig.c
++++ WindowMaker-0.95.7/util/wmmenugen_parse_wmconfig.c
 @@ -20,6 +20,10 @@
   * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -2392,10 +2377,10 @@ Index: WindowMaker-0.95.6/util/wmmenugen_parse_wmconfig.c
  #include <sys/types.h>
  #include <sys/stat.h>
  
-Index: WindowMaker-0.95.6/util/wmmenugen_parse_xdg.c
+Index: WindowMaker-0.95.7/util/wmmenugen_parse_xdg.c
 ===================================================================
---- WindowMaker-0.95.6.orig/util/wmmenugen_parse_xdg.c
-+++ WindowMaker-0.95.6/util/wmmenugen_parse_xdg.c
+--- WindowMaker-0.95.7.orig/util/wmmenugen_parse_xdg.c
++++ WindowMaker-0.95.7/util/wmmenugen_parse_xdg.c
 @@ -36,6 +36,10 @@
   * Basic validation of the .desktop file is done.
   */
@@ -2407,10 +2392,10 @@ Index: WindowMaker-0.95.6/util/wmmenugen_parse_xdg.c
  #include <sys/types.h>
  #include <sys/stat.h>
  
-Index: WindowMaker-0.95.6/util/wxcopy.c
+Index: WindowMaker-0.95.7/util/wxcopy.c
 ===================================================================
---- WindowMaker-0.95.6.orig/util/wxcopy.c
-+++ WindowMaker-0.95.6/util/wxcopy.c
+--- WindowMaker-0.95.7.orig/util/wxcopy.c
++++ WindowMaker-0.95.7/util/wxcopy.c
 @@ -18,6 +18,10 @@
   *  MA 02110-1301, USA.
   */
@@ -2422,10 +2407,10 @@ Index: WindowMaker-0.95.6/util/wxcopy.c
  #include <stdio.h>
  #include <stdlib.h>
  #include <string.h>
-Index: WindowMaker-0.95.6/wmlib/app.c
+Index: WindowMaker-0.95.7/wmlib/app.c
 ===================================================================
---- WindowMaker-0.95.6.orig/wmlib/app.c
-+++ WindowMaker-0.95.6/wmlib/app.c
+--- WindowMaker-0.95.7.orig/wmlib/app.c
++++ WindowMaker-0.95.7/wmlib/app.c
 @@ -20,6 +20,10 @@
   *  MA 02110-1301, USA.
   */
@@ -2437,10 +2422,10 @@ Index: WindowMaker-0.95.6/wmlib/app.c
  #include <X11/Xlib.h>
  #include <stdlib.h>
  #include <string.h>
-Index: WindowMaker-0.95.6/wmlib/command.c
+Index: WindowMaker-0.95.7/wmlib/command.c
 ===================================================================
---- WindowMaker-0.95.6.orig/wmlib/command.c
-+++ WindowMaker-0.95.6/wmlib/command.c
+--- WindowMaker-0.95.7.orig/wmlib/command.c
++++ WindowMaker-0.95.7/wmlib/command.c
 @@ -20,6 +20,10 @@
   *  MA 02110-1301, USA.
   */
@@ -2452,10 +2437,10 @@ Index: WindowMaker-0.95.6/wmlib/command.c
  #include <X11/Xlib.h>
  #include <stdlib.h>
  
-Index: WindowMaker-0.95.6/wmlib/event.c
+Index: WindowMaker-0.95.7/wmlib/event.c
 ===================================================================
---- WindowMaker-0.95.6.orig/wmlib/event.c
-+++ WindowMaker-0.95.6/wmlib/event.c
+--- WindowMaker-0.95.7.orig/wmlib/event.c
++++ WindowMaker-0.95.7/wmlib/event.c
 @@ -20,6 +20,10 @@
   *  MA 02110-1301, USA.
   */
@@ -2467,10 +2452,10 @@ Index: WindowMaker-0.95.6/wmlib/event.c
  #include <stdlib.h>
  #include <stdio.h>
  #include <X11/Xlib.h>
-Index: WindowMaker-0.95.6/wmlib/menu.c
+Index: WindowMaker-0.95.7/wmlib/menu.c
 ===================================================================
---- WindowMaker-0.95.6.orig/wmlib/menu.c
-+++ WindowMaker-0.95.6/wmlib/menu.c
+--- WindowMaker-0.95.7.orig/wmlib/menu.c
++++ WindowMaker-0.95.7/wmlib/menu.c
 @@ -20,6 +20,10 @@
   *  MA 02110-1301, USA.
   */
@@ -2482,10 +2467,10 @@ Index: WindowMaker-0.95.6/wmlib/menu.c
  #include <stdlib.h>
  #include <stdio.h>
  #include <string.h>
-Index: WindowMaker-0.95.6/wrlib/alpha_combine.c
+Index: WindowMaker-0.95.7/wrlib/alpha_combine.c
 ===================================================================
---- WindowMaker-0.95.6.orig/wrlib/alpha_combine.c
-+++ WindowMaker-0.95.6/wrlib/alpha_combine.c
+--- WindowMaker-0.95.7.orig/wrlib/alpha_combine.c
++++ WindowMaker-0.95.7/wrlib/alpha_combine.c
 @@ -18,6 +18,10 @@
   *  MA 02110-1301, USA.
   */
@@ -2497,43 +2482,10 @@ Index: WindowMaker-0.95.6/wrlib/alpha_combine.c
  #include "wraster.h"
  
  void RCombineAlpha(unsigned char *d, unsigned char *s, int s_has_alpha,
-Index: WindowMaker-0.95.6/wrlib/load_gif.c
+Index: WindowMaker-0.95.7/wrlib/tests/testdraw.c
 ===================================================================
---- WindowMaker-0.95.6.orig/wrlib/load_gif.c
-+++ WindowMaker-0.95.6/wrlib/load_gif.c
-@@ -27,6 +27,10 @@
- #include <string.h>
- 
- #include <gif_lib.h>
-+#if defined(GIFLIB_MAJOR) && (GIFLIB_MAJOR > 5 || (GIFLIB_MAJOR >= 5 && GIFLIB_MINOR >= 1))
-+#else
-+#	define DGifCloseFile(a, b) DGifCloseFile(a)
-+#endif
- 
- #include "wraster.h"
- #include "imgformat.h"
-@@ -81,7 +84,7 @@ RImage *RLoadGIF(const char *file, int i
- 	}
- 
- 	if (gif->SWidth < 1 || gif->SHeight < 1) {
--		DGifCloseFile(gif);
-+		DGifCloseFile(gif, NULL);
- 		RErrorCode = RERR_BADIMAGEFILE;
- 		return NULL;
- 	}
-@@ -216,7 +219,7 @@ RImage *RLoadGIF(const char *file, int i
- 		free(buffer);
- 
- 	if (gif)
--		DGifCloseFile(gif);
-+		DGifCloseFile(gif, NULL);
- 
- 	return image;
- }
-Index: WindowMaker-0.95.6/wrlib/tests/testdraw.c
-===================================================================
---- WindowMaker-0.95.6.orig/wrlib/tests/testdraw.c
-+++ WindowMaker-0.95.6/wrlib/tests/testdraw.c
+--- WindowMaker-0.95.7.orig/wrlib/tests/testdraw.c
++++ WindowMaker-0.95.7/wrlib/tests/testdraw.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -2543,10 +2495,10 @@ Index: WindowMaker-0.95.6/wrlib/tests/testdraw.c
  #include <X11/Xlib.h>
  #include "wraster.h"
  #include <stdio.h>
-Index: WindowMaker-0.95.6/wrlib/tests/testgrad.c
+Index: WindowMaker-0.95.7/wrlib/tests/testgrad.c
 ===================================================================
---- WindowMaker-0.95.6.orig/wrlib/tests/testgrad.c
-+++ WindowMaker-0.95.6/wrlib/tests/testgrad.c
+--- WindowMaker-0.95.7.orig/wrlib/tests/testgrad.c
++++ WindowMaker-0.95.7/wrlib/tests/testgrad.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -2556,10 +2508,10 @@ Index: WindowMaker-0.95.6/wrlib/tests/testgrad.c
  #include <X11/Xlib.h>
  #include "wraster.h"
  #include <stdio.h>
-Index: WindowMaker-0.95.6/wrlib/tests/testrot.c
+Index: WindowMaker-0.95.7/wrlib/tests/testrot.c
 ===================================================================
---- WindowMaker-0.95.6.orig/wrlib/tests/testrot.c
-+++ WindowMaker-0.95.6/wrlib/tests/testrot.c
+--- WindowMaker-0.95.7.orig/wrlib/tests/testrot.c
++++ WindowMaker-0.95.7/wrlib/tests/testrot.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -2569,10 +2521,10 @@ Index: WindowMaker-0.95.6/wrlib/tests/testrot.c
  #include <X11/Xlib.h>
  #include "wraster.h"
  #include <stdlib.h>
-Index: WindowMaker-0.95.6/wrlib/tests/view.c
+Index: WindowMaker-0.95.7/wrlib/tests/view.c
 ===================================================================
---- WindowMaker-0.95.6.orig/wrlib/tests/view.c
-+++ WindowMaker-0.95.6/wrlib/tests/view.c
+--- WindowMaker-0.95.7.orig/wrlib/tests/view.c
++++ WindowMaker-0.95.7/wrlib/tests/view.c
 @@ -1,3 +1,7 @@
 +#ifdef HAVE_CONFIG_H
 +#include "config.h"
@@ -2581,3 +2533,17 @@ Index: WindowMaker-0.95.6/wrlib/tests/view.c
  #include <X11/Xlib.h>
  #include "wraster.h"
  #include <stdlib.h>
+Index: WindowMaker-0.95.7/src/xdnd.c
+===================================================================
+--- WindowMaker-0.95.7.orig/src/xdnd.c
++++ WindowMaker-0.95.7/src/xdnd.c
+@@ -20,7 +20,9 @@
+ 
+ /* Many part of code are ripped of an example from JX's site */
+ 
++#ifdef HAVE_CONFIG_H
+ #include "config.h"
++#endif
+ 
+ #include <stdlib.h>
+ #include <stdio.h>