diff --git a/ChangeLog b/ChangeLog
index b879c91..952fa22 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2003-10-21  David Wetzel <dave@turbocat.de>
+        * Include changes for OS X as suggested by Philip Moetteli
+          GSWeb.framework/GSWAssociation.m
+          GSWeb.framework/GSWDefaultAdaptor.m
+          GSWeb.framework/GSWStatisticsStore.m
+          GSWeb.framework/GSWeb.h
+
 2003-08-25  David Ayers  <d.ayers@inode.at>
 
 	* *.h/m: Updated to new header layout.
diff --git a/GSWeb.framework/GSWAssociation.m b/GSWeb.framework/GSWAssociation.m
index e673225..2be21aa 100644
--- a/GSWeb.framework/GSWAssociation.m
+++ b/GSWeb.framework/GSWAssociation.m
@@ -33,7 +33,7 @@ RCS_ID("$Id$")
 
 #include "GSWeb.h"
 #include <math.h>
-#if !defined(__NetBSD__)
+#if !(__NetBSD__ || NeXT_Foundation_LIBRARY)
 #include <values.h>
 #endif
 #ifdef TCSDB
diff --git a/GSWeb.framework/GSWDefaultAdaptor.m b/GSWeb.framework/GSWDefaultAdaptor.m
index f21f2d2..5e08418 100644
--- a/GSWeb.framework/GSWDefaultAdaptor.m
+++ b/GSWeb.framework/GSWDefaultAdaptor.m
@@ -35,7 +35,10 @@
 RCS_ID("$Id$")
 
 #include "GSWeb.h"
+
+#ifndef NeXT_Foundation_LIBRARY
 #include <GNUstepBase/GSFileHandle.h>
+#endif
 
 #if HAVE_LIBWRAP
 #include <tcpd.h>
diff --git a/GSWeb.framework/GSWStatisticsStore.m b/GSWeb.framework/GSWStatisticsStore.m
index 9ca7672..39033e7 100644
--- a/GSWeb.framework/GSWStatisticsStore.m
+++ b/GSWeb.framework/GSWStatisticsStore.m
@@ -32,6 +32,11 @@
 RCS_ID("$Id$")
 
 #include "GSWeb.h"
+
+#ifdef NeXT_Foundation_LIBRARY
+#include <sys/time.h>
+#endif
+
 #include <sys/resource.h>
 #include <unistd.h>
 
diff --git a/GSWeb.framework/GSWeb.h b/GSWeb.framework/GSWeb.h
index 3b5af7c..c17e30e 100644
--- a/GSWeb.framework/GSWeb.h
+++ b/GSWeb.framework/GSWeb.h
@@ -71,7 +71,12 @@
 #include <Foundation/NSURLHandle.h>
 #include <Foundation/NSURL.h>
 #include <Foundation/NSThread.h>
+
+//FIXME is that correct? NSConcreteNumber is a private class! dave@turbocat.de
+#ifndef NeXT_Foundation_LIBRARY
 #include <Foundation/NSConcreteNumber.h>
+#endif
+
 #include <Foundation/NSFormatter.h>
 #include <GNUstepBase/GSXML.h>
 #include <GNUstepBase/GSCategories.h>