* *.m: Include GNUstep.h if GNUSTEP is not defined for OS X.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gdl2/trunk@17191 72102866-910b-0410-8b05-ffd578937521
2025-04-23 05:00:46 +00:00 · 2003-07-11 19:04:05 +00:00 · 2003-07-11 19:04:05 +00:00 · 9238fc1a32
commit 9238fc1a32
parent cca381a47b
69 changed files with 345 additions and 14 deletions
--- a/4
+++ b/4
@ -1,3 +1,7 @@
+2003-07-11  David Ayers  <d.ayers@inode.at>
+
+	* *.m: Include GNUstep.h if GNUSTEP is not defined for OS X.
+
 2003-06-26  Manuel Guesdon  <mguesdon@orange-concept.com>
 	* config.h.in: 
 		o added EMIT_TODO control	
--- a/EOAccess/EOAccessFault.m
+++ b/EOAccess/EOAccessFault.m
@ -43,6 +43,10 @@ RCS_ID("$Id$")
 #include <Foundation/Foundation.h>
 #endif

+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
+#endif
+
 #include <EOControl/EOCheapArray.h>
 #include <EOControl/EOKeyGlobalID.h>
 #include <EOControl/EODebug.h>
--- a/EOAccess/EOAdaptor.m
+++ b/EOAccess/EOAdaptor.m
@ -63,6 +63,10 @@ RCS_ID("$Id$")
 #include <Foundation/Foundation.h>
 #endif

+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
+#endif
+
 #include <gnustep/base/Unicode.h>


--- a/EOAccess/EOAdaptorChannel.m
+++ b/EOAccess/EOAdaptorChannel.m
@ -48,6 +48,10 @@ RCS_ID("$Id$")
 #include <Foundation/Foundation.h>
 #endif

+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
+#endif
+
 #include <EOControl/EOMutableKnownKeyDictionary.h>
 #include <EOControl/EOFetchSpecification.h>
 #include <EOControl/EONSAddOns.h>
--- a/EOAccess/EOAdaptorContext.m
+++ b/EOAccess/EOAdaptorContext.m
@ -46,6 +46,10 @@ RCS_ID("$Id$")
 #include <Foundation/Foundation.h>
 #endif

+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
+#endif
+
 #include <EOControl/EODebug.h>

 #include <EOAccess/EOAdaptor.h>
--- a/EOAccess/EOAdaptorOperation.m
+++ b/EOAccess/EOAdaptorOperation.m
@ -42,6 +42,10 @@ RCS_ID("$Id$")
 #include <Foundation/Foundation.h>
 #endif

+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
+#endif
+
 #include <EOAccess/EODatabaseOperation.h>
 #include <EOAccess/EOAttribute.h>
 #include <EOAccess/EOEntity.h>
--- a/EOAccess/EOAttribute.m
+++ b/EOAccess/EOAttribute.m
@ -57,6 +57,10 @@ RCS_ID("$Id$")
 #include <Foundation/Foundation.h>
 #endif

+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
+#endif
+
 #include <EOControl/EONull.h>
 #include <EOControl/EOObserver.h>
 #include <EOControl/EODebug.h>
--- a/EOAccess/EODatabase.m
+++ b/EOAccess/EODatabase.m
@ -49,6 +49,10 @@ RCS_ID("$Id$")
 #include <Foundation/Foundation.h>
 #endif

+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
+#endif
+
 #include <EOControl/EOObjectStore.h>
 #include <EOControl/EOKeyGlobalID.h>
 #include <EOControl/EONull.h>
--- a/EOAccess/EODatabaseChannel.m
+++ b/EOAccess/EODatabaseChannel.m
@ -51,6 +51,10 @@ RCS_ID("$Id$")
 #include <Foundation/Foundation.h>
 #endif

+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
+#endif
+
 #include <EOControl/EOEditingContext.h>
 #include <EOControl/EOKeyValueCoding.h>
 #include <EOControl/EOFetchSpecification.h>
--- a/EOAccess/EODatabaseContext.m
+++ b/EOAccess/EODatabaseContext.m
@ -55,6 +55,10 @@ RCS_ID("$Id$")
 #include <Foundation/Foundation.h>
 #endif

+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
+#endif
+
 #include <gnustep/base/GSObjCRuntime.h>

 #include <EOControl/EOFault.h>
--- a/EOAccess/EODatabaseDataSource.m
+++ b/EOAccess/EODatabaseDataSource.m
@ -52,6 +52,10 @@ RCS_ID("$Id$")
 #include <Foundation/Foundation.h>
 #endif

+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
+#endif
+
 #include <EOControl/EOEditingContext.h>
 #include <EOControl/EOQualifier.h>
 #include <EOControl/EOFetchSpecification.h>
--- a/EOAccess/EODatabaseOperation.m
+++ b/EOAccess/EODatabaseOperation.m
@ -46,6 +46,10 @@ RCS_ID("$Id$")
 #include <Foundation/Foundation.h>
 #endif

+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
+#endif
+
 #include <EOControl/EODebug.h>

 #include <EOAccess/EODatabaseOperation.h>
--- a/EOAccess/EOEntity.m
+++ b/EOAccess/EOEntity.m
@ -60,6 +60,10 @@ RCS_ID("$Id$")
 #include <Foundation/Foundation.h>
 #endif

+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
+#endif
+
 #include <EOControl/EOKeyValueCoding.h>
 #include <EOControl/EOQualifier.h>
 #include <EOControl/EOKeyGlobalID.h>
--- a/EOAccess/EOExpressionArray.m
+++ b/EOAccess/EOExpressionArray.m
@ -51,6 +51,10 @@ RCS_ID("$Id$")
 #include <Foundation/Foundation.h>
 #endif

+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
+#endif
+
 #include <gnustep/base/GSObjCRuntime.h>

 #include <EOControl/EODebug.h>
--- a/EOAccess/EOJoin.m
+++ b/EOAccess/EOJoin.m
@ -43,6 +43,10 @@ RCS_ID("$Id$")
 #include <Foundation/Foundation.h>
 #endif

+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
+#endif
+
 #include <EOControl/EODebug.h>

 #include <EOAccess/EOModel.h>
--- a/EOAccess/EOModel.m
+++ b/EOAccess/EOModel.m
@ -51,6 +51,10 @@ RCS_ID("$Id$")
 #include <Foundation/Foundation.h>
 #endif

+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
+#endif
+
 #include <gnustep/base/GSObjCRuntime.h>

 #include <EOControl/EOGenericRecord.h>
--- a/EOAccess/EOModelGroup.m
+++ b/EOAccess/EOModelGroup.m
@ -45,6 +45,10 @@ RCS_ID("$Id$")
 #include <Foundation/Foundation.h>
 #endif

+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
+#endif
+
 #include <EOAccess/EOModelGroup.h>
 #include <EOAccess/EOModel.h>
 #include <EOAccess/EOEntity.h>
--- a/EOAccess/EORelationship.m
+++ b/EOAccess/EORelationship.m
@ -47,6 +47,10 @@ RCS_ID("$Id$")
 #include <Foundation/Foundation.h>
 #endif

+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
+#endif
+
 #include <EOControl/EOObserver.h>
 #include <EOControl/EOMutableKnownKeyDictionary.h>
 #include <EOControl/EONSAddOns.h>
--- a/EOAccess/EOSQLExpression.m
+++ b/EOAccess/EOSQLExpression.m
@ -49,6 +49,10 @@ RCS_ID("$Id$")
 #include <Foundation/NSDebug.h>
 #else
 #include <Foundation/Foundation.h>
+#endif
+
+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
 #include <gnustep/base/GSCategories.h>
 #endif

--- a/EOAccess/EOSQLQualifier.m
+++ b/EOAccess/EOSQLQualifier.m
@ -48,6 +48,10 @@ RCS_ID("$Id$")
 #include <Foundation/Foundation.h>
 #endif

+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
+#endif
+
 #include <EOAccess/EOSQLQualifier.h>
 #include <EOAccess/EOAttribute.h>
 #include <EOAccess/EORelationship.h>
--- a/EOAccess/EOStoredProcedure.m
+++ b/EOAccess/EOStoredProcedure.m
@ -43,6 +43,10 @@ RCS_ID("$Id$")
 #include <Foundation/Foundation.h>
 #endif

+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
+#endif
+
 #include <gnustep/base/GCObject.h>

 #include <EOControl/EODebug.h>
--- a/EOAccess/EOUtilities.m
+++ b/EOAccess/EOUtilities.m
@ -47,6 +47,10 @@ RCS_ID("$Id$")
 #include <Foundation/Foundation.h>
 #endif

+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
+#endif
+
 #include <EOControl/EOKeyGlobalID.h>
 #include <EOControl/EOQualifier.h>
 #include <EOControl/EONull.h>
--- a/EOAdaptors/Postgres95/Postgres95Adaptor.m
+++ b/EOAdaptors/Postgres95/Postgres95Adaptor.m
@ -56,6 +56,10 @@ RCS_ID("$Id$")
 #include <Foundation/Foundation.h>
 #endif

+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
+#endif
+
 #include <EOControl/EONSAddOns.h>
 #include <EOControl/EODebug.h>

--- a/EOAdaptors/Postgres95/Postgres95Channel.m
+++ b/EOAdaptors/Postgres95/Postgres95Channel.m
@ -54,6 +54,10 @@ RCS_ID("$Id$")
 #include <Foundation/Foundation.h>
 #endif

+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
+#endif
+
 #include <EOControl/EONull.h>
 #include <EOControl/EOQualifier.h>
 #include <EOControl/EOFetchSpecification.h>
--- a/EOAdaptors/Postgres95/Postgres95Context.m
+++ b/EOAdaptors/Postgres95/Postgres95Context.m
@ -51,6 +51,10 @@ RCS_ID("$Id$")
 #include <Foundation/Foundation.h>
 #endif

+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
+#endif
+
 #include <EOControl/EODebug.h>

 #include <Postgres95EOAdaptor/Postgres95Adaptor.h>
--- a/EOAdaptors/Postgres95/Postgres95SQLExpression.m
+++ b/EOAdaptors/Postgres95/Postgres95SQLExpression.m
@ -43,6 +43,10 @@ RCS_ID("$Id$")
 #include <Foundation/Foundation.h>
 #endif

+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
+#endif
+
 #include <EOControl/EONull.h>
 #include <EOControl/EONSAddOns.h>
 #include <EOControl/EODebug.h>
--- a/EOAdaptors/Postgres95/Postgres95Values.m
+++ b/EOAdaptors/Postgres95/Postgres95Values.m
@ -48,6 +48,10 @@ RCS_ID("$Id$")
 #include <Foundation/Foundation.h>
 #endif

+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
+#endif
+

 #include <EOAccess/EOAttribute.h>

--- a/EOControl/EOAndQualifier.m
+++ b/EOControl/EOAndQualifier.m
@ -45,6 +45,10 @@ RCS_ID("$Id$")
 #include <Foundation/NSDebug.h>
 #else
 #include <Foundation/Foundation.h>
+#endif
+
+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
 #include <gnustep/base/GSObjCRuntime.h>
 #endif

--- a/EOControl/EOArrayDataSource.m
+++ b/EOControl/EOArrayDataSource.m
@ -33,6 +33,10 @@
 #include <Foundation/Foundation.h>
 #endif

+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
+#endif
+

 #include <EOControl/EOArrayDataSource.h>
 #include <EOControl/EOClassDescription.h>
--- a/EOControl/EOCheapArray.m
+++ b/EOControl/EOCheapArray.m
@ -45,6 +45,10 @@ RCS_ID("$Id$")
 #include <Foundation/Foundation.h>
 #endif

+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
+#endif
+
 #include <EOControl/EOCheapArray.h>
 #include <EOControl/EODebug.h>

--- a/EOControl/EOClassDescription.m
+++ b/EOControl/EOClassDescription.m
@ -54,6 +54,10 @@ RCS_ID("$Id$")
 #include <Foundation/Foundation.h>
 #endif

+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
+#endif
+
 #include <EOControl/EOClassDescription.h>
 #include <EOControl/EOKeyValueCoding.h>
 #include <EOControl/EONull.h>
--- a/EOControl/EODataSource.m
+++ b/EOControl/EODataSource.m
@ -35,6 +35,11 @@

 RCS_ID("$Id$")

+
+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
+#endif
+
 #include <EOControl/EODataSource.h>
 #include <EOControl/EOClassDescription.h>
 #include <EOControl/EOEditingContext.h>
--- a/EOControl/EODebug.m
+++ b/EOControl/EODebug.m
@ -41,6 +41,10 @@ RCS_ID("$Id$")
 #include <Foundation/Foundation.h>
 #endif

+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
+#endif
+
 #include <unistd.h>

 #include <EOControl/EODebug.h>
--- a/EOControl/EODetailDataSource.m
+++ b/EOControl/EODetailDataSource.m
@ -45,6 +45,10 @@ RCS_ID("$Id$")
 #include <Foundation/Foundation.h>
 #endif

+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
+#endif
+
 #include <EOControl/EODetailDataSource.h>
 #include <EOControl/EOKeyValueCoding.h>
 #include <EOControl/EOKeyValueArchiver.h>
--- a/EOControl/EOEditingContext.m
+++ b/EOControl/EOEditingContext.m
@ -37,6 +37,10 @@ RCS_ID("$Id$")
 //TODO EOMultiReaderLocks 
 #include <Foundation/Foundation.h>

+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
+#endif
+
 #include <EOControl/EOEditingContext.h>
 #include <EOControl/EOObjectStoreCoordinator.h>
 #include <EOControl/EOGlobalID.h>
--- a/EOControl/EOFault.m
+++ b/EOControl/EOFault.m
@ -54,7 +54,10 @@ RCS_ID("$Id$")
 #include <Foundation/Foundation.h>
 #endif

+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
 #include <gnustep/base/GSObjCRuntime.h>
+#endif

 #include <EOControl/EOFault.h>
 #include <EOControl/EOKeyGlobalID.h>
--- a/EOControl/EOFaultHandler.m
+++ b/EOControl/EOFaultHandler.m
@ -48,6 +48,10 @@ RCS_ID("$Id$")
 #include <Foundation/Foundation.h>
 #endif

+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
+#endif
+
 #include <gnustep/base/GCObject.h>

 #include <EOControl/EOFault.h>
--- a/EOControl/EOFetchSpecification.m
+++ b/EOControl/EOFetchSpecification.m
@ -44,6 +44,10 @@ RCS_ID("$Id$")
 #include <Foundation/Foundation.h>
 #endif

+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
+#endif
+
 #include <EOControl/EOFetchSpecification.h>
 #include <EOControl/EOKeyValueArchiver.h>
 #include <EOControl/EOObserver.h>
--- a/EOControl/EOGenericRecord.m
+++ b/EOControl/EOGenericRecord.m
@ -51,6 +51,10 @@ RCS_ID("$Id$")
 #include <Foundation/Foundation.h>
 #endif

+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
+#endif
+
 #include <gnustep/base/GSObjCRuntime.h>

 #include <EOControl/EOClassDescription.h>
--- a/EOControl/EOGlobalID.m
+++ b/EOControl/EOGlobalID.m
@ -42,6 +42,10 @@ RCS_ID("$Id$")
 #include <Foundation/Foundation.h>
 #endif

+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
+#endif
+
 #include <EOControl/EOGlobalID.h>
 #include <EOControl/EODebug.h>

--- a/EOControl/EOKeyComparisonQualifier.m
+++ b/EOControl/EOKeyComparisonQualifier.m
@ -44,6 +44,10 @@ RCS_ID("$Id$")
 #include <Foundation/Foundation.h>
 #endif

+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
+#endif
+
 #include <EOControl/EOQualifier.h>
 #include <EOControl/EOKeyValueCoding.h>
 #include <EOControl/EODebug.h>
--- a/EOControl/EOKeyGlobalID.m
+++ b/EOControl/EOKeyGlobalID.m
@ -44,6 +44,10 @@ RCS_ID("$Id$")
 #include <Foundation/Foundation.h>
 #endif

+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
+#endif
+
 #include <EOControl/EOKeyGlobalID.h>
 #include <EOControl/EODebug.h>
 #include <EOControl/EONull.h>
--- a/EOControl/EOKeyValueArchiver.m
+++ b/EOControl/EOKeyValueArchiver.m
@ -45,6 +45,9 @@ RCS_ID("$Id$")
 #include <Foundation/Foundation.h>
 #endif

+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
+#endif

 #include <EOControl/EOKeyValueArchiver.h>
 #include <EOControl/EODebug.h>
--- a/EOControl/EOKeyValueCoding.m
+++ b/EOControl/EOKeyValueCoding.m
@ -56,6 +56,10 @@ RCS_ID("$Id$")
 #include <Foundation/NSDebug.h>
 #else
 #include <Foundation/Foundation.h>
+#endif
+
+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
 #include <gnustep/base/GSCategories.h>
 #endif

--- a/EOControl/EOKeyValueQualifier.m
+++ b/EOControl/EOKeyValueQualifier.m
@ -46,6 +46,10 @@ RCS_ID("$Id$")
 #include <Foundation/Foundation.h>
 #endif

+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
+#endif
+
 #include <EOControl/EOQualifier.h>
 #include <EOControl/EOKeyValueCoding.h>
 #include <EOControl/EOObjectStore.h>
--- a/EOControl/EOMutableKnownKeyDictionary.m
+++ b/EOControl/EOMutableKnownKeyDictionary.m
@ -47,6 +47,10 @@ RCS_ID("$Id$")
 #include <Foundation/Foundation.h>
 #endif

+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
+#endif
+
 #include <EOControl/EOMutableKnownKeyDictionary.h>
 #include <EOControl/EODebug.h>
 #include <EOControl/EONull.h>
--- a/EOControl/EONSAddOns.m
+++ b/EOControl/EONSAddOns.m
@ -50,6 +50,10 @@ RCS_ID("$Id$")
 #include <Foundation/Foundation.h>
 #endif

+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
+#endif
+
 #include <EOControl/EONSAddOns.h>
 #include <EOControl/EODebug.h>

--- a/EOControl/EONotQualifier.m
+++ b/EOControl/EONotQualifier.m
@ -43,6 +43,10 @@ RCS_ID("$Id$")
 #include <Foundation/Foundation.h>
 #endif

+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
+#endif
+
 #include <EOControl/EOQualifier.h>


--- a/EOControl/EONull.m
+++ b/EOControl/EONull.m
@ -47,6 +47,10 @@ RCS_ID("$Id$")
 #include <Foundation/Foundation.h>
 #endif

+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
+#endif
+
 #include <EOControl/EONull.h>
 #include <EOControl/EODebug.h>

--- a/EOControl/EOObjectStore.m
+++ b/EOControl/EOObjectStore.m
@ -41,6 +41,10 @@ RCS_ID("$Id$")
 #include <Foundation/Foundation.h>
 #endif

+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
+#endif
+
 #include <EOControl/EOObjectStore.h>


--- a/EOControl/EOObjectStoreCoordinator.m
+++ b/EOControl/EOObjectStoreCoordinator.m
@ -46,6 +46,10 @@ RCS_ID("$Id$")
 #include <Foundation/Foundation.h>
 #endif

+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
+#endif
+
 #include <EOControl/EOObjectStoreCoordinator.h>
 #include <EOControl/EOEditingContext.h>
 #include <EOControl/EODebug.h>
--- a/EOControl/EOObserver.m
+++ b/EOControl/EOObserver.m
@ -46,6 +46,10 @@ RCS_ID("$Id$")
 #include <Foundation/Foundation.h>
 #endif

+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
+#endif
+
 #include <EOControl/EOClassDescription.h>
 #include <EOControl/EOKeyValueCoding.h>
 #include <EOControl/EONull.h>
--- a/EOControl/EOOrQualifier.m
+++ b/EOControl/EOOrQualifier.m
@ -43,6 +43,10 @@ RCS_ID("$Id$")
 #include <Foundation/NSDebug.h>
 #else
 #include <Foundation/Foundation.h>
+#endif
+
+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
 #include <gnustep/base/GSObjCRuntime.h>
 #endif

--- a/EOControl/EOQualifier.m
+++ b/EOControl/EOQualifier.m
@ -50,6 +50,10 @@ RCS_ID("$Id$")
 #include <Foundation/Foundation.h>
 #endif

+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
+#endif
+
 #include <EOControl/EOQualifier.h>
 #include <EOControl/EODebug.h>

--- a/EOControl/EOSortOrdering.m
+++ b/EOControl/EOSortOrdering.m
@ -44,6 +44,10 @@ RCS_ID("$Id$")
 #include <Foundation/Foundation.h>
 #endif

+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
+#endif
+
 #include <EOControl/EOSortOrdering.h>
 #include <EOControl/EOKeyValueCoding.h>
 #include <EOControl/EOKeyValueArchiver.h>
--- a/EOControl/EOUndoManager.m
+++ b/EOControl/EOUndoManager.m
@ -35,6 +35,10 @@

 RCS_ID("$Id$")

+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
+#endif
+
 #include <EOControl/EODeprecated.h>
 #include <EOControl/EODebug.h>

--- a/EOControl/GNUmakefile
+++ b/EOControl/GNUmakefile
@ -1,5 +1,5 @@
 #
-#  eoaccess makefile for GNUstep Database Library.
+#  EOControl makefile for GNUstep Database Library.
 #  
 #  Copyright (C) 1997 Free Software Foundation, Inc.
 #
--- a/EOControl/Makefile.preamble
+++ b/EOControl/Makefile.preamble
@ -58,8 +58,7 @@ ADDITIONAL_LIB_DIRS =
 #

 # Additional directories to be created during installation
-ADDITIONAL_INSTALL_DIRS = \
-   $(GNUSTEP_HEADERS)/$(GNUSTEP_FND_DIR)/eoaccess/exceptions
+ADDITIONAL_INSTALL_DIRS = 


 # What are the libraries this library depends upon. This is needed for some
--- a/EOModeler/EOModelExtensions.m
+++ b/EOModeler/EOModelExtensions.m
@ -26,6 +26,10 @@

 #include "config.h"

+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
+#endif
+
 #include <EOModeler/EOModelExtensions.h>
 #include <EOControl/EODebug.h>

--- a/EOModeler/Makefile.preamble
+++ b/EOModeler/Makefile.preamble
@ -58,8 +58,7 @@ ADDITIONAL_LIB_DIRS =
 #

 # Additional directories to be created during installation
-ADDITIONAL_INSTALL_DIRS = \
-   $(GNUSTEP_HEADERS)/$(GNUSTEP_FND_DIR)/eoaccess/exceptions
+ADDITIONAL_INSTALL_DIRS = 


 # What are the libraries this library depends upon. This is needed for some
--- a/Tools/EOAttribute+GSDoc.m
+++ b/Tools/EOAttribute+GSDoc.m
@ -35,10 +35,20 @@

 RCS_ID("$Id$")

+#ifndef NeXT_Foundation_LIBRARY
+#include <Foundation/NSAutoreleasePool.h>
+#else
+#include <Foundation/Foundation.h>
+#endif
+
+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
+#endif
+
 #include <EOAccess/EOAccess.h>
 #include <EOAccess/EOEntity.h>
 #include <EOAccess/EOAttribute.h>
-#include <Foundation/NSAutoreleasePool.h>
+
 #include "NSArray+GSDoc.h"
 #include "NSDictionary+GSDoc.h"
 #include "EOAttribute+GSDoc.h"
--- a/Tools/EOEntity+GSDoc.m
+++ b/Tools/EOEntity+GSDoc.m
@ -35,9 +35,19 @@

 RCS_ID("$Id$")

+#ifndef NeXT_Foundation_LIBRARY
+#include <Foundation/NSAutoreleasePool.h>
+#else
+#include <Foundation/Foundation.h>
+#endif
+
+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
+#endif
+
 #include <EOAccess/EOAccess.h>
 #include <EOAccess/EOEntity.h>
-#include <Foundation/NSAutoreleasePool.h>
+
 #include "NSArray+GSDoc.h"
 #include "NSDictionary+GSDoc.h"
 #include "EOModel+GSDoc.h"
--- a/Tools/EOJoin+GSDoc.m
+++ b/Tools/EOJoin+GSDoc.m
@ -35,10 +35,20 @@

 RCS_ID("$Id$")

+#ifndef NeXT_Foundation_LIBRARY
+#include <Foundation/NSAutoreleasePool.h>
+#else
+#include <Foundation/Foundation.h>
+#endif
+
+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
+#endif
+
 #include <EOAccess/EOAccess.h>
 #include <EOAccess/EOJoin.h>
 #include <EOAccess/EORelationship.h>
-#include <Foundation/NSAutoreleasePool.h>
+
 #include "NSArray+GSDoc.h"
 #include "NSDictionary+GSDoc.h"
 #include "EOAttribute+GSDoc.h"
--- a/Tools/EOModel+GSDoc.m
+++ b/Tools/EOModel+GSDoc.m
@ -34,12 +34,22 @@

 RCS_ID("$Id$")

+#ifndef NeXT_Foundation_LIBRARY
+#include <Foundation/NSAutoreleasePool.h>
+#include <Foundation/NSDebug.h>
+#else
+#include <Foundation/Foundation>
+#endif
+
+
+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
+#endif
+
 #include <EOAccess/EOAccess.h>
 #include <EOAccess/EOModel.h>
 #include <EOAccess/EOEntity.h>
-#include <Foundation/Foundation.h>
-#include <Foundation/NSAutoreleasePool.h>
-#include <Foundation/NSDebug.h>
+
 #include "NSArray+GSDoc.h"
 #include "NSDictionary+GSDoc.h"
 #include "EOEntity+GSDoc.h"
--- a/Tools/EORelationship+GSDoc.m
+++ b/Tools/EORelationship+GSDoc.m
@ -34,10 +34,20 @@

 RCS_ID("$Id$")

+#ifndef NeXT_Foundation_LIBRARY
+#include <Foundation/NSAutoreleasePool.h>
+#else
+#include <Foundation/Foundation.h>
+#endif
+
+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
+#endif
+
 #include <EOAccess/EOAccess.h>
 #include <EOAccess/EORelationship.h>
 #include <EOAccess/EOEntity.h>
-#include <Foundation/NSAutoreleasePool.h>
+
 #include "NSArray+GSDoc.h"
 #include "NSDictionary+GSDoc.h"
 #include "EORelationship+GSDoc.h"
--- a/Tools/NSArray+GSDoc.m
+++ b/Tools/NSArray+GSDoc.m
@ -34,8 +34,16 @@

 RCS_ID("$Id$")

-#include <Foundation/Foundation.h>
+#ifndef NeXT_Foundation_LIBRARY
 #include <Foundation/NSAutoreleasePool.h>
+#else
+#include <Foundation/Foundation.h>
+#endif
+
+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
+#endif
+
 #include "NSArray+GSDoc.h"


--- a/Tools/NSDictionary+GSDoc.m
+++ b/Tools/NSDictionary+GSDoc.m
@ -34,8 +34,18 @@

 RCS_ID("$Id$")

-#include <Foundation/Foundation.h>
+#ifndef NeXT_Foundation_LIBRARY
+#include <Foundation/NSString.h>
+#include <Foundation/NSEnumerator.h>
 #include <Foundation/NSAutoreleasePool.h>
+#else
+#include <Foundation/Foundation.h>
+#endif
+
+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
+#endif
+
 #include "NSDictionary+GSDoc.h"


--- a/Tools/eoutil.m
+++ b/Tools/eoutil.m
@ -35,7 +35,27 @@

 RCS_ID("$Id$")

+#ifndef NeXT_Foundation_LIBRARY
+#include <Foundation/NSArray.h>
+#include <Foundation/NSString.h>
+#include <Foundation/NSDecimalNumber.h>
+#include <Foundation/NSDictionary.h>
+#include <Foundation/NSSet.h>
+#include <Foundation/NSEnumerator.h>
+#include <Foundation/NSData.h>
+#include <Foundation/NSCalendarDate.h>
+#include <Foundation/NSFileManager.h>
+#include <Foundation/NSFileHandle.h>
+#include <Foundation/NSException.h>
+#include <Foundation/NSAutoreleasePool.h>
+#else
 #include <Foundation/Foundation.h>
+#endif
+
+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
+#endif
+
 #include <EOControl/EOControl.h>
 #include <EOAccess/EOAccess.h>

--- a/Tools/gsdoc-model.m
+++ b/Tools/gsdoc-model.m
@ -34,8 +34,26 @@

 RCS_ID("$Id$")

+#ifndef NeXT_Foundation_LIBRARY
+#include <Foundation/NSString.h>
+#include <Foundation/NSArray.h>
+#include <Foundation/NSDictionary.h>
+#include <Foundation/NSEnumerator.h>
+#include <Foundation/NSFileManager.h>
+#include <Foundation/NSProcessInfo.h>
+#include <Foundation/NSSet.h>
+#include <Foundation/NSUserDefaults.h>
+#include <Foundation/NSAutoreleasePool.h>
+#include <Foundation/NSException.h>
+#else
 #include <Foundation/Foundation.h>
+#endif
+
+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
 #include <gnustep/base/GSCategories.h>
+#endif
+
 #include <EOAccess/EOAccess.h>
 #include "EOModel+GSDoc.h"