diff -urN icewm-1.2.5/Makefile icewm-1.2.5-new/Makefile
--- icewm-1.2.5/Makefile	Thu Dec 26 12:05:47 2002
+++ icewm-1.2.5-new/Makefile	Sat Dec 28 18:12:30 2002
@@ -110,12 +110,12 @@
 
 install-docs: docs
 	@echo ------------------------------------------
-	@rm -fr "$(DESTDIR)$(DOCDIR)/icewm-$(VERSION)"
-	@$(INSTALLDIR) "$(DESTDIR)$(DOCDIR)/icewm-$(VERSION)"
+	@rm -fr "$(DESTDIR)$(DOCDIR)/"
+	@$(INSTALLDIR) "$(DESTDIR)$(DOCDIR)/"
 	@echo "Installing documentation in $(DESTDIR)$(DOCDIR)"
-	@$(INSTALLLIB) $(DOCFILES) "$(DESTDIR)$(DOCDIR)/icewm-$(VERSION)"
-	@$(INSTALLLIB) "$(top_srcdir)/doc/"*.sgml "$(DESTDIR)$(DOCDIR)/icewm-$(VERSION)"
-	@$(INSTALLLIB) "$(top_srcdir)/doc/"*.html "$(DESTDIR)$(DOCDIR)/icewm-$(VERSION)"
+	@$(INSTALLLIB) $(DOCFILES) "$(DESTDIR)$(DOCDIR)/"
+	@$(INSTALLLIB) "$(top_srcdir)/doc/"*.sgml "$(DESTDIR)$(DOCDIR)/"
+	@$(INSTALLLIB) "$(top_srcdir)/doc/"*.html "$(DESTDIR)$(DOCDIR)/"
 	@echo ------------------------------------------
 
 install-nls: nls
diff -urN icewm-1.2.5/Makefile.in icewm-1.2.5-new/Makefile.in
--- icewm-1.2.5/Makefile.in	Thu Dec 26 12:05:29 2002
+++ icewm-1.2.5-new/Makefile.in	Sat Dec 28 18:12:30 2002
@@ -110,12 +110,12 @@
 
 install-docs: docs
 	@echo ------------------------------------------
-	@rm -fr "$(DESTDIR)$(DOCDIR)/icewm-$(VERSION)"
-	@$(INSTALLDIR) "$(DESTDIR)$(DOCDIR)/icewm-$(VERSION)"
+	@rm -fr "$(DESTDIR)$(DOCDIR)/"
+	@$(INSTALLDIR) "$(DESTDIR)$(DOCDIR)/"
 	@echo "Installing documentation in $(DESTDIR)$(DOCDIR)"
-	@$(INSTALLLIB) $(DOCFILES) "$(DESTDIR)$(DOCDIR)/icewm-$(VERSION)"
-	@$(INSTALLLIB) "$(top_srcdir)/doc/"*.sgml "$(DESTDIR)$(DOCDIR)/icewm-$(VERSION)"
-	@$(INSTALLLIB) "$(top_srcdir)/doc/"*.html "$(DESTDIR)$(DOCDIR)/icewm-$(VERSION)"
+	@$(INSTALLLIB) $(DOCFILES) "$(DESTDIR)$(DOCDIR)/"
+	@$(INSTALLLIB) "$(top_srcdir)/doc/"*.sgml "$(DESTDIR)$(DOCDIR)/"
+	@$(INSTALLLIB) "$(top_srcdir)/doc/"*.html "$(DESTDIR)$(DOCDIR)/"
 	@echo ------------------------------------------
 
 install-nls: nls
diff -urN icewm-1.2.5/src/Makefile icewm-1.2.5-new/src/Makefile
--- icewm-1.2.5/src/Makefile	Thu Dec 26 12:05:48 2002
+++ icewm-1.2.5-new/src/Makefile	Sat Dec 28 18:12:30 2002
@@ -28,7 +28,7 @@
                 -DEXEEXT='"$(EXEEXT)"' \
                 -DICEWMEXE='"icewm$(EXEEXT)"' \
                 -DICEHELPEXE='"icehelp$(EXEEXT)"' \
-                -DICEHELPIDX='"$(DOCDIR)/icewm-$(VERSION)/icewm.html"'
+                -DICEHELPIDX='"$(DOCDIR)//icewm.html"'
 
 CXXFLAGS =      -fpermissive -Wall -Wpointer-arith -Wconversion -Wwrite-strings -Wmissing-prototypes -Wmissing-declarations -Winline -Woverloaded-virtual -W -fno-exceptions -fno-rtti -g -O2 $(DEBUG) $(DEFS) \
 	         -I/usr/X11R6/include -I/usr/include/Xft2 -I/usr/include/freetype2 -I/usr/X11R6/include -I/usr/X11R6/include  # `fc-config --cflags`
diff -urN icewm-1.2.5/src/Makefile.in icewm-1.2.5-new/src/Makefile.in
--- icewm-1.2.5/src/Makefile.in	Thu Dec 26 12:05:30 2002
+++ icewm-1.2.5-new/src/Makefile.in	Sat Dec 28 18:12:30 2002
@@ -28,7 +28,7 @@
                 -DEXEEXT='"$(EXEEXT)"' \
                 -DICEWMEXE='"icewm$(EXEEXT)"' \
                 -DICEHELPEXE='"icehelp$(EXEEXT)"' \
-                -DICEHELPIDX='"$(DOCDIR)/icewm-$(VERSION)/icewm.html"'
+                -DICEHELPIDX='"$(DOCDIR)//icewm.html"'
 
 CXXFLAGS =      @CXXFLAGS@ $(DEBUG) $(DEFS) \
 	        @CORE_CFLAGS@ @IMAGE_CFLAGS@ @AUDIO_CFLAGS@ # `fc-config --cflags`
diff -urN icewm-1.2.5/src/wmclient.h icewm-1.2.5-new/src/wmclient.h
--- icewm-1.2.5/src/wmclient.h	Thu Dec 26 12:05:30 2002
+++ icewm-1.2.5-new/src/wmclient.h	Sat Dec 28 18:12:38 2002
@@ -13,9 +13,10 @@
 
 #ifndef __YIMP_XUTIL__
 //!!! remove these if possible
-typedef struct XWMHints;
-typedef struct XSizeHints;
-typedef struct XClassHint;
+//typedef struct XWMHints;
+//typedef struct XSizeHints;
+//typedef struct XClassHint;
+#include <X11/Xutil.h>
 #endif
 
 class ClientData {