Change all include objects/*.h to include gnustep/base/*.h.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@1419 72102866-910b-0410-8b05-ffd578937521

Headers/gnustep/base/Archiver.h

@@ -24,8 +24,8 @@
 #ifndef __Archiver_h_OBJECTS_INCLUDE
 #define __Archiver_h_OBJECTS_INCLUDE
 
-#include <objects/stdobjects.h>
-#include <objects/Coder.h>
+#include <gnustep/base/prefix.h>
+#include <gnustep/base/Coder.h>
 
 /* Eventually some functionality may be moved out of Coder and
    into these objects.  

Headers/gnustep/base/Array.h

@@ -24,9 +24,9 @@
 #ifndef __Array_h_INCLUDE_GNU
 #define __Array_h_INCLUDE_GNU
 
-#include <objects/stdobjects.h>
-#include <objects/IndexedCollection.h>
-#include <objects/OrderedCollecting.h>
+#include <gnustep/base/prefix.h>
+#include <gnustep/base/IndexedCollection.h>
+#include <gnustep/base/OrderedCollecting.h>
 
 @interface ConstantArray : ConstantIndexedCollection
 {

Headers/gnustep/base/ArrayPrivate.h

@@ -24,8 +24,8 @@
 #ifndef __ArrayPrivate_h_INCLUDE_GNU
 #define __ArrayPrivate_h_INCLUDE_GNU
 
-#include <objects/stdobjects.h>
-#include <objects/IndexedCollectionPrivate.h>
+#include <gnustep/base/prefix.h>
+#include <gnustep/base/IndexedCollectionPrivate.h>
 
 #define DEFAULT_ARRAY_CAPACITY 2
 #define DEFAULT_ARRAY_GROW_FACTOR 2

Headers/gnustep/base/AutoreleasePool.h

@@ -24,8 +24,8 @@
 #ifndef __AutoreleasePool_m_OBJECTS_INCLUDE
 #define __AutoreleasePool_m_OBJECTS_INCLUDE
 
-#include <objects/stdobjects.h>
-#include <objects/ObjectRetaining.h>
+#include <gnustep/base/prefix.h>
+#include <gnustep/base/ObjectRetaining.h>
 
 @interface AutoreleasePool : Object
 {

Headers/gnustep/base/AutoreleaseStack.h

@@ -24,8 +24,8 @@
 #ifndef __AutoreleaseStack_m_OBJECTS_INCLUDE
 #define __AutoreleaseStack_m_OBJECTS_INCLUDE
 
-#include <objects/stdobjects.h>
-#include <objects/ObjectRetaining.h>
+#include <gnustep/base/prefix.h>
+#include <gnustep/base/ObjectRetaining.h>
 
 @interface AutoreleaseStack : Object
 {

Headers/gnustep/base/Bag.h

@@ -24,8 +24,8 @@
 #ifndef __Bag_h_INCLUDE_GNU
 #define __Bag_h_INCLUDE_GNU
 
-#include <objects/stdobjects.h>
-#include <objects/Collection.h>
+#include <gnustep/base/prefix.h>
+#include <gnustep/base/Collection.h>
 #include <Foundation/NSMapTable.h>
 
 @interface Bag : Collection

Headers/gnustep/base/BinaryCStream.h

@@ -24,9 +24,9 @@
 #ifndef __BinaryCStream_h_OBJECTS_INCLUDE
 #define __BinaryCStream_h_OBJECTS_INCLUDE
 
-#include <objects/stdobjects.h>
-#include <objects/Stream.h>
-#include <objects/CStream.h>
+#include <gnustep/base/prefix.h>
+#include <gnustep/base/Stream.h>
+#include <gnustep/base/CStream.h>
 
 @interface BinaryCStream : CStream
 

Headers/gnustep/base/BinaryTree.h

@@ -29,8 +29,8 @@
 #ifndef __BinaryTree_h_INCLUDE_GNU
 #define __BinaryTree_h_INCLUDE_GNU
 
-#include <objects/stdobjects.h>
-#include <objects/IndexedCollection.h>
+#include <gnustep/base/prefix.h>
+#include <gnustep/base/IndexedCollection.h>
 
 /* The <BinaryTreeComprising> protocol defines the interface to an object
    that may be an element in a BinaryTree. 

Headers/gnustep/base/BinaryTreeEltNode.h

@@ -24,12 +24,12 @@
 #ifndef __BinaryTreeEltNode_h_INCLUDE_GNU
 #define __BinaryTreeEltNode_h_INCLUDE_GNU
 
-#include <objects/stdobjects.h>
-#include <objects/BinaryTreeNode.h>
-#include <objects/EltNodeCollector.h>
+#include <gnustep/base/prefix.h>
+#include <gnustep/base/BinaryTreeNode.h>
+#include <gnustep/base/EltNodeCollector.h>
 
 @interface BinaryTreeEltNode : BinaryTreeNode
-#include <objects/EltNode-h>
+#include <gnustep/base/EltNode-h>
 @end
 
 

Headers/gnustep/base/BinaryTreeNode.h

@@ -24,9 +24,9 @@
 #ifndef __BinaryTreeNode_h_INCLUDE_GNU
 #define __BinaryTreeNode_h_INCLUDE_GNU
 
-#include <objects/stdobjects.h>
-#include <objects/BinaryTree.h>
-#include <objects/Coding.h>
+#include <gnustep/base/prefix.h>
+#include <gnustep/base/BinaryTree.h>
+#include <gnustep/base/Coding.h>
 
 @interface BinaryTreeNode : NSObject <BinaryTreeComprising>
 {

Headers/gnustep/base/CStream.h

@@ -24,9 +24,9 @@
 #ifndef __CStream_h_OBJECTS_INCLUDE
 #define __CStream_h_OBJECTS_INCLUDE
 
-#include <objects/stdobjects.h>
-#include <objects/Stream.h>
-#include <objects/CStreaming.h>
+#include <gnustep/base/prefix.h>
+#include <gnustep/base/Stream.h>
+#include <gnustep/base/CStreaming.h>
 
 @interface CStream : Stream <CStreaming>
 {

Headers/gnustep/base/CStreaming.h

@@ -24,8 +24,8 @@
 #ifndef __CStreaming_h__OBJECTS_INCLUDE
 #define __CStreaming_h__OBJECTS_INCLUDE
 
-#include <objects/stdobjects.h>
-#include <objects/Streaming.h>
+#include <gnustep/base/prefix.h>
+#include <gnustep/base/Streaming.h>
 
 @protocol CStreaming <Streaming>
 

Headers/gnustep/base/CircularArray.h

@@ -24,8 +24,8 @@
 #ifndef __CircularArray_h_INCLUDE_GNU
 #define __CircularArray_h_INCLUDE_GNU
 
-#include <objects/stdobjects.h>
-#include <objects/Array.h>
+#include <gnustep/base/prefix.h>
+#include <gnustep/base/Array.h>
 
 @interface CircularArray : Array
 {

Headers/gnustep/base/CircularArrayPrivate.h

@@ -24,8 +24,8 @@
 #ifndef __CircularArrayPrivate_h_INCLUDE_GNU
 #define __CircularArrayPrivate_h_INCLUDE_GNU
 
-#include <objects/stdobjects.h>
-#include <objects/ArrayPrivate.h>
+#include <gnustep/base/prefix.h>
+#include <gnustep/base/ArrayPrivate.h>
 
 #define CIRCULAR_TO_BASIC(INDEX) \
   ((INDEX + self->_start_index) % self->_capacity)

Headers/gnustep/base/Coder.h

@@ -24,10 +24,10 @@
 #ifndef __Coder_h_OBJECTS_INCLUDE
 #define __Coder_h_OBJECTS_INCLUDE
 
-#include <objects/stdobjects.h>
-#include <objects/Coding.h>
-#include <objects/Streaming.h>
-#include <objects/String.h>
+#include <gnustep/base/prefix.h>
+#include <gnustep/base/Coding.h>
+#include <gnustep/base/Streaming.h>
+#include <gnustep/base/String.h>
 #include <Foundation/NSHashTable.h>
 #include <Foundation/NSMapTable.h>
 

Headers/gnustep/base/CoderPrivate.h

@@ -24,9 +24,9 @@
 #ifndef __CoderPrivate_h_OBJECTS_INCLUDE
 #define __CoderPrivate_h_OBJECTS_INCLUDE
 
-#include <objects/stdobjects.h>
-#include <objects/Coder.h>
-#include <objects/CStreaming.h>
+#include <gnustep/base/prefix.h>
+#include <gnustep/base/Coder.h>
+#include <gnustep/base/CStreaming.h>
 
 enum {
   CODER_OBJECT_NIL = 0, 

Headers/gnustep/base/Coding.h

@@ -24,9 +24,9 @@
 #ifndef __Coding_h_OBJECTS_INCLUDE
 #define __Coding_h_OBJECTS_INCLUDE
 
-#include <objects/stdobjects.h>
+#include <gnustep/base/prefix.h>
 
-/* #include <objects/String.h>
+/* #include <gnustep/base/String.h>
    xxx Think about trying to get <String> back in types,
    but now there is a circular dependancy in the include files. */
 

Headers/gnustep/base/Collecting.h

@@ -34,10 +34,10 @@
 #ifndef __Collecting_h_INCLUDE_GNU
 #define __Collecting_h_INCLUDE_GNU
 
-#include <objects/stdobjects.h>
-#include <objects/Coding.h>
-#include <objects/Invoking.h>
-#include <objects/Enumerating.h>
+#include <gnustep/base/prefix.h>
+#include <gnustep/base/Coding.h>
+#include <gnustep/base/Invoking.h>
+#include <gnustep/base/Enumerating.h>
 
 @protocol ConstantCollecting <NSObject>
 

Headers/gnustep/base/Collection.h

@@ -28,11 +28,11 @@
 #ifndef __Collection_h_INCLUDE_GNU
 #define __Collection_h_INCLUDE_GNU
 
-#include <objects/stdobjects.h>
+#include <gnustep/base/prefix.h>
 #include <Foundation/NSObject.h>
-#include <objects/Collecting.h>
-#include <objects/stdobjects.h>
-#include <objects/Coding.h>
+#include <gnustep/base/Collecting.h>
+#include <gnustep/base/prefix.h>
+#include <gnustep/base/Coding.h>
 
 @interface ConstantCollection : NSObject <ConstantCollecting>
 - printForDebugger;  /* This method will disappear later. */

Headers/gnustep/base/CollectionPrivate.h

@@ -24,7 +24,7 @@
 #ifndef __CollectionPrivate_h_INCLUDE_GNU
 #define __CollectionPrivate_h_INCLUDE_GNU
 
-#include <objects/stdobjects.h>
+#include <gnustep/base/prefix.h>
 
 @interface ConstantCollection (ArchivingHelpers)
 /* These methods should never be called except in order, and inside 

Headers/gnustep/base/ConnectedCoder.h

@@ -24,9 +24,9 @@
 #ifndef __ConnectedCoder_h
 #define __ConnectedCoder_h
 
-#include <objects/stdobjects.h>
-#include <objects/Coder.h>
-#include <objects/Port.h>
+#include <gnustep/base/prefix.h>
+#include <gnustep/base/Coder.h>
+#include <gnustep/base/Port.h>
 
 /* ConnectedCoder identifiers */
 enum {

Headers/gnustep/base/Connection.h

@@ -24,13 +24,13 @@
 #ifndef __Connection_h_OBJECTS_INCLUDE
 #define __Connection_h_OBJECTS_INCLUDE
 
-#include <objects/stdobjects.h>
+#include <gnustep/base/prefix.h>
 #include <stdlib.h>
 #include <stdarg.h>
-#include <objects/Lock.h>
-#include <objects/Collecting.h>
-#include <objects/Dictionary.h>
-#include <objects/NSString.h>
+#include <gnustep/base/Lock.h>
+#include <gnustep/base/Collecting.h>
+#include <gnustep/base/Dictionary.h>
+#include <gnustep/base/NSString.h>
 #include <Foundation/NSMapTable.h>
 
 @class Proxy;

Headers/gnustep/base/DelegatePool.h

@@ -28,8 +28,8 @@
 #ifndef __DelegatePool_h_OBJECTS_INCLUDE
 #define __DelegatePool_h_OBJECTS_INCLUDE
 
-#include <objects/stdobjects.h>
-#include <objects/Array.h>
+#include <gnustep/base/prefix.h>
+#include <gnustep/base/Array.h>
 
 /* Available sending behaviors */
 enum DelegatePoolSendBehavior {SEND_TO_ALL = 0, 

Headers/gnustep/base/Dictionary.h

@@ -24,8 +24,8 @@
 #ifndef __Dictionary_h_INCLUDE_GNU
 #define __Dictionary_h_INCLUDE_GNU
 
-#include <objects/stdobjects.h>
-#include <objects/KeyedCollection.h>
+#include <gnustep/base/prefix.h>
+#include <gnustep/base/KeyedCollection.h>
 #include <Foundation/NSMapTable.h>
 
 @interface Dictionary : KeyedCollection

Headers/gnustep/base/EltNodeCollector.h

@@ -26,8 +26,8 @@
 #ifndef __EltNodeCollector_h_INCLUDE_GNU
 #define __EltNodeCollector_h_INCLUDE_GNU
 
-#include <objects/stdobjects.h>
-#include <objects/IndexedCollection.h>
+#include <gnustep/base/prefix.h>
+#include <gnustep/base/IndexedCollection.h>
 
 /* Protocol for a node that also holds an element */
 @protocol EltHolding

Headers/gnustep/base/Enumerating.h

@@ -24,7 +24,7 @@
 #ifndef __Enumerating_h__OBJECTS_INCLUDE
 #define __Enumerating_h__OBJECTS_INCLUDE
 
-#include <objects/stdobjects.h>
+#include <gnustep/base/prefix.h>
 
 @protocol Enumerating <NSObject>
 

Headers/gnustep/base/GapArray.h

@@ -24,8 +24,8 @@
 #ifndef __GapArray_h_INCLUDE_GNU
 #define __GapArray_h_INCLUDE_GNU
 
-#include <objects/stdobjects.h>
-#include <objects/Array.h>
+#include <gnustep/base/prefix.h>
+#include <gnustep/base/Array.h>
 
 @interface GapArray : Array
 {

Headers/gnustep/base/GapArrayPrivate.h

@@ -26,8 +26,8 @@
 #ifndef __GapArrayPrivate_h_INCLUDE_GNU
 #define __GapArrayPrivate_h_INCLUDE_GNU
 
-#include <objects/stdobjects.h>
-#include <objects/ArrayPrivate.h>
+#include <gnustep/base/prefix.h>
+#include <gnustep/base/ArrayPrivate.h>
 #include <assert.h>
 
 #define GAP_TO_BASIC(INDEX)              \

Headers/gnustep/base/Heap.h

@@ -24,8 +24,8 @@
 #ifndef __Heap_h_INCLUDE_GNU
 #define __Heap_h_INCLUDE_GNU
 
-#include <objects/stdobjects.h>
-#include <objects/Array.h>
+#include <gnustep/base/prefix.h>
+#include <gnustep/base/Array.h>
 
 @interface Heap : Array
 

Headers/gnustep/base/IndexedCollecting.h

@@ -35,8 +35,8 @@
 #ifndef __IndexedCollecting_h_OBJECTS_INCLUDE
 #define __IndexedCollecting_h_OBJECTS_INCLUDE
 
-#include <objects/stdobjects.h>
-#include <objects/Collecting.h>
+#include <gnustep/base/prefix.h>
+#include <gnustep/base/Collecting.h>
 
 typedef struct _IndexRange { 
   unsigned location;

Headers/gnustep/base/IndexedCollection.h

@@ -24,9 +24,9 @@
 #ifndef __IndexedCollection_h_INCLUDE_GNU
 #define __IndexedCollection_h_INCLUDE_GNU
 
-#include <objects/stdobjects.h>
-#include <objects/KeyedCollection.h>
-#include <objects/IndexedCollecting.h>
+#include <gnustep/base/prefix.h>
+#include <gnustep/base/KeyedCollection.h>
+#include <gnustep/base/IndexedCollecting.h>
 
 @interface ConstantIndexedCollection : ConstantCollection 
 @end

Headers/gnustep/base/IndexedCollectionPrivate.h

@@ -24,10 +24,10 @@
 #ifndef __IndexedCollectionPrivate_h_INCLUDE_GNU
 #define __IndexedCollectionPrivate_h_INCLUDE_GNU
 
-#include <objects/stdobjects.h>
-#include <objects/CollectionPrivate.h>
+#include <gnustep/base/prefix.h>
+#include <gnustep/base/CollectionPrivate.h>
 #include <Foundation/NSException.h>
-#include <objects/NSString.h>
+#include <gnustep/base/NSString.h>
 
 /* To be used inside a method for making sure that index
    is not above range.

Headers/gnustep/base/Invocation.h

@@ -8,9 +8,9 @@
    extraneous stuff after the first type.
 */
 
-#include <objects/stdobjects.h>
-#include <objects/Collection.h>
-#include <objects/Invoking.h>
+#include <gnustep/base/prefix.h>
+#include <gnustep/base/Collection.h>
+#include <gnustep/base/Invoking.h>
 
 @interface Invocation : NSObject <Invoking>
 {

Headers/gnustep/base/Invoking.h

@@ -24,7 +24,7 @@
 #ifndef __Invoking_h__OBJECTS_INCLUDE
 #define __Invoking_h__OBJECTS_INCLUDE
 
-#include <objects/stdobjects.h>
+#include <gnustep/base/prefix.h>
 
 @protocol Invoking <NSObject>
 

Headers/gnustep/base/KeyedCollecting.h

@@ -33,8 +33,8 @@
 #ifndef __KeyedCollecting_h_OBJECTS_INCLUDE
 #define __KeyedCollecting_h_OBJECTS_INCLUDE
 
-#include <objects/stdobjects.h>
-#include <objects/Collecting.h>
+#include <gnustep/base/prefix.h>
+#include <gnustep/base/Collecting.h>
 
 @protocol ConstantKeyedCollecting <ConstantCollecting>
 

Headers/gnustep/base/KeyedCollection.h

@@ -24,9 +24,9 @@
 #ifndef __KeyedCollection_h_INCLUDE_GNU
 #define __KeyedCollection_h_INCLUDE_GNU
 
-#include <objects/stdobjects.h>
-#include <objects/Collection.h>
-#include <objects/KeyedCollecting.h>
+#include <gnustep/base/prefix.h>
+#include <gnustep/base/Collection.h>
+#include <gnustep/base/KeyedCollecting.h>
 
 @interface ConstantKeyedCollection : Collection
 @end

Headers/gnustep/base/LinkedList.h

@@ -24,8 +24,8 @@
 #ifndef __LinkedList_h_INCLUDE_GNU
 #define __LinkedList_h_INCLUDE_GNU
 
-#include <objects/stdobjects.h>
-#include <objects/OrderedCollection.h>
+#include <gnustep/base/prefix.h>
+#include <gnustep/base/OrderedCollection.h>
 
 /* The <LinkedListComprising> protocol defines the interface to an object
    that may be an element in a LinkedList.

Headers/gnustep/base/LinkedListEltNode.h

@@ -24,12 +24,12 @@
 #ifndef __LinkedListEltNode_h_INCLUDE_GNU
 #define __LinkedListEltNode_h_INCLUDE_GNU
 
-#include <objects/stdobjects.h>
-#include <objects/LinkedListNode.h>
-#include <objects/EltNodeCollector.h>
+#include <gnustep/base/prefix.h>
+#include <gnustep/base/LinkedListNode.h>
+#include <gnustep/base/EltNodeCollector.h>
 
 @interface LinkedListEltNode : LinkedListNode
-#include <objects/EltNode-h>
+#include <gnustep/base/EltNode-h>
 @end
 
 #endif /* __LinkedListEltNode_h_INCLUDE_GNU */

Headers/gnustep/base/LinkedListNode.h

@@ -24,9 +24,9 @@
 #ifndef __LinkedListNode_h_INCLUDE_GNU
 #define __LinkedListNode_h_INCLUDE_GNU
 
-#include <objects/stdobjects.h>
-#include <objects/LinkedList.h>
-#include <objects/Coding.h>
+#include <gnustep/base/prefix.h>
+#include <gnustep/base/LinkedList.h>
+#include <gnustep/base/Coding.h>
 
 @interface LinkedListNode : NSObject <LinkedListComprising>
 {

Headers/gnustep/base/Lock.h

@@ -24,8 +24,8 @@
 #ifndef __Lock_h_OBJECTS_INCLUDE
 #define __Lock_h_OBJECTS_INCLUDE
 
-#include <objects/stdobjects.h>
-#include <objects/Locking.h>
+#include <gnustep/base/prefix.h>
+#include <gnustep/base/Locking.h>
 
 @interface Lock : NSObject <Locking>
 {

Headers/gnustep/base/Locking.h

@@ -24,7 +24,7 @@
 #ifndef __Locking_h_INCLUDE_GNU
 #define __Locking_h_INCLUDE_GNU
 
-#include <objects/stdobjects.h>
+#include <gnustep/base/prefix.h>
 #include <objc/Protocol.h>
 
 @protocol Locking

Headers/gnustep/base/MachPort.h

@@ -26,8 +26,8 @@
 
 #if __mach__
 
-#include <objects/stdobjects.h>
-#include <objects/Port.h>
+#include <gnustep/base/prefix.h>
+#include <gnustep/base/Port.h>
 
 @interface MachInPort : InPort
 @end

Headers/gnustep/base/Magnitude.h

@@ -24,8 +24,8 @@
 #ifndef __Magnitude_h_INCLUDE_GNU
 #define __Magnitude_h_INCLUDE_GNU
 
-#include <objects/stdobjects.h>
-#include <objects/Ordering.h>
+#include <gnustep/base/prefix.h>
+#include <gnustep/base/Ordering.h>
 
 @interface Magnitude : NSObject <Ordering>
 

Headers/gnustep/base/MallocAddress.h

@@ -24,7 +24,7 @@
 #ifndef __MallocAddress_h_OBJECTS_INCLUDE
 #define __MallocAddress_h_OBJECTS_INCLUDE
 
-#include <objects/stdobjects.h>
+#include <gnustep/base/prefix.h>
 
 @interface MallocAddress : NSObject
 {

Headers/gnustep/base/MappedCollector.h

@@ -24,8 +24,8 @@
 #ifndef __MappedCollector_h_INCLUDE_GNU
 #define __MappedCollector_h_INCLUDE_GNU
 
-#include <objects/stdobjects.h>
-#include <objects/KeyedCollection.h>
+#include <gnustep/base/prefix.h>
+#include <gnustep/base/KeyedCollection.h>
 
 @interface MappedCollector : KeyedCollection
 {

Headers/gnustep/base/MemoryStream.h

@@ -24,9 +24,9 @@
 #ifndef __MemoryStream_h_OBJECTS_INCLUDE
 #define __MemoryStream_h_OBJECTS_INCLUDE
 
-#include <objects/stdobjects.h>
-#include <objects/Stream.h>
-#include <objects/Streaming.h>
+#include <gnustep/base/prefix.h>
+#include <gnustep/base/Stream.h>
+#include <gnustep/base/Streaming.h>
 
 /* This protocol is preliminary and may change.
    This also may get pulled out into a separate .h file. */

Headers/gnustep/base/NSArray.h

@@ -24,7 +24,7 @@
 #ifndef __NSArray_h_OBJECTS_INCLUDE
 #define __NSArray_h_OBJECTS_INCLUDE
 
-#include <objects/stdobjects.h>
+#include <gnustep/base/prefix.h>
 #include <Foundation/NSRange.h>
 #include <Foundation/NSUtilities.h>
 
@@ -103,8 +103,8 @@
 
 #ifndef NO_GNUSTEP
 
-#include <objects/IndexedCollecting.h>
-#include <objects/String.h>
+#include <gnustep/base/IndexedCollecting.h>
+#include <gnustep/base/String.h>
 
 /* Eventually we'll make a Constant version of this protocol. */
 @interface NSArray (GNU) <IndexedCollecting>

Headers/gnustep/base/NSAutoreleasePool.h

@@ -24,7 +24,7 @@
 #ifndef __NSAutoreleasePool_h_OBJECTS_INCLUDE
 #define __NSAutoreleasePool_h_OBJECTS_INCLUDE
 
-#include <objects/stdobjects.h>
+#include <gnustep/base/prefix.h>
 
 struct autorelease_array_list
 {

Headers/gnustep/base/NSCoder.h

@@ -79,7 +79,7 @@
 
 #ifndef NO_GNUSTEP
 
-#include <objects/Coding.h>
+#include <gnustep/base/Coding.h>
 #include <Foundation/NSCoder.h>
 @interface NSCoder (GNU) <Encoding, Decoding>
 @end

Headers/gnustep/base/NSDictionary.h

@@ -24,7 +24,7 @@
 #ifndef _NSDictionary_h_OBJECTS_INCLUDE
 #define _NSDictionary_h_OBJECTS_INCLUDE
 
-#include <objects/stdobjects.h>
+#include <gnustep/base/prefix.h>
 
 @class NSArray, NSString, NSEnumerator;
 
@@ -71,7 +71,7 @@
 
 #ifndef NO_GNUSTEP
 
-#include <objects/KeyedCollecting.h>
+#include <gnustep/base/KeyedCollecting.h>
 #include <Foundation/NSDictionary.h>
 
 /* Eventually we'll make a Constant version of this protocol. */

Headers/gnustep/base/NSGArchiver.h

@@ -24,9 +24,9 @@
 #ifndef __NSGArchiver_h_OBJECTS_INCLUDE
 #define __NSGArchiver_h_OBJECTS_INCLUDE
 
-#include <objects/stdobjects.h>
+#include <gnustep/base/prefix.h>
 #include <Foundation/NSArchiver.h>
-#include <objects/Coding.h>
+#include <gnustep/base/Coding.h>
 
 @interface NSGArchiver : NSArchiver
 @end

Headers/gnustep/base/NSGArray.h

@@ -24,9 +24,9 @@
 #ifndef __NSGArray_h_OBJECTS_INCLUDE
 #define __NSGArray_h_OBJECTS_INCLUDE
 
-#include <objects/stdobjects.h>
+#include <gnustep/base/prefix.h>
 #include <Foundation/NSArray.h>
-#include <objects/Array.h>
+#include <gnustep/base/Array.h>
 
 @interface NSGArray : NSArray
 {

Headers/gnustep/base/NSGCString.h

@@ -24,7 +24,7 @@
 #ifndef __NSGCString_h_OBJECTS_INCLUDE
 #define __NSGCString_h_OBJECTS_INCLUDE
 
-#include <objects/stdobjects.h>
+#include <gnustep/base/prefix.h>
 #include <Foundation/NSString.h>
 
 /* NSGCString and NSGMutableCString must have the same initial ivar layout

Headers/gnustep/base/NSGData.h

@@ -24,14 +24,14 @@
 #ifndef __NSGData_h_OBJECTS_INCLUDE
 #define __NSGData_h_OBJECTS_INCLUDE
 
-#include <objects/stdobjects.h>
+#include <gnustep/base/prefix.h>
 #include <Foundation/NSData.h>
-#include <objects/MemoryStream.h>
+#include <gnustep/base/MemoryStream.h>
 
 @interface NSGData : NSData
 {
   /* For now, these must match the instance variables in 
-     objects/MemoryStream.h.
+     gnustep/base/MemoryStream.h.
      This will change. */
   int type;
   char *buffer;
@@ -49,7 +49,7 @@
 @interface NSGMutableData : NSMutableData
 {
   /* For now, these must match the instance variables in 
-     objects/MemoryStream.h.
+     gnustep/base/MemoryStream.h.
      This will change. */
   int type;
   char *buffer;

Headers/gnustep/base/NSGDictionary.h

@@ -24,9 +24,9 @@
 #ifndef __NSGDictionary_h_OBJECTS_INCLUDE
 #define __NSGDictionary_h_OBJECTS_INCLUDE
 
-#include <objects/stdobjects.h>
+#include <gnustep/base/prefix.h>
 #include <Foundation/NSDictionary.h>
-#include <objects/Dictionary.h>
+#include <gnustep/base/Dictionary.h>
 
 @interface NSGDictionary : NSDictionary
 @end

Headers/gnustep/base/NSGSet.h

@@ -24,10 +24,10 @@
 #ifndef __NSGSet_h_OBJECTS_INCLUDE
 #define __NSGSet_h_OBJECTS_INCLUDE
 
-#include <objects/stdobjects.h>
+#include <gnustep/base/prefix.h>
 #include <Foundation/NSSet.h>
-#include <objects/Set.h>
-#include <objects/Bag.h>
+#include <gnustep/base/Set.h>
+#include <gnustep/base/Bag.h>
 
 @interface NSGSet : NSSet
 @end

Headers/gnustep/base/NSHashTable.h

@@ -30,7 +30,7 @@
 #include <Foundation/NSObject.h>
 #include <Foundation/NSString.h>
 #include <Foundation/NSArray.h>
-#include <objects/hash.h>
+#include <gnustep/base/hash.h>
 
 /**** Type, Constant, and Macro Definitions **********************************/
 

Headers/gnustep/base/NSInvocation.h

@@ -24,7 +24,7 @@
 #ifndef __NSInvocation_h_OBJECTS_INCLUDE
 #define __NSInvocation_h_OBJECTS_INCLUDE
 
-#include <objects/stdobjects.h>
+#include <gnustep/base/prefix.h>
 
 @class NSMethodSignature;
 

Headers/gnustep/base/NSMapTable.h

@@ -30,7 +30,7 @@
 #include <Foundation/NSObject.h>
 #include <Foundation/NSString.h>
 #include <Foundation/NSArray.h>
-#include <objects/map.h>
+#include <gnustep/base/map.h>
 
 /**** Type, Constant, and Macro Definitions **********************************/
 

Headers/gnustep/base/NSNotification.h

@@ -24,8 +24,8 @@
 #ifndef __NSNotification_h_OBJECTS_INCLUDE
 #define __NSNotification_h_OBJECTS_INCLUDE
 
-#include <objects/stdobjects.h>
-#include <objects/Notification.h>
+#include <gnustep/base/prefix.h>
+#include <gnustep/base/Notification.h>
 
 @class NSString;
 @class NSDictionary;

Headers/gnustep/base/NSRunLoop.h

@@ -24,7 +24,7 @@
 #ifndef __NSRunLoop_h_OBJECTS_INCLUDE
 #define __NSRunLoop_h_OBJECTS_INCLUDE
 
-#include <objects/stdobjects.h>
+#include <gnustep/base/prefix.h>
 
 @class NSTimer, NSDate;
 

Headers/gnustep/base/NSSet.h

@@ -24,7 +24,7 @@
 #ifndef _NSSet_h_OBJECTS_INCLUDE
 #define _NSSet_h_OBJECTS_INCLUDE
 
-#include <objects/stdobjects.h>
+#include <gnustep/base/prefix.h>
 
 @class NSArray, NSString, NSEnumerator, NSDictionary;
 
@@ -93,7 +93,7 @@
 
 #ifndef NO_GNUSTEP
 
-#include <objects/KeyedCollecting.h>
+#include <gnustep/base/KeyedCollecting.h>
 #include <Foundation/NSSet.h>
 
 /* Eventually we'll make a Constant version of this protocol. */

Headers/gnustep/base/NSString.h

@@ -24,7 +24,7 @@
 #ifndef __NSString_h_OBJECTS_INCLUDE
 #define __NSString_h_OBJECTS_INCLUDE
 
-#include <objects/stdobjects.h>
+#include <gnustep/base/prefix.h>
 #include <Foundation/NSRange.h>
 
 typedef unsigned short unichar;
@@ -278,8 +278,8 @@ compiler warning.
 
 #ifndef NO_GNUSTEP
 
-#include <objects/IndexedCollecting.h>
-#include <objects/String.h>
+#include <gnustep/base/IndexedCollecting.h>
+#include <gnustep/base/String.h>
 
 @interface NSString (GNU) <String,IndexedCollecting>
 @end

Headers/gnustep/base/NSTimer.h

@@ -27,7 +27,7 @@
 /* This class is currently thrown together.  When it is cleaned up, it
    may no longer be concrete. */
 
-#include <objects/stdobjects.h>
+#include <gnustep/base/prefix.h>
 #include <Foundation/NSDate.h>
 
 @interface NSTimer : NSObject

Headers/gnustep/base/NSZone.h

@@ -31,7 +31,7 @@
 #else
 #include <stdio.h>
 #include <stdlib.h>
-#include <objects/config.h>
+#include <gnustep/base/config.h>
 
 @class NSString;
 

Headers/gnustep/base/Notification.h

@@ -24,10 +24,10 @@
 #ifndef __Notification_h_OBJECTS_INCLUDE
 #define __Notification_h_OBJECTS_INCLUDE
 
-#include <objects/stdobjects.h>
-#include <objects/NSString.h>
-#include <objects/KeyedCollecting.h>
-#include <objects/NotificationDispatcher.h>
+#include <gnustep/base/prefix.h>
+#include <gnustep/base/NSString.h>
+#include <gnustep/base/KeyedCollecting.h>
+#include <gnustep/base/NotificationDispatcher.h>
 
 @protocol Notifying
 - (id <String>) name;

Headers/gnustep/base/NotificationDispatcher.h

@@ -56,11 +56,11 @@
 
    */
 
-#include <objects/stdobjects.h>
-#include <objects/LinkedList.h>
-#include <objects/Array.h>
+#include <gnustep/base/prefix.h>
+#include <gnustep/base/LinkedList.h>
+#include <gnustep/base/Array.h>
 #include <Foundation/NSMapTable.h>
-#include <objects/NSString.h>
+#include <gnustep/base/NSString.h>
 
 @interface NotificationDispatcher : NSObject
 {

Headers/gnustep/base/OrderedCollecting.h

@@ -35,8 +35,8 @@
 #ifndef __OrderedCollecting_h_OBJECTS_INCLUDE
 #define __OrderedCollecting_h_OBJECTS_INCLUDE
 
-#include <objects/stdobjects.h>
-#include <objects/IndexedCollecting.h>
+#include <gnustep/base/prefix.h>
+#include <gnustep/base/IndexedCollecting.h>
 
 @protocol OrderedCollecting <IndexedCollecting>
 

Headers/gnustep/base/OrderedCollection.h

@@ -24,9 +24,9 @@
 #ifndef __OrderedCollection_h_INCLUDE_GNU
 #define __OrderedCollection_h_INCLUDE_GNU
 
-#include <objects/stdobjects.h>
-#include <objects/IndexedCollection.h>
-#include <objects/OrderedCollecting.h>
+#include <gnustep/base/prefix.h>
+#include <gnustep/base/IndexedCollection.h>
+#include <gnustep/base/OrderedCollecting.h>
 
 @interface OrderedCollection : IndexedCollection
 @end

Headers/gnustep/base/Ordering.h

@@ -24,7 +24,7 @@
 #ifndef __Ordering_h_INCLUDE_GNU
 #define __Ordering_h_INCLUDE_GNU
 
-#include <objects/stdobjects.h>
+#include <gnustep/base/prefix.h>
 #include <objc/objc.h>
 
 @protocol Ordering

Headers/gnustep/base/Port.h

@@ -24,10 +24,10 @@
 #ifndef __Port_h_OBJECTS_INCLUDE
 #define __Port_h_OBJECTS_INCLUDE
 
-#include <objects/stdobjects.h>
-#include <objects/Coding.h>
-#include <objects/MemoryStream.h>
-#include <objects/NSString.h>
+#include <gnustep/base/prefix.h>
+#include <gnustep/base/Coding.h>
+#include <gnustep/base/MemoryStream.h>
+#include <gnustep/base/NSString.h>
 
 /* xxx Use something like this? */
 @protocol PacketSending

Headers/gnustep/base/Proxy.h

@@ -24,9 +24,9 @@
 #ifndef __Proxy_h_OBJECTS_INCLUDE
 #define __Proxy_h_OBJECTS_INCLUDE
 
-#include <objects/stdobjects.h>
-#include <objects/Connection.h>
-#include <objects/Retaining.h>
+#include <gnustep/base/prefix.h>
+#include <gnustep/base/Connection.h>
+#include <gnustep/base/Retaining.h>
 
 @class ConnectedCoder;
 

Headers/gnustep/base/Queue.h

@@ -24,8 +24,8 @@
 #ifndef __Queue_h_INCLUDE_GNU
 #define __Queue_h_INCLUDE_GNU
 
-#include <objects/stdobjects.h>
-#include <objects/CircularArray.h>
+#include <gnustep/base/prefix.h>
+#include <gnustep/base/CircularArray.h>
 
 @interface Queue : CircularArray
 

Headers/gnustep/base/RBTree.h

@@ -24,8 +24,8 @@
 #ifndef __RBTree_h_INCLUDE_GNU
 #define __RBTree_h_INCLUDE_GNU
 
-#include <objects/stdobjects.h>
-#include <objects/BinaryTree.h>
+#include <gnustep/base/prefix.h>
+#include <gnustep/base/BinaryTree.h>
 
 @protocol RBTreeComprising <BinaryTreeComprising>
 - (BOOL) isRed;

Headers/gnustep/base/RBTreeEltNode.h

@@ -24,12 +24,12 @@
 #ifndef __RBTreeEltNode_h_INCLUDE_GNU
 #define __RBTreeEltNode_h_INCLUDE_GNU
 
-#include <objects/stdobjects.h>
-#include <objects/RBTreeNode.h>
-#include <objects/EltNodeCollector.h>
+#include <gnustep/base/prefix.h>
+#include <gnustep/base/RBTreeNode.h>
+#include <gnustep/base/EltNodeCollector.h>
 
 @interface RBTreeEltNode : RBTreeNode
-#include <objects/EltNode-h>
+#include <gnustep/base/EltNode-h>
 @end
 
 #endif /* __RBTreeEltNode_h_INCLUDE_GNU */

Headers/gnustep/base/RBTreeNode.h

@@ -24,9 +24,9 @@
 #ifndef __RBTreeNode_h_INCLUDE_GNU
 #define __RBTreeNode_h_INCLUDE_GNU
 
-#include <objects/stdobjects.h>
-#include <objects/BinaryTreeNode.h>
-#include <objects/RBTree.h>
+#include <gnustep/base/prefix.h>
+#include <gnustep/base/BinaryTreeNode.h>
+#include <gnustep/base/RBTree.h>
 
 @interface RBTreeNode : BinaryTreeNode <RBTreeComprising>
 {

Headers/gnustep/base/RNGAdditiveCongruential.h

@@ -27,8 +27,8 @@
 #ifndef __RNGAdditiveCongruential_h_INCLUDE_GNU
 #define __RNGAdditiveCongruential_h_INCLUDE_GNU
 
-#include <objects/stdobjects.h>
-#include <objects/RandomGenerating.h>
+#include <gnustep/base/prefix.h>
+#include <gnustep/base/RandomGenerating.h>
 
 @interface RNGAdditiveCongruential : NSObject <RandomGenerating>
 {

Headers/gnustep/base/RNGBerkeley.h

@@ -47,8 +47,8 @@
  * It was reworked for the GNU Objective-C Library by R. Andrew McCallum
  */
 
-#include <objects/stdobjects.h>
-#include <objects/RandomGenerating.h>
+#include <gnustep/base/prefix.h>
+#include <gnustep/base/RandomGenerating.h>
 
 @interface RNGBerkeley : NSObject <RandomGenerating>
 {

Headers/gnustep/base/Random.h

@@ -24,8 +24,8 @@
 #ifndef __Random_h_INCLUDE_GNU
 #define __Random_h_INCLUDE_GNU
 
-#include <objects/stdobjects.h>
-#include <objects/RandomGenerating.h>
+#include <gnustep/base/prefix.h>
+#include <gnustep/base/RandomGenerating.h>
 
 @interface Random : NSObject
 {

Headers/gnustep/base/RandomGenerating.h

@@ -24,7 +24,7 @@
 #ifndef __RandomGenerating_h_INCLUDE_GNU
 #define __RandomGenerating_h_INCLUDE_GNU
 
-#include <objects/stdobjects.h>
+#include <gnustep/base/prefix.h>
 
 @protocol RandomGenerating <NSObject, NSCoding>
 

Headers/gnustep/base/RawCStream.h

@@ -24,9 +24,9 @@
 #ifndef __RawCStream_h_OBJECTS_INCLUDE
 #define __RawCStream_h_OBJECTS_INCLUDE
 
-#include <objects/stdobjects.h>
-#include <objects/Stream.h>
-#include <objects/CStream.h>
+#include <gnustep/base/prefix.h>
+#include <gnustep/base/Stream.h>
+#include <gnustep/base/CStream.h>
 
 @interface RawCStream : CStream
 

Headers/gnustep/base/Retaining.h

@@ -24,7 +24,7 @@
 #ifndef __Retaining_h_OBJECTS_INCLUDE
 #define __Retaining_h_OBJECTS_INCLUDE
 
-#include <objects/stdobjects.h>
+#include <gnustep/base/prefix.h>
 
 @protocol Retaining
 

Headers/gnustep/base/RetainingNotifier.h

@@ -31,10 +31,10 @@
 #ifndef __RetainingNotifier_h
 #define __RetainingNotifier_h
 
-#include <objects/stdobjects.h>
-#include <objects/Lock.h>
-#include <objects/InvalidationListening.h>
-#include <objects/Retaining.h>
+#include <gnustep/base/prefix.h>
+#include <gnustep/base/Lock.h>
+#include <gnustep/base/InvalidationListening.h>
+#include <gnustep/base/Retaining.h>
 
 @interface RetainingNotifier : NSObject <Retaining>
 {

Headers/gnustep/base/RunLoop.h

@@ -1,9 +1,9 @@
 #ifndef __RunLoop_h_OBJECTS_INCLUDE
 #define __RunLoop_h_OBJECTS_INCLUDE
 
-#include <objects/stdobjects.h>
-#include <objects/NotificationDispatcher.h>
-#include <objects/Set.h>
+#include <gnustep/base/prefix.h>
+#include <gnustep/base/NotificationDispatcher.h>
+#include <gnustep/base/Set.h>
 #include <Foundation/NSMapTable.h>
 #include <sys/types.h>
 

Headers/gnustep/base/Set.h

@@ -24,8 +24,8 @@
 #ifndef __Set_h_OBJECTS_INCLUDE
 #define __Set_h_OBJECTS_INCLUDE
 
-#include <objects/stdobjects.h>
-#include <objects/Collection.h>
+#include <gnustep/base/prefix.h>
+#include <gnustep/base/Collection.h>
 #include <Foundation/NSHashTable.h>
 
 @interface Set : Collection

Headers/gnustep/base/SmallInt.h

@@ -24,7 +24,7 @@
 #ifndef __SmallInt_h_INCLUDE_GNU
 #define __SmallInt_h_INCLUDE_GNU
 
-#include <objects/stdobjects.h>
+#include <gnustep/base/prefix.h>
 
 #define IS_SMALLINT(OBJ) (((void*)OBJ) & 0x1)
 #define ID2INT(OBJ) ((IS_SMALLINT(OBJ)) ? (((int)OBJ) >> 1):[OBJ intValue])

Headers/gnustep/base/SocketPort.h

@@ -24,8 +24,8 @@
 #ifndef __SocketPort_h_INCLUDE_GNU
 #define __SocketPort_h_INCLUDE_GNU
 
-#include <objects/stdobjects.h>
-#include <objects/Port.h>
+#include <gnustep/base/prefix.h>
+#include <gnustep/base/Port.h>
 
 #include <sys/types.h>
 

Headers/gnustep/base/SplayTree.h

@@ -34,8 +34,8 @@
 #ifndef __SplayTree_h_INCLUDE_GNU
 #define __SplayTree_h_INCLUDE_GNU
 
-#include <objects/stdobjects.h>
-#include <objects/BinaryTree.h>
+#include <gnustep/base/prefix.h>
+#include <gnustep/base/BinaryTree.h>
 
 @interface SplayTree : BinaryTree
 {

Headers/gnustep/base/Stack.h

@@ -24,8 +24,8 @@
 #ifndef __Stack_h_INCLUDE_GNU
 #define __Stack_h_INCLUDE_GNU
 
-#include <objects/stdobjects.h>
-#include <objects/Array.h>
+#include <gnustep/base/prefix.h>
+#include <gnustep/base/Array.h>
 
 @interface Stack : Array
 

Headers/gnustep/base/StdioStream.h

@@ -24,8 +24,8 @@
 #ifndef __StdioStream_h__OBJECTS_INCLUDE
 #define __StdioStream_h__OBJECTS_INCLUDE
 
-#include <objects/stdobjects.h>
-#include <objects/Stream.h>
+#include <gnustep/base/prefix.h>
+#include <gnustep/base/Stream.h>
 #include <stdio.h>
 
 @interface StdioStream : Stream

Headers/gnustep/base/Stream.h

@@ -24,8 +24,8 @@
 #ifndef __Stream_h__OBJECTS_INCLUDE
 #define __Stream_h__OBJECTS_INCLUDE
 
-#include <objects/stdobjects.h>
-#include <objects/Streaming.h>
+#include <gnustep/base/prefix.h>
+#include <gnustep/base/Streaming.h>
 
 @interface Stream : NSObject <Streaming>
 

Headers/gnustep/base/Streaming.h

@@ -24,8 +24,8 @@
 #ifndef __Streaming_h__OBJECTS_INCLUDE
 #define __Streaming_h__OBJECTS_INCLUDE
 
-#include <objects/stdobjects.h>
-#include <objects/NSString.h>
+#include <gnustep/base/prefix.h>
+#include <gnustep/base/NSString.h>
 
 @protocol Streaming <NSObject>
 

Headers/gnustep/base/String.h

@@ -29,9 +29,9 @@
    Perhaps I'll just get rid of the GNU String objects and just
    transfer this functionality into NSSTring and friends. */
 
-#include <objects/stdobjects.h>
-#include <objects/IndexedCollection.h>
-#include <objects/ValueHolding.h>
+#include <gnustep/base/prefix.h>
+#include <gnustep/base/IndexedCollection.h>
+#include <gnustep/base/ValueHolding.h>
 #include <Foundation/NSString.h>
 #include <stdarg.h>
 

Headers/gnustep/base/TcpPort.h

@@ -24,9 +24,9 @@
 #ifndef __TcpPort_h__OBJECTS_INCLUDE
 #define __TcpPort_h__OBJECTS_INCLUDE
 
-#include <objects/stdobjects.h>
-#include <objects/Port.h>
-#include <objects/RunLoop.h>
+#include <gnustep/base/prefix.h>
+#include <gnustep/base/Port.h>
+#include <gnustep/base/RunLoop.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <netdb.h>

Headers/gnustep/base/TextCStream.h

@@ -24,9 +24,9 @@
 #ifndef __TextCStream_h_OBJECTS_INCLUDE
 #define __TextCStream_h_OBJECTS_INCLUDE
 
-#include <objects/stdobjects.h>
-#include <objects/Stream.h>
-#include <objects/CStream.h>
+#include <gnustep/base/prefix.h>
+#include <gnustep/base/Stream.h>
+#include <gnustep/base/CStream.h>
 
 @interface TextCStream : CStream
 

Headers/gnustep/base/Time.h

@@ -26,8 +26,8 @@
 #ifndef __Time_h_OBJECTS_INCLUDE
 #define __Time_h_OBJECTS_INCLUDE
 
-#include <objects/stdobjects.h>
-#include <objects/Magnitude.h>
+#include <gnustep/base/prefix.h>
+#include <gnustep/base/Magnitude.h>
 
 #ifndef WIN32
 #include <sys/time.h>

Headers/gnustep/base/UdpPort.h

@@ -24,8 +24,8 @@
 #ifndef __UdpPort_h_INCLUDE_GNU
 #define __UdpPort_h_INCLUDE_GNU
 
-#include <objects/stdobjects.h>
-#include <objects/Port.h>
+#include <gnustep/base/prefix.h>
+#include <gnustep/base/Port.h>
 #include <sys/types.h>
 #ifndef WIN32
 # include <sys/socket.h>

Headers/gnustep/base/ValueHolding.h

@@ -24,7 +24,7 @@
 #ifndef __ValueHolding_h_INCLUDE_GNU
 #define __ValueHolding_h_INCLUDE_GNU
 
-#include <objects/stdobjects.h>
+#include <gnustep/base/prefix.h>
 
 /* protocol String; */
 

Headers/gnustep/base/all.h

@@ -24,51 +24,51 @@
 #ifndef __objects_h_OBJECTS_INCLUDE
 #define __objects_h_OBJECTS_INCLUDE
 
-#include <objects/stdobjects.h>
+#include <gnustep/base/prefix.h>
 
 /* Collection objects */
-#include <objects/Set.h>
-#include <objects/Bag.h>
-#include <objects/Dictionary.h>
-#include <objects/Array.h>
-#include <objects/Stack.h>
-#include <objects/Queue.h>
-#include <objects/GapArray.h>
-#include <objects/CircularArray.h>
-#include <objects/DelegatePool.h>
-#include <objects/MappedCollector.h>
-#include <objects/Heap.h>
-#include <objects/LinkedList.h>
-#include <objects/LinkedListNode.h>
-#include <objects/BinaryTree.h>
-#include <objects/BinaryTreeNode.h>
-#include <objects/RBTree.h>
-#include <objects/RBTreeNode.h>
-#include <objects/SplayTree.h>
+#include <gnustep/base/Set.h>
+#include <gnustep/base/Bag.h>
+#include <gnustep/base/Dictionary.h>
+#include <gnustep/base/Array.h>
+#include <gnustep/base/Stack.h>
+#include <gnustep/base/Queue.h>
+#include <gnustep/base/GapArray.h>
+#include <gnustep/base/CircularArray.h>
+#include <gnustep/base/DelegatePool.h>
+#include <gnustep/base/MappedCollector.h>
+#include <gnustep/base/Heap.h>
+#include <gnustep/base/LinkedList.h>
+#include <gnustep/base/LinkedListNode.h>
+#include <gnustep/base/BinaryTree.h>
+#include <gnustep/base/BinaryTreeNode.h>
+#include <gnustep/base/RBTree.h>
+#include <gnustep/base/RBTreeNode.h>
+#include <gnustep/base/SplayTree.h>
 
 /* Magnitude objects */
-#include <objects/Magnitude.h>
-#include <objects/Random.h>
-#include <objects/Time.h>
+#include <gnustep/base/Magnitude.h>
+#include <gnustep/base/Random.h>
+#include <gnustep/base/Time.h>
 
 /* Stream objects */
-#include <objects/Stream.h>
-#include <objects/StdioStream.h>
-#include <objects/MemoryStream.h>
+#include <gnustep/base/Stream.h>
+#include <gnustep/base/StdioStream.h>
+#include <gnustep/base/MemoryStream.h>
 
 /* Coder objects */
-#include <objects/Coder.h>
-#include <objects/BinaryCStream.h>
-#include <objects/TextCStream.h>
+#include <gnustep/base/Coder.h>
+#include <gnustep/base/BinaryCStream.h>
+#include <gnustep/base/TextCStream.h>
 
 /* Port objects */
-#include <objects/Port.h>
+#include <gnustep/base/Port.h>
 
 /* Remote messaging support objects */
-#include <objects/Connection.h>
-#include <objects/Proxy.h>
-#include <objects/ConnectedCoder.h>
+#include <gnustep/base/Connection.h>
+#include <gnustep/base/Proxy.h>
+#include <gnustep/base/ConnectedCoder.h>
 
-#include <objects/Invocation.h>
+#include <gnustep/base/Invocation.h>
 
 #endif /* __objects_h_OBJECTS_INCLUDE */

Headers/gnustep/base/array.h

@@ -29,8 +29,8 @@
 
 #include <stdlib.h>
 #include <Foundation/NSZone.h>
-#include <objects/callbacks.h>
-#include <objects/hash.h>
+#include <gnustep/base/callbacks.h>
+#include <gnustep/base/hash.h>
 
 /**** Type, Constant, and Macro Definitions **********************************/
 
@@ -82,8 +82,8 @@ struct _objects_array_enumerator
 
 /** Basics **/
 
-#include <objects/array-bas.h>
-#include <objects/array-cbs.h>
+#include <gnustep/base/array-bas.h>
+#include <gnustep/base/array-cbs.h>
 
 /** Creating **/