diff --git a/ChangeLog b/ChangeLog
index 867f707..377195c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-09-15   Manuel Guesdon <mguesdon@orange-concept.com>
+	* GSWeb.framework/GSWElementIDString.m
+		o Applied David Ayers <d.ayers@inode.at> patch
+	* GSWAdaptors/Apache/GNUmakefile
+		o Applied David Ayers <d.ayers@inode.at> patch	
+
 2002-08-06   David Wetzel <dave@turbocat.de>
         * GSWeb.framework/GSWImageButton.m
                 o fixed a bug that caused the ImageButton to call the action even if it 
diff --git a/GSWAdaptors/Apache/GNUmakefile b/GSWAdaptors/Apache/GNUmakefile
index fa44e59..fbcaeeb 100644
--- a/GSWAdaptors/Apache/GNUmakefile
+++ b/GSWAdaptors/Apache/GNUmakefile
@@ -44,7 +44,7 @@ endif
 
 APACHEHEADERS := -I/usr/apache/include -I/usr/include/apache -I/usr/local/include/apache -I/usr/lib/apache/include -I/usr/local/include  -I/usr/local/apache/include
 
-APXS := $(APXS) -lPropList -L/usr/local/lib -L/usr/pkg/lib
+APXS := $(APXS) -lPropList -L/usr/local/lib -L/usr/pkg/lib -L/usr/X11R6/lib
 
 SRCROOT = ..
 DSTROOT = .
@@ -59,7 +59,7 @@ LOADBALANCING = roundrobin
 ADAPTORLIB = $(OBJROOT)/libAdaptor.a
 COMMON = $(SRCROOT)/common
 
-INCLUDE = -I$(COMMON) $(APACHEHEADERS)
+INCLUDE = -I$(COMMON) $(APACHEHEADERS) -I/usr/X11R6/include
 
 CFLAGS = -O2 $(RC_CFLAGS) $(INCLUDE) -D$(SERVERAPI) -DREENTRANT -DEAPI
 
diff --git a/GSWeb.framework/GSWElementIDString.m b/GSWeb.framework/GSWElementIDString.m
index ed62a59..52afc83 100644
--- a/GSWeb.framework/GSWElementIDString.m
+++ b/GSWeb.framework/GSWElementIDString.m
@@ -31,7 +31,6 @@ static char rcsId[] = "$Id$";
 
 #include <GSWeb/GSWeb.h>
 
-#undef GSWElementIDString
 
 //====================================================================
 @implementation GSWElementIDString