diff --git a/ChangeLog b/ChangeLog
index 5b4871e..fa679a5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2004-04-14  David Ayers  <d.ayers@inode.at>
+
+	* gsweb.make.in: Remove GSANTLR dependency.
+	* GSWExtensions.framework/Makefile.preamble: Ditto.
+	* GSWExtensionsGSW.framework/Makefile.preamble: Ditto.
+	
+	* GSWeb.framework/Makefile.preamble.in: Move AUX_LIBS to the
+	bottom so that the linker on Darwin can deal with the static
+	library.
+
+	* GSWExtensions.framework/GSWKeyValueConditional.h: Remove
+	include currently redundant for the include mechanism and
+	causing warnings to gswnames=wo.
+	
 2004-04-06   Manuel Guesdon <mguesdon@orange-concept.com>
 
 	* GSWeb.framework/GSWHTMLRawParser.m:
diff --git a/GSWExtensions.framework/GSWKeyValueConditional.h b/GSWExtensions.framework/GSWKeyValueConditional.h
index d9288bc..4197dbc 100644
--- a/GSWExtensions.framework/GSWKeyValueConditional.h
+++ b/GSWExtensions.framework/GSWKeyValueConditional.h
@@ -32,7 +32,6 @@
 #ifndef _GSWKeyValueConditional_h__
 #define _GSWKeyValueConditional_h__
 
-#include <GSWeb/GSWComponent.h>
 
 //==============================================================================
 @interface GSWKeyValueConditional : GSWComponent
diff --git a/GSWExtensions.framework/Makefile.preamble b/GSWExtensions.framework/Makefile.preamble
index a7342be..004310c 100644
--- a/GSWExtensions.framework/Makefile.preamble
+++ b/GSWExtensions.framework/Makefile.preamble
@@ -69,7 +69,7 @@ ADDITIONAL_LDFLAGS =
 # These variables should only be needed on windows
 # but they aren't set yet.
 
-LIBRARIES_DEPEND_UPON += -lGSANTLR
+LIBRARIES_DEPEND_UPON +=
 
 ifneq ($(FOUNDATION_LIB),gnu)
 LIBRARIES_DEPEND_UPON += -lgnustep-baseadd
diff --git a/GSWExtensionsGSW.framework/Makefile.preamble b/GSWExtensionsGSW.framework/Makefile.preamble
index c530887..8052991 100644
--- a/GSWExtensionsGSW.framework/Makefile.preamble
+++ b/GSWExtensionsGSW.framework/Makefile.preamble
@@ -83,7 +83,7 @@ WOExtensionsGSW_LIB_DIRS = \
 	-L$(WO_LIBRARY_BASE)/$(GSW_FRAMEWORK_SUFFIX)
 endif
 
-LIBRARIES_DEPEND_UPON += -lGSANTLR
+LIBRARIES_DEPEND_UPON +=
 
 ifneq ($(FOUNDATION_LIB),gnu)
 LIBRARIES_DEPEND_UPON += -lgnustep-baseadd
diff --git a/GSWeb.framework/Makefile.preamble.in b/GSWeb.framework/Makefile.preamble.in
index c6a718d..5cb4e78 100644
--- a/GSWeb.framework/Makefile.preamble.in
+++ b/GSWeb.framework/Makefile.preamble.in
@@ -64,7 +64,6 @@ ADDITIONAL_CFLAGS =  -DUSE_BUILTIN
 ADDITIONAL_INCLUDE_DIRS = -I./$(GNUSTEP_TARGET_DIR) @XML_CFLAGS@
 
 # Additional LDFLAGS to pass to the linker
-LIBRARIES_DEPEND_UPON += @AUX_LIBS@
 ifneq ($(FOUNDATION_LIB),gnu)
 LIBRARIES_DEPEND_UPON += -lgnustep-baseadd
 endif
@@ -73,6 +72,9 @@ LIBRARIES_DEPEND_UPON += \
 	-l$(EOCONTROL_LIBRARY_NAME) \
 	-l$(EOACCESS_LIBRARY_NAME)
 endif
+# This entry is last so that -lwrap (libwrap.a static library) will not
+# be the first entry (which causes problems with the Darwin linker).
+LIBRARIES_DEPEND_UPON += @AUX_LIBS@
 
 # Additional library directories the linker should search
 ADDITIONAL_LIB_DIRS = 
diff --git a/gsweb.make.in b/gsweb.make.in
index cf47d5d..9effa13 100644
--- a/gsweb.make.in
+++ b/gsweb.make.in
@@ -36,7 +36,7 @@ endif
 
 
 AUXILIARY_INCLUDE_DIRS += @AUX_INCS@
-AUXILIARY_TOOL_LIBS += @AUX_LIBS@ -lGSANTLR
+AUXILIARY_TOOL_LIBS += @AUX_LIBS@
 
 GDL2=@GDL2@
 ifeq ($(GDL2),yes)