* *.h/m: Updated to new header layout.

* Tools/eoutil.m: Added missing include. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gdl2/trunk@17539 72102866-910b-0410-8b05-ffd578937521
2025-04-23 13:10:48 +00:00 · 2003-08-25 20:01:59 +00:00 · 2003-08-25 20:01:59 +00:00 · 0135ad09da
commit 0135ad09da
parent 894f3554ac
76 changed files with 96 additions and 90 deletions
--- a/5
+++ b/5
@ -1,3 +1,8 @@
+2003-08-25  Matt Rice  <ratmice@yahoo.com>
+
+	* *.h/m:  Updated to new header layout.
+	* Tools/eoutil.m:  Added missing include.
+
 2003-08-23  David Ayers  <d.ayers@inode.at>

 	* EOControl/EOKeyValueCoding.h/m: Rewritten and documented.
--- a/EOAccess/EOAccessFault.m
+++ b/EOAccess/EOAccessFault.m
@ -44,7 +44,7 @@ RCS_ID("$Id$")
 #endif

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

 #include <EOControl/EOCheapArray.h>
--- a/EOAccess/EOAdaptor.m
+++ b/EOAccess/EOAdaptor.m
@ -64,10 +64,10 @@ RCS_ID("$Id$")
 #endif

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

-#include <gnustep/base/Unicode.h>
+#include <GNUstepBase/Unicode.h>


 #include <EOControl/EONSAddOns.h>
--- a/EOAccess/EOAdaptorChannel.m
+++ b/EOAccess/EOAdaptorChannel.m
@ -49,7 +49,7 @@ RCS_ID("$Id$")
 #endif

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

 #include <EOControl/EOMutableKnownKeyDictionary.h>
--- a/EOAccess/EOAdaptorContext.m
+++ b/EOAccess/EOAdaptorContext.m
@ -47,7 +47,7 @@ RCS_ID("$Id$")
 #endif

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

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

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

 #include <EOAccess/EODatabaseOperation.h>
--- a/EOAccess/EOAttribute.h
+++ b/EOAccess/EOAttribute.h
@ -34,7 +34,7 @@
 #include <Foundation/Foundation.h>
 #endif

-#include <gnustep/base/GCObject.h>
+#include <GNUstepBase/GCObject.h>

 #include <EOAccess/EOPropertyListEncoding.h>

--- a/EOAccess/EOAttribute.m
+++ b/EOAccess/EOAttribute.m
@ -58,7 +58,7 @@ RCS_ID("$Id$")
 #endif

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

 #include <EOControl/EONull.h>
--- a/EOAccess/EODatabase.m
+++ b/EOAccess/EODatabase.m
@ -50,7 +50,7 @@ RCS_ID("$Id$")
 #endif

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

 #include <EOControl/EOObjectStore.h>
--- a/EOAccess/EODatabaseChannel.m
+++ b/EOAccess/EODatabaseChannel.m
@ -52,7 +52,7 @@ RCS_ID("$Id$")
 #endif

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

 #include <EOControl/EOEditingContext.h>
--- a/EOAccess/EODatabaseContext.m
+++ b/EOAccess/EODatabaseContext.m
@ -56,10 +56,10 @@ RCS_ID("$Id$")
 #endif

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

-#include <gnustep/base/GSObjCRuntime.h>
+#include <GNUstepBase/GSObjCRuntime.h>

 #include <EOControl/EOFault.h>
 #include <EOControl/EOEditingContext.h>
--- a/EOAccess/EODatabaseDataSource.m
+++ b/EOAccess/EODatabaseDataSource.m
@ -53,7 +53,7 @@ RCS_ID("$Id$")
 #endif

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

 #include <EOControl/EOEditingContext.h>
--- a/EOAccess/EODatabaseOperation.m
+++ b/EOAccess/EODatabaseOperation.m
@ -47,7 +47,7 @@ RCS_ID("$Id$")
 #endif

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

 #include <EOControl/EODebug.h>
--- a/EOAccess/EOEntity.h
+++ b/EOAccess/EOEntity.h
@ -34,7 +34,7 @@
 #include <Foundation/Foundation.h>
 #endif

-#include <gnustep/base/GCObject.h>
+#include <GNUstepBase/GCObject.h>

 #include <EOControl/EOClassDescription.h>

--- a/EOAccess/EOEntity.m
+++ b/EOAccess/EOEntity.m
@ -61,7 +61,7 @@ RCS_ID("$Id$")
 #endif

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

 #include <EOControl/EOKeyValueCoding.h>
--- a/EOAccess/EOExpressionArray.h
+++ b/EOAccess/EOExpressionArray.h
@ -34,7 +34,7 @@
 #include <Foundation/Foundation.h>
 #endif

-#include <gnustep/base/GCObject.h>
+#include <GNUstepBase/GCObject.h>


@class NSArray;
--- a/EOAccess/EOExpressionArray.m
+++ b/EOAccess/EOExpressionArray.m
@ -52,10 +52,10 @@ RCS_ID("$Id$")
 #endif

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

-#include <gnustep/base/GSObjCRuntime.h>
+#include <GNUstepBase/GSObjCRuntime.h>

 #include <EOControl/EODebug.h>

--- a/EOAccess/EOJoin.h
+++ b/EOAccess/EOJoin.h
@ -27,7 +27,7 @@
 #ifndef __EOJoin_h__
 #define __EOJoin_h__

-#include <gnustep/base/GCObject.h>
+#include <GNUstepBase/GCObject.h>


@class NSString;
--- a/EOAccess/EOJoin.m
+++ b/EOAccess/EOJoin.m
@ -44,7 +44,7 @@ RCS_ID("$Id$")
 #endif

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

 #include <EOControl/EODebug.h>
--- a/EOAccess/EOModel.h
+++ b/EOAccess/EOModel.h
@ -33,7 +33,7 @@
 #else
 #include <Foundation/Foundation.h>
 #endif
-#include <gnustep/base/GCObject.h>
+#include <GNUstepBase/GCObject.h>

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

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

-#include <gnustep/base/GSObjCRuntime.h>
+#include <GNUstepBase/GSObjCRuntime.h>

 #include <EOControl/EOGenericRecord.h>
 #include <EOControl/EOFault.h>
--- a/EOAccess/EOModelGroup.h
+++ b/EOAccess/EOModelGroup.h
@ -27,7 +27,7 @@
 #ifndef __EOModelGroup_h__
 #define __EOModelGroup_h__

-#include <gnustep/base/GCObject.h>
+#include <GNUstepBase/GCObject.h>

 #include <EOControl/EOObjectStoreCoordinator.h>

--- a/EOAccess/EOModelGroup.m
+++ b/EOAccess/EOModelGroup.m
@ -46,7 +46,7 @@ RCS_ID("$Id$")
 #endif

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

 #include <EOAccess/EOModelGroup.h>
--- a/EOAccess/EORelationship.h
+++ b/EOAccess/EORelationship.h
@ -27,7 +27,7 @@
 #ifndef __EORelationship_h__
 #define __EORelationship_h__

-#include <gnustep/base/GCObject.h>
+#include <GNUstepBase/GCObject.h>

 #include <EOControl/EOClassDescription.h>

--- a/EOAccess/EORelationship.m
+++ b/EOAccess/EORelationship.m
@ -48,7 +48,7 @@ RCS_ID("$Id$")
 #endif

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

 #include <EOControl/EOObserver.h>
--- a/EOAccess/EOSQLExpression.m
+++ b/EOAccess/EOSQLExpression.m
@ -52,8 +52,8 @@ RCS_ID("$Id$")
 #endif

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

 #include <EOControl/EOFetchSpecification.h>
--- a/EOAccess/EOSQLQualifier.m
+++ b/EOAccess/EOSQLQualifier.m
@ -49,7 +49,7 @@ RCS_ID("$Id$")
 #endif

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

 #include <EOAccess/EOSQLQualifier.h>
--- a/EOAccess/EOStoredProcedure.h
+++ b/EOAccess/EOStoredProcedure.h
@ -27,7 +27,7 @@
 #ifndef __EOStoredProcedure_h__
 #define __EOStoredProcedure_h__

-#include <gnustep/base/GCObject.h>
+#include <GNUstepBase/GCObject.h>

 #include <EOAccess/EOPropertyListEncoding.h>

--- a/EOAccess/EOStoredProcedure.m
+++ b/EOAccess/EOStoredProcedure.m
@ -44,10 +44,10 @@ RCS_ID("$Id$")
 #endif

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

-#include <gnustep/base/GCObject.h>
+#include <GNUstepBase/GCObject.h>

 #include <EOControl/EODebug.h>

--- a/EOAccess/EOUtilities.m
+++ b/EOAccess/EOUtilities.m
@ -48,7 +48,7 @@ RCS_ID("$Id$")
 #endif

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

 #include <EOControl/EOKeyGlobalID.h>
--- a/EOAdaptors/Postgres95/Postgres95Adaptor.m
+++ b/EOAdaptors/Postgres95/Postgres95Adaptor.m
@ -57,7 +57,7 @@ RCS_ID("$Id$")
 #endif

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

 #include <EOControl/EONSAddOns.h>
--- a/EOAdaptors/Postgres95/Postgres95Channel.m
+++ b/EOAdaptors/Postgres95/Postgres95Channel.m
@ -55,7 +55,7 @@ RCS_ID("$Id$")
 #endif

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

 #include <EOControl/EONull.h>
--- a/EOAdaptors/Postgres95/Postgres95Context.m
+++ b/EOAdaptors/Postgres95/Postgres95Context.m
@ -52,7 +52,7 @@ RCS_ID("$Id$")
 #endif

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

 #include <EOControl/EODebug.h>
--- a/EOAdaptors/Postgres95/Postgres95SQLExpression.m
+++ b/EOAdaptors/Postgres95/Postgres95SQLExpression.m
@ -44,7 +44,7 @@ RCS_ID("$Id$")
 #endif

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

 #include <EOControl/EONull.h>
--- a/EOAdaptors/Postgres95/Postgres95Values.m
+++ b/EOAdaptors/Postgres95/Postgres95Values.m
@ -49,7 +49,7 @@ RCS_ID("$Id$")
 #endif

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


--- a/EOControl/EOAndQualifier.m
+++ b/EOControl/EOAndQualifier.m
@ -48,8 +48,8 @@ RCS_ID("$Id$")
 #endif

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

 #include <EOControl/EOQualifier.h>
--- a/EOControl/EOArrayDataSource.m
+++ b/EOControl/EOArrayDataSource.m
@ -34,7 +34,7 @@
 #endif

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


--- a/EOControl/EOCheapArray.m
+++ b/EOControl/EOCheapArray.m
@ -46,7 +46,7 @@ RCS_ID("$Id$")
 #endif

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

 #include <EOControl/EOCheapArray.h>
--- a/EOControl/EOClassDescription.m
+++ b/EOControl/EOClassDescription.m
@ -55,7 +55,7 @@ RCS_ID("$Id$")
 #endif

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

 #include <EOControl/EOClassDescription.h>
--- a/EOControl/EODataSource.m
+++ b/EOControl/EODataSource.m
@ -37,7 +37,7 @@ RCS_ID("$Id$")


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

 #include <EOControl/EODataSource.h>
--- a/EOControl/EODebug.m
+++ b/EOControl/EODebug.m
@ -42,7 +42,7 @@ RCS_ID("$Id$")
 #endif

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

 #include <unistd.h>
--- a/EOControl/EODetailDataSource.m
+++ b/EOControl/EODetailDataSource.m
@ -46,7 +46,7 @@ RCS_ID("$Id$")
 #endif

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

 #include <EOControl/EODetailDataSource.h>
--- a/EOControl/EOEditingContext.m
+++ b/EOControl/EOEditingContext.m
@ -38,7 +38,7 @@ RCS_ID("$Id$")
 #include <Foundation/Foundation.h>

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

 #include <EOControl/EOEditingContext.h>
--- a/EOControl/EOFault.h
+++ b/EOControl/EOFault.h
@ -37,7 +37,7 @@
 #include <Foundation/Foundation.h>
 #endif

-#include <gnustep/base/GCObject.h>
+#include <GNUstepBase/GCObject.h>


@class NSInvocation;
--- a/EOControl/EOFault.m
+++ b/EOControl/EOFault.m
@ -55,8 +55,8 @@ RCS_ID("$Id$")
 #endif

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

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

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

-#include <gnustep/base/GCObject.h>
+#include <GNUstepBase/GCObject.h>

 #include <EOControl/EOFault.h>
 #include <EOControl/EODebug.h>
--- a/EOControl/EOFetchSpecification.m
+++ b/EOControl/EOFetchSpecification.m
@ -45,7 +45,7 @@ RCS_ID("$Id$")
 #endif

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

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

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

-#include <gnustep/base/GSObjCRuntime.h>
+#include <GNUstepBase/GSObjCRuntime.h>

 #include <EOControl/EOClassDescription.h>
 #include <EOControl/EOGenericRecord.h>
--- a/EOControl/EOGlobalID.m
+++ b/EOControl/EOGlobalID.m
@ -43,7 +43,7 @@ RCS_ID("$Id$")
 #endif

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

 #include <EOControl/EOGlobalID.h>
--- a/EOControl/EOKeyComparisonQualifier.m
+++ b/EOControl/EOKeyComparisonQualifier.m
@ -45,7 +45,7 @@ RCS_ID("$Id$")
 #endif

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

 #include <EOControl/EOQualifier.h>
--- a/EOControl/EOKeyGlobalID.m
+++ b/EOControl/EOKeyGlobalID.m
@ -45,7 +45,7 @@ RCS_ID("$Id$")
 #endif

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

 #include <EOControl/EOKeyGlobalID.h>
--- a/EOControl/EOKeyValueArchiver.m
+++ b/EOControl/EOKeyValueArchiver.m
@ -46,7 +46,7 @@ RCS_ID("$Id$")
 #endif

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

 #include <EOControl/EOKeyValueArchiver.h>
--- a/EOControl/EOKeyValueCoding.m
+++ b/EOControl/EOKeyValueCoding.m
@ -60,8 +60,8 @@ RCS_ID("$Id$")
 #endif

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

 #include <EOControl/EOKeyValueCoding.h>
@ -69,7 +69,7 @@ RCS_ID("$Id$")
 #include <EOControl/EODebug.h>
 #include <EOControl/EONull.h>

-#include <gnustep/base/GSObjCRuntime.h>
+#include <GNUstepBase/GSObjCRuntime.h>

 static EONull *null = nil;
 static SEL     oaiSel;
--- a/EOControl/EOKeyValueQualifier.m
+++ b/EOControl/EOKeyValueQualifier.m
@ -47,7 +47,7 @@ RCS_ID("$Id$")
 #endif

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

 #include <EOControl/EOQualifier.h>
--- a/EOControl/EOMutableKnownKeyDictionary.h
+++ b/EOControl/EOMutableKnownKeyDictionary.h
@ -35,7 +35,7 @@
 #include <Foundation/Foundation.h>
 #endif

-#include <gnustep/base/GCObject.h>
+#include <GNUstepBase/GCObject.h>


@class NSArray;
--- a/EOControl/EOMutableKnownKeyDictionary.m
+++ b/EOControl/EOMutableKnownKeyDictionary.m
@ -48,7 +48,7 @@ RCS_ID("$Id$")
 #endif

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

 #include <EOControl/EOMutableKnownKeyDictionary.h>
--- a/EOControl/EONSAddOns.m
+++ b/EOControl/EONSAddOns.m
@ -51,7 +51,7 @@ RCS_ID("$Id$")
 #endif

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

 #include <EOControl/EONSAddOns.h>
--- a/EOControl/EONotQualifier.m
+++ b/EOControl/EONotQualifier.m
@ -44,7 +44,7 @@ RCS_ID("$Id$")
 #endif

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

 #include <EOControl/EOQualifier.h>
--- a/EOControl/EONull.m
+++ b/EOControl/EONull.m
@ -45,7 +45,7 @@ RCS_ID("$Id$")
 #endif

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

 #include <EOControl/EONull.h>
--- a/EOControl/EOObjectStore.m
+++ b/EOControl/EOObjectStore.m
@ -42,7 +42,7 @@ RCS_ID("$Id$")
 #endif

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

 #include <EOControl/EOObjectStore.h>
--- a/EOControl/EOObjectStoreCoordinator.m
+++ b/EOControl/EOObjectStoreCoordinator.m
@ -47,7 +47,7 @@ RCS_ID("$Id$")
 #endif

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

 #include <EOControl/EOObjectStoreCoordinator.h>
--- a/EOControl/EOObserver.m
+++ b/EOControl/EOObserver.m
@ -47,7 +47,7 @@ RCS_ID("$Id$")
 #endif

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

 #include <EOControl/EOClassDescription.h>
--- a/EOControl/EOOrQualifier.m
+++ b/EOControl/EOOrQualifier.m
@ -46,8 +46,8 @@ RCS_ID("$Id$")
 #endif

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

 #include <EOControl/EOQualifier.h>
--- a/EOControl/EOQualifier.m
+++ b/EOControl/EOQualifier.m
@ -51,13 +51,13 @@ RCS_ID("$Id$")
 #endif

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

 #include <EOControl/EOQualifier.h>
 #include <EOControl/EODebug.h>

-#include <gnustep/base/GSObjCRuntime.h>
+#include <GNUstepBase/GSObjCRuntime.h>


@implementation NSNumber (EOQualifierExtras)
--- a/EOControl/EOSortOrdering.m
+++ b/EOControl/EOSortOrdering.m
@ -45,7 +45,7 @@ RCS_ID("$Id$")
 #endif

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

 #include <EOControl/EOSortOrdering.h>
--- a/EOControl/EOUndoManager.m
+++ b/EOControl/EOUndoManager.m
@ -36,7 +36,7 @@
 RCS_ID("$Id$")

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

 #include <EOControl/EODeprecated.h>
--- a/EOModeler/EOModelExtensions.m
+++ b/EOModeler/EOModelExtensions.m
@ -27,7 +27,7 @@
 #include "config.h"

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

 #include <EOModeler/EOModelExtensions.h>
--- a/Tools/EOAttribute+GSDoc.m
+++ b/Tools/EOAttribute+GSDoc.m
@ -42,7 +42,7 @@ RCS_ID("$Id$")
 #endif

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

 #include <EOAccess/EOAccess.h>
--- a/Tools/EOEntity+GSDoc.m
+++ b/Tools/EOEntity+GSDoc.m
@ -42,7 +42,7 @@ RCS_ID("$Id$")
 #endif

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

 #include <EOAccess/EOAccess.h>
--- a/Tools/EOJoin+GSDoc.m
+++ b/Tools/EOJoin+GSDoc.m
@ -42,7 +42,7 @@ RCS_ID("$Id$")
 #endif

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

 #include <EOAccess/EOAccess.h>
--- a/Tools/EOModel+GSDoc.m
+++ b/Tools/EOModel+GSDoc.m
@ -43,7 +43,7 @@ RCS_ID("$Id$")


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

 #include <EOAccess/EOAccess.h>
--- a/Tools/EORelationship+GSDoc.m
+++ b/Tools/EORelationship+GSDoc.m
@ -41,7 +41,7 @@ RCS_ID("$Id$")
 #endif

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

 #include <EOAccess/EOAccess.h>
--- a/Tools/NSArray+GSDoc.m
+++ b/Tools/NSArray+GSDoc.m
@ -41,7 +41,7 @@ RCS_ID("$Id$")
 #endif

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

 #include "NSArray+GSDoc.h"
--- a/Tools/NSDictionary+GSDoc.m
+++ b/Tools/NSDictionary+GSDoc.m
@ -43,7 +43,7 @@ RCS_ID("$Id$")
 #endif

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

 #include "NSDictionary+GSDoc.h"
--- a/Tools/eoutil.m
+++ b/Tools/eoutil.m
@ -48,12 +48,13 @@ RCS_ID("$Id$")
 #include <Foundation/NSFileHandle.h>
 #include <Foundation/NSException.h>
 #include <Foundation/NSAutoreleasePool.h>
+#include <Foundation/NSProcessInfo.h>
 #else
 #include <Foundation/Foundation.h>
 #endif

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

 #include <EOControl/EOControl.h>
--- a/Tools/gsdoc-model.m
+++ b/Tools/gsdoc-model.m
@ -50,8 +50,8 @@ RCS_ID("$Id$")
 #endif

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

 #include <EOAccess/EOAccess.h>