Makefile changes to compile thinkg in place.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@3496 72102866-910b-0410-8b05-ffd578937521
2025-04-23 09:04:13 +00:00 · 1998-12-20 21:27:47 +00:00 · 1998-12-20 21:27:47 +00:00 · 52f6bc90ae
commit 52f6bc90ae
parent e44ff32bbe
259 changed files with 620 additions and 753 deletions
--- a/16
+++ b/16
@ -1,3 +1,19 @@
+Sat Dec 19 01:26:06 1998  Matthias Klose  <doko@cs.tu-berlin.de>
+
+        * NSCharacterSets/Makefile.postamble: Use macro MKDIRS.
+        * NSTimeZones/Makefile.postamble: likewise
+        * src/Makefile.postamble: likewise
+
+Sat Dec 19 10:45:58 1998  Adam Fedor  <fedor@ultra.doc.com>
+
+	* src/mframe/configure.in: Test for empty subdir (patch from
+ 	Matthias Klose <doko@cs.tu-berlin.de>).
+
+Fri Dec 18 14:39:46 1998  Matthias Klose  <doko@cs.tu-berlin.de> 
+ 
+        * */*: include <base/*.h> instead of <gnustep/base/*.h>. 
+        * src/Makefile.postamble: reflect this change in srcdir-include. 
+
 Fri Dec 18 18:15:00 1998  Richard Frith-Macdonald <richard@brainstorm.co.uk>

        Foundation.h: Added NSPathUtilities.h
--- a/Examples/dictionary.m
+++ b/Examples/dictionary.m
@ -1,7 +1,7 @@
 /* A simple demonstration of the GNU Dictionary object.
   In this example the Dictionary holds int's which are keyed by strings. */

-#include <gnustep/base/Dictionary.h>
+#include <base/Dictionary.h>
 #include <Foundation/NSValue.h>
 #include <Foundation/NSString.h>

--- a/Examples/stdio-stream.m
+++ b/Examples/stdio-stream.m
@ -1,7 +1,7 @@
 /* A simple example of writing and reading to a file using the 
   GNU StdioStream object. */

-#include <gnustep/base/StdioStream.h>
+#include <base/StdioStream.h>
 #include <Foundation/NSString.h>

 int main()
--- a/Examples/textcoding.m
+++ b/Examples/textcoding.m
@ -4,10 +4,10 @@
   text archive format.
   */

-#include <gnustep/base/Archiver.h>
-#include <gnustep/base/TextCStream.h>
-#include <gnustep/base/Array.h>
-#include <gnustep/base/Dictionary.h>
+#include <base/Archiver.h>
+#include <base/TextCStream.h>
+#include <base/Array.h>
+#include <base/Dictionary.h>
 #include <Foundation/NSString.h>
 #include <Foundation/NSAutoreleasePool.h>
 #include <Foundation/NSValue.h>
--- a/Headers/gnustep/base/Archiver.h
+++ b/Headers/gnustep/base/Archiver.h
@ -24,8 +24,8 @@
 #ifndef __Archiver_h_GNUSTEP_BASE_INCLUDE
 #define __Archiver_h_GNUSTEP_BASE_INCLUDE

-#include <gnustep/base/preface.h>
-#include <gnustep/base/Coder.h>
+#include <base/preface.h>
+#include <base/Coder.h>

 /* Eventually some functionality may be moved out of Coder and
   into these objects.  
--- a/Headers/gnustep/base/Array.h
+++ b/Headers/gnustep/base/Array.h
@ -24,9 +24,9 @@
 #ifndef __Array_h_GNUSTEP_BASE_INCLUDE
 #define __Array_h_GNUSTEP_BASE_INCLUDE

-#include <gnustep/base/preface.h>
-#include <gnustep/base/IndexedCollection.h>
-#include <gnustep/base/OrderedCollecting.h>
+#include <base/preface.h>
+#include <base/IndexedCollection.h>
+#include <base/OrderedCollecting.h>

@interface ConstantArray : ConstantIndexedCollection
 {
--- a/Headers/gnustep/base/ArrayPrivate.h
+++ b/Headers/gnustep/base/ArrayPrivate.h
@ -24,8 +24,8 @@
 #ifndef __ArrayPrivate_h_GNUSTEP_BASE_INCLUDE
 #define __ArrayPrivate_h_GNUSTEP_BASE_INCLUDE

-#include <gnustep/base/preface.h>
-#include <gnustep/base/IndexedCollectionPrivate.h>
+#include <base/preface.h>
+#include <base/IndexedCollectionPrivate.h>

 #define DEFAULT_ARRAY_CAPACITY 2
 #define DEFAULT_ARRAY_GROW_FACTOR 2
--- a/Headers/gnustep/base/Bag.h
+++ b/Headers/gnustep/base/Bag.h
@ -24,8 +24,8 @@
 #ifndef __Bag_h_GNUSTEP_BASE_INCLUDE
 #define __Bag_h_GNUSTEP_BASE_INCLUDE

-#include <gnustep/base/preface.h>
-#include <gnustep/base/Collection.h>
+#include <base/preface.h>
+#include <base/Collection.h>
 #include <Foundation/NSMapTable.h>

@interface Bag : Collection
--- a/Headers/gnustep/base/BinaryCStream.h
+++ b/Headers/gnustep/base/BinaryCStream.h
@ -24,9 +24,9 @@
 #ifndef __BinaryCStream_h_GNUSTEP_BASE_INCLUDE
 #define __BinaryCStream_h_GNUSTEP_BASE_INCLUDE

-#include <gnustep/base/preface.h>
-#include <gnustep/base/Stream.h>
-#include <gnustep/base/CStream.h>
+#include <base/preface.h>
+#include <base/Stream.h>
+#include <base/CStream.h>

@interface BinaryCStream : CStream
 {
--- a/Headers/gnustep/base/BinaryTree.h
+++ b/Headers/gnustep/base/BinaryTree.h
@ -29,8 +29,8 @@
 #ifndef __BinaryTree_h_GNUSTEP_BASE_INCLUDE
 #define __BinaryTree_h_GNUSTEP_BASE_INCLUDE

-#include <gnustep/base/preface.h>
-#include <gnustep/base/IndexedCollection.h>
+#include <base/preface.h>
+#include <base/IndexedCollection.h>

 /* The <BinaryTreeComprising> protocol defines the interface to an object
   that may be an element in a BinaryTree. 
--- a/Headers/gnustep/base/BinaryTreeNode.h
+++ b/Headers/gnustep/base/BinaryTreeNode.h
@ -24,9 +24,9 @@
 #ifndef __BinaryTreeNode_h_GNUSTEP_BASE_INCLUDE
 #define __BinaryTreeNode_h_GNUSTEP_BASE_INCLUDE

-#include <gnustep/base/preface.h>
-#include <gnustep/base/BinaryTree.h>
-#include <gnustep/base/Coding.h>
+#include <base/preface.h>
+#include <base/BinaryTree.h>
+#include <base/Coding.h>

@interface BinaryTreeNode : NSObject <BinaryTreeComprising>
 {
--- a/Headers/gnustep/base/CStream.h
+++ b/Headers/gnustep/base/CStream.h
@ -24,9 +24,9 @@
 #ifndef __CStream_h_GNUSTEP_BASE_INCLUDE
 #define __CStream_h_GNUSTEP_BASE_INCLUDE

-#include <gnustep/base/preface.h>
-#include <gnustep/base/Stream.h>
-#include <gnustep/base/CStreaming.h>
+#include <base/preface.h>
+#include <base/Stream.h>
+#include <base/CStreaming.h>

@interface CStream : Stream <CStreaming>
 {
--- a/Headers/gnustep/base/CStreaming.h
+++ b/Headers/gnustep/base/CStreaming.h
@ -24,8 +24,8 @@
 #ifndef __CStreaming_h__GNUSTEP_BASE_INCLUDE
 #define __CStreaming_h__GNUSTEP_BASE_INCLUDE

-#include <gnustep/base/preface.h>
-#include <gnustep/base/Streaming.h>
+#include <base/preface.h>
+#include <base/Streaming.h>

@protocol CStreaming <Streaming>

--- a/Headers/gnustep/base/CircularArray.h
+++ b/Headers/gnustep/base/CircularArray.h
@ -24,8 +24,8 @@
 #ifndef __CircularArray_h_GNUSTEP_BASE_INCLUDE
 #define __CircularArray_h_GNUSTEP_BASE_INCLUDE

-#include <gnustep/base/preface.h>
-#include <gnustep/base/Array.h>
+#include <base/preface.h>
+#include <base/Array.h>

@interface CircularArray : Array
 {
--- a/Headers/gnustep/base/CircularArrayPrivate.h
+++ b/Headers/gnustep/base/CircularArrayPrivate.h
@ -24,8 +24,8 @@
 #ifndef __CircularArrayPrivate_h_GNUSTEP_BASE_INCLUDE
 #define __CircularArrayPrivate_h_GNUSTEP_BASE_INCLUDE

-#include <gnustep/base/preface.h>
-#include <gnustep/base/ArrayPrivate.h>
+#include <base/preface.h>
+#include <base/ArrayPrivate.h>

 #define CIRCULAR_TO_BASIC(INDEX) \
  ((INDEX + self->_start_index) % self->_capacity)
--- a/Headers/gnustep/base/Coder.h
+++ b/Headers/gnustep/base/Coder.h
@ -24,9 +24,9 @@
 #ifndef __Coder_h_GNUSTEP_BASE_INCLUDE
 #define __Coder_h_GNUSTEP_BASE_INCLUDE

-#include <gnustep/base/preface.h>
-#include <gnustep/base/Coding.h>
-#include <gnustep/base/Streaming.h>
+#include <base/preface.h>
+#include <base/Coding.h>
+#include <base/Streaming.h>
 #include <Foundation/NSHashTable.h>
 #include <Foundation/NSMapTable.h>

--- a/Headers/gnustep/base/CoderPrivate.h
+++ b/Headers/gnustep/base/CoderPrivate.h
@ -24,9 +24,9 @@
 #ifndef __CoderPrivate_h_GNUSTEP_BASE_INCLUDE
 #define __CoderPrivate_h_GNUSTEP_BASE_INCLUDE

-#include <gnustep/base/preface.h>
-#include <gnustep/base/Coder.h>
-#include <gnustep/base/CStreaming.h>
+#include <base/preface.h>
+#include <base/Coder.h>
+#include <base/CStreaming.h>

 enum {
  CODER_OBJECT_NIL = 0, 
--- a/Headers/gnustep/base/Coding.h
+++ b/Headers/gnustep/base/Coding.h
@ -24,9 +24,9 @@
 #ifndef __Coding_h_GNUSTEP_BASE_INCLUDE
 #define __Coding_h_GNUSTEP_BASE_INCLUDE

-#include <gnustep/base/preface.h>
+#include <base/preface.h>

-/* #include <gnustep/base/String.h>
+/* #include <base/String.h>
   xxx Think about trying to get <String> back in types,
   but now there is a circular dependancy in the include files. */

--- a/Headers/gnustep/base/Collecting.h
+++ b/Headers/gnustep/base/Collecting.h
@ -34,10 +34,10 @@
 #ifndef __Collecting_h_GNUSTEP_BASE_INCLUDE
 #define __Collecting_h_GNUSTEP_BASE_INCLUDE

-#include <gnustep/base/preface.h>
-#include <gnustep/base/Coding.h>
-#include <gnustep/base/Invoking.h>
-#include <gnustep/base/Enumerating.h>
+#include <base/preface.h>
+#include <base/Coding.h>
+#include <base/Invoking.h>
+#include <base/Enumerating.h>

@protocol ConstantCollecting <NSObject>

--- a/Headers/gnustep/base/Collection.h
+++ b/Headers/gnustep/base/Collection.h
@ -28,11 +28,11 @@
 #ifndef __Collection_h_GNUSTEP_BASE_INCLUDE
 #define __Collection_h_GNUSTEP_BASE_INCLUDE

-#include <gnustep/base/preface.h>
+#include <base/preface.h>
 #include <Foundation/NSObject.h>
-#include <gnustep/base/Collecting.h>
-#include <gnustep/base/preface.h>
-#include <gnustep/base/Coding.h>
+#include <base/Collecting.h>
+#include <base/preface.h>
+#include <base/Coding.h>

@interface ConstantCollection : NSObject <ConstantCollecting>
 - printForDebugger;  /* This method will disappear later. */
--- a/Headers/gnustep/base/CollectionPrivate.h
+++ b/Headers/gnustep/base/CollectionPrivate.h
@ -24,7 +24,7 @@
 #ifndef __CollectionPrivate_h_GNUSTEP_BASE_INCLUDE
 #define __CollectionPrivate_h_GNUSTEP_BASE_INCLUDE

-#include <gnustep/base/preface.h>
+#include <base/preface.h>

@interface ConstantCollection (ArchivingHelpers)
 /* These methods should never be called except in order, and inside 
--- a/Headers/gnustep/base/ConnectedCoder.h
+++ b/Headers/gnustep/base/ConnectedCoder.h
@ -24,9 +24,9 @@
 #ifndef __ConnectedCoder_h
 #define __ConnectedCoder_h

-#include <gnustep/base/preface.h>
-#include <gnustep/base/Coder.h>
-#include <gnustep/base/Port.h>
+#include <base/preface.h>
+#include <base/Coder.h>
+#include <base/Port.h>

 /* ConnectedCoder identifiers */
 enum {
--- a/Headers/gnustep/base/DelegatePool.h
+++ b/Headers/gnustep/base/DelegatePool.h
@ -28,8 +28,8 @@
 #ifndef __DelegatePool_h_GNUSTEP_BASE_INCLUDE
 #define __DelegatePool_h_GNUSTEP_BASE_INCLUDE

-#include <gnustep/base/preface.h>
-#include <gnustep/base/Array.h>
+#include <base/preface.h>
+#include <base/Array.h>

 /* Available sending behaviors */
 enum DelegatePoolSendBehavior {SEND_TO_ALL = 0, 
--- a/Headers/gnustep/base/Dictionary.h
+++ b/Headers/gnustep/base/Dictionary.h
@ -24,8 +24,8 @@
 #ifndef __Dictionary_h_GNUSTEP_BASE_INCLUDE
 #define __Dictionary_h_GNUSTEP_BASE_INCLUDE

-#include <gnustep/base/preface.h>
-#include <gnustep/base/KeyedCollection.h>
+#include <base/preface.h>
+#include <base/KeyedCollection.h>
 #include <Foundation/NSMapTable.h>

@interface Dictionary : KeyedCollection
--- a/Headers/gnustep/base/Enumerating.h
+++ b/Headers/gnustep/base/Enumerating.h
@ -24,7 +24,7 @@
 #ifndef __Enumerating_h__GNUSTEP_BASE_INCLUDE
 #define __Enumerating_h__GNUSTEP_BASE_INCLUDE

-#include <gnustep/base/preface.h>
+#include <base/preface.h>

@protocol Enumerating <NSObject>

--- a/Headers/gnustep/base/GapArray.h
+++ b/Headers/gnustep/base/GapArray.h
@ -24,8 +24,8 @@
 #ifndef __GapArray_h_GNUSTEP_BASE_INCLUDE
 #define __GapArray_h_GNUSTEP_BASE_INCLUDE

-#include <gnustep/base/preface.h>
-#include <gnustep/base/Array.h>
+#include <base/preface.h>
+#include <base/Array.h>

@interface GapArray : Array
 {
--- a/Headers/gnustep/base/GapArrayPrivate.h
+++ b/Headers/gnustep/base/GapArrayPrivate.h
@ -26,8 +26,8 @@
 #ifndef __GapArrayPrivate_h_GNUSTEP_BASE_INCLUDE
 #define __GapArrayPrivate_h_GNUSTEP_BASE_INCLUDE

-#include <gnustep/base/preface.h>
-#include <gnustep/base/ArrayPrivate.h>
+#include <base/preface.h>
+#include <base/ArrayPrivate.h>
 #include <assert.h>

 #define GAP_TO_BASIC(INDEX)              \
--- a/Headers/gnustep/base/Heap.h
+++ b/Headers/gnustep/base/Heap.h
@ -24,8 +24,8 @@
 #ifndef __Heap_h_GNUSTEP_BASE_INCLUDE
 #define __Heap_h_GNUSTEP_BASE_INCLUDE

-#include <gnustep/base/preface.h>
-#include <gnustep/base/Array.h>
+#include <base/preface.h>
+#include <base/Array.h>

@interface Heap : Array

--- a/Headers/gnustep/base/IndexedCollecting.h
+++ b/Headers/gnustep/base/IndexedCollecting.h
@ -35,8 +35,8 @@
 #ifndef __IndexedCollecting_h_GNUSTEP_BASE_INCLUDE
 #define __IndexedCollecting_h_GNUSTEP_BASE_INCLUDE

-#include <gnustep/base/preface.h>
-#include <gnustep/base/Collecting.h>
+#include <base/preface.h>
+#include <base/Collecting.h>
 #include <Foundation/NSRange.h>

 #define	IndexRange	NSRange
--- a/Headers/gnustep/base/IndexedCollection.h
+++ b/Headers/gnustep/base/IndexedCollection.h
@ -24,9 +24,9 @@
 #ifndef __IndexedCollection_h_GNUSTEP_BASE_INCLUDE
 #define __IndexedCollection_h_GNUSTEP_BASE_INCLUDE

-#include <gnustep/base/preface.h>
-#include <gnustep/base/KeyedCollection.h>
-#include <gnustep/base/IndexedCollecting.h>
+#include <base/preface.h>
+#include <base/KeyedCollection.h>
+#include <base/IndexedCollecting.h>

@interface ConstantIndexedCollection : ConstantCollection 
@end
--- a/Headers/gnustep/base/IndexedCollectionPrivate.h
+++ b/Headers/gnustep/base/IndexedCollectionPrivate.h
@ -24,8 +24,8 @@
 #ifndef __IndexedCollectionPrivate_h_GNUSTEP_BASE_INCLUDE
 #define __IndexedCollectionPrivate_h_GNUSTEP_BASE_INCLUDE

-#include <gnustep/base/preface.h>
-#include <gnustep/base/CollectionPrivate.h>
+#include <base/preface.h>
+#include <base/CollectionPrivate.h>
 #include <Foundation/NSException.h>
 #include <Foundation/NSString.h>

--- a/Headers/gnustep/base/Invocation.h
+++ b/Headers/gnustep/base/Invocation.h
@ -8,9 +8,9 @@
   extraneous stuff after the first type.
 */

-#include <gnustep/base/preface.h>
-#include <gnustep/base/Collection.h>
-#include <gnustep/base/Invoking.h>
+#include <base/preface.h>
+#include <base/Collection.h>
+#include <base/Invoking.h>

@interface Invocation : NSObject <Invoking>
 {
--- a/Headers/gnustep/base/Invoking.h
+++ b/Headers/gnustep/base/Invoking.h
@ -24,7 +24,7 @@
 #ifndef __Invoking_h__GNUSTEP_BASE_INCLUDE
 #define __Invoking_h__GNUSTEP_BASE_INCLUDE

-#include <gnustep/base/preface.h>
+#include <base/preface.h>

@protocol Invoking <NSObject>

--- a/Headers/gnustep/base/KeyedCollecting.h
+++ b/Headers/gnustep/base/KeyedCollecting.h
@ -33,8 +33,8 @@
 #ifndef __KeyedCollecting_h_GNUSTEP_BASE_INCLUDE
 #define __KeyedCollecting_h_GNUSTEP_BASE_INCLUDE

-#include <gnustep/base/preface.h>
-#include <gnustep/base/Collecting.h>
+#include <base/preface.h>
+#include <base/Collecting.h>

@protocol ConstantKeyedCollecting <ConstantCollecting>

--- a/Headers/gnustep/base/KeyedCollection.h
+++ b/Headers/gnustep/base/KeyedCollection.h
@ -24,9 +24,9 @@
 #ifndef __KeyedCollection_h_GNUSTEP_BASE_INCLUDE
 #define __KeyedCollection_h_GNUSTEP_BASE_INCLUDE

-#include <gnustep/base/preface.h>
-#include <gnustep/base/Collection.h>
-#include <gnustep/base/KeyedCollecting.h>
+#include <base/preface.h>
+#include <base/Collection.h>
+#include <base/KeyedCollecting.h>

@interface ConstantKeyedCollection : Collection
@end
--- a/Headers/gnustep/base/LinkedList.h
+++ b/Headers/gnustep/base/LinkedList.h
@ -24,8 +24,8 @@
 #ifndef __LinkedList_h_GNUSTEP_BASE_INCLUDE
 #define __LinkedList_h_GNUSTEP_BASE_INCLUDE

-#include <gnustep/base/preface.h>
-#include <gnustep/base/OrderedCollection.h>
+#include <base/preface.h>
+#include <base/OrderedCollection.h>

 /* The <LinkedListComprising> protocol defines the interface to an object
   that may be an element in a LinkedList.
--- a/Headers/gnustep/base/LinkedListNode.h
+++ b/Headers/gnustep/base/LinkedListNode.h
@ -24,9 +24,9 @@
 #ifndef __LinkedListNode_h_GNUSTEP_BASE_INCLUDE
 #define __LinkedListNode_h_GNUSTEP_BASE_INCLUDE

-#include <gnustep/base/preface.h>
-#include <gnustep/base/LinkedList.h>
-#include <gnustep/base/Coding.h>
+#include <base/preface.h>
+#include <base/LinkedList.h>
+#include <base/Coding.h>

@interface LinkedListNode : NSObject <LinkedListComprising>
 {
--- a/Headers/gnustep/base/Locking.h
+++ b/Headers/gnustep/base/Locking.h
@ -24,7 +24,7 @@
 #ifndef __Locking_h_GNUSTEP_BASE_INCLUDE
 #define __Locking_h_GNUSTEP_BASE_INCLUDE

-#include <gnustep/base/preface.h>
+#include <base/preface.h>
 #include <objc/Protocol.h>

@protocol Locking
--- a/Headers/gnustep/base/MachPort.h
+++ b/Headers/gnustep/base/MachPort.h
@ -26,8 +26,8 @@

 #if __mach__

-#include <gnustep/base/preface.h>
-#include <gnustep/base/Port.h>
+#include <base/preface.h>
+#include <base/Port.h>

@interface MachInPort : InPort
@end
--- a/Headers/gnustep/base/Magnitude.h
+++ b/Headers/gnustep/base/Magnitude.h
@ -24,8 +24,8 @@
 #ifndef __Magnitude_h_GNUSTEP_BASE_INCLUDE
 #define __Magnitude_h_GNUSTEP_BASE_INCLUDE

-#include <gnustep/base/preface.h>
-#include <gnustep/base/Ordering.h>
+#include <base/preface.h>
+#include <base/Ordering.h>

@interface Magnitude : NSObject <Ordering>

--- a/Headers/gnustep/base/MappedCollector.h
+++ b/Headers/gnustep/base/MappedCollector.h
@ -24,8 +24,8 @@
 #ifndef __MappedCollector_h_GNUSTEP_BASE_INCLUDE
 #define __MappedCollector_h_GNUSTEP_BASE_INCLUDE

-#include <gnustep/base/preface.h>
-#include <gnustep/base/KeyedCollection.h>
+#include <base/preface.h>
+#include <base/KeyedCollection.h>

@interface MappedCollector : KeyedCollection
 {
--- a/Headers/gnustep/base/MemoryStream.h
+++ b/Headers/gnustep/base/MemoryStream.h
@ -31,9 +31,9 @@
 #ifndef __MemoryStream_h_GNUSTEP_BASE_INCLUDE
 #define __MemoryStream_h_GNUSTEP_BASE_INCLUDE

-#include <gnustep/base/preface.h>
-#include <gnustep/base/Stream.h>
-#include <gnustep/base/Streaming.h>
+#include <base/preface.h>
+#include <base/Stream.h>
+#include <base/Streaming.h>

 /* This protocol is preliminary and may change.
   This also may get pulled out into a separate .h file. */
--- a/Headers/gnustep/base/NSArray.h
+++ b/Headers/gnustep/base/NSArray.h
@ -24,7 +24,7 @@
 #ifndef __NSArray_h_GNUSTEP_BASE_INCLUDE
 #define __NSArray_h_GNUSTEP_BASE_INCLUDE

-#include <gnustep/base/preface.h>
+#include <base/preface.h>
 #include <Foundation/NSRange.h>
 #include <Foundation/NSUtilities.h>

--- a/Headers/gnustep/base/NSAutoreleasePool.h
+++ b/Headers/gnustep/base/NSAutoreleasePool.h
@ -24,7 +24,7 @@
 #ifndef __NSAutoreleasePool_h_GNUSTEP_BASE_INCLUDE
 #define __NSAutoreleasePool_h_GNUSTEP_BASE_INCLUDE

-#include <gnustep/base/preface.h>
+#include <base/preface.h>
 #include <string.h>		/* for memset() */

@class NSAutoreleasePool;
--- a/Headers/gnustep/base/NSCoder.h
+++ b/Headers/gnustep/base/NSCoder.h
@ -88,7 +88,7 @@

 #ifndef NO_GNUSTEP

-#include <gnustep/base/Coding.h>
+#include <base/Coding.h>
 #include <Foundation/NSCoder.h>
@interface NSCoder (GNU) <Encoding, Decoding>
@end
--- a/Headers/gnustep/base/NSConnection.h
+++ b/Headers/gnustep/base/NSConnection.h
@ -25,11 +25,11 @@
 #ifndef __NSConnection_h_GNUSTEP_BASE_INCLUDE
 #define __NSConnection_h_GNUSTEP_BASE_INCLUDE

-#include <gnustep/base/preface.h>
+#include <base/preface.h>
 #include <stdlib.h>
 #include <stdarg.h>
-#include <gnustep/base/Collecting.h>
-#include <gnustep/base/Dictionary.h>
+#include <base/Collecting.h>
+#include <base/Dictionary.h>
 #include <Foundation/NSString.h>
 #include <Foundation/NSTimer.h>
 #include <Foundation/NSRunLoop.h>
--- a/Headers/gnustep/base/NSDebug.h
+++ b/Headers/gnustep/base/NSDebug.h
@ -24,7 +24,7 @@
 #ifndef __NSDebug_h_GNUSTEP_BASE_INCLUDE
 #define __NSDebug_h_GNUSTEP_BASE_INCLUDE

-#include <gnustep/base/preface.h>
+#include <base/preface.h>
 #include <errno.h>

 extern int	errno;
--- a/Headers/gnustep/base/NSDictionary.h
+++ b/Headers/gnustep/base/NSDictionary.h
@ -24,7 +24,7 @@
 #ifndef _NSDictionary_h_GNUSTEP_BASE_INCLUDE
 #define _NSDictionary_h_GNUSTEP_BASE_INCLUDE

-#include <gnustep/base/preface.h>
+#include <base/preface.h>

@class NSArray, NSString, NSEnumerator;

@ -96,7 +96,7 @@

 #ifndef NO_GNUSTEP

-#include <gnustep/base/KeyedCollecting.h>
+#include <base/KeyedCollecting.h>
 #include <Foundation/NSDictionary.h>

 /* Eventually we'll make a Constant version of this protocol. */
--- a/Headers/gnustep/base/NSGArchiver.h
+++ b/Headers/gnustep/base/NSGArchiver.h
@ -24,9 +24,9 @@
 #ifndef __NSGArchiver_h_GNUSTEP_BASE_INCLUDE
 #define __NSGArchiver_h_GNUSTEP_BASE_INCLUDE

-#include <gnustep/base/preface.h>
+#include <base/preface.h>
 #include <Foundation/NSArchiver.h>
-#include <gnustep/base/Coding.h>
+#include <base/Coding.h>

@interface NSGArchiver : NSArchiver
@end
--- a/Headers/gnustep/base/NSGArray.h
+++ b/Headers/gnustep/base/NSGArray.h
@ -24,9 +24,9 @@
 #ifndef __NSGArray_h_GNUSTEP_BASE_INCLUDE
 #define __NSGArray_h_GNUSTEP_BASE_INCLUDE

-#include <gnustep/base/preface.h>
+#include <base/preface.h>
 #include <Foundation/NSArray.h>
-#include <gnustep/base/Array.h>
+#include <base/Array.h>

@interface NSGArray : NSArray
 {
--- a/Headers/gnustep/base/NSGCString.h
+++ b/Headers/gnustep/base/NSGCString.h
@ -24,7 +24,7 @@
 #ifndef __NSGCString_h_GNUSTEP_BASE_INCLUDE
 #define __NSGCString_h_GNUSTEP_BASE_INCLUDE

-#include <gnustep/base/preface.h>
+#include <base/preface.h>
 #include <Foundation/NSString.h>

 /*
--- a/Headers/gnustep/base/NSGSequence.h
+++ b/Headers/gnustep/base/NSGSequence.h
@ -25,7 +25,7 @@
 #ifndef __NSGSequence_h_GNUSTEP_BASE_INCLUDE
 #define __NSGSequence_h_GNUSTEP_BASE_INCLUDE

-#include <gnustep/base/preface.h>
+#include <base/preface.h>
 #include <Foundation/NSString.h>
 #include <Foundation/NSRange.h>

--- a/Headers/gnustep/base/NSGSet.h
+++ b/Headers/gnustep/base/NSGSet.h
@ -24,10 +24,10 @@
 #ifndef __NSGSet_h_GNUSTEP_BASE_INCLUDE
 #define __NSGSet_h_GNUSTEP_BASE_INCLUDE

-#include <gnustep/base/preface.h>
+#include <base/preface.h>
 #include <Foundation/NSSet.h>
-#include <gnustep/base/Set.h>
-#include <gnustep/base/Bag.h>
+#include <base/Set.h>
+#include <base/Bag.h>

@interface NSGSet : NSSet
@end
--- a/Headers/gnustep/base/NSGString.h
+++ b/Headers/gnustep/base/NSGString.h
@ -28,7 +28,7 @@
 #ifndef __NSGString_h_GNUSTEP_BASE_INCLUDE
 #define __NSGString_h_GNUSTEP_BASE_INCLUDE

-#include <gnustep/base/preface.h>
+#include <base/preface.h>
 #include <Foundation/NSString.h>

 /* NSGString and NSGMutableString must have the same initial ivar layout
--- a/Headers/gnustep/base/NSHashTable.h
+++ b/Headers/gnustep/base/NSHashTable.h
@ -30,7 +30,7 @@
 #include <Foundation/NSObject.h>
 #include <Foundation/NSString.h>
 #include <Foundation/NSArray.h>
-#include <gnustep/base/o_hash.h>
+#include <base/o_hash.h>

 /**** Type, Constant, and Macro Definitions **********************************/

--- a/Headers/gnustep/base/NSHost.h
+++ b/Headers/gnustep/base/NSHost.h
@ -21,7 +21,7 @@
   Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
   */ 

-#include <gnustep/base/preface.h>
+#include <base/preface.h>

@class NSString, NSArray, NSMutableArray;

--- a/Headers/gnustep/base/NSMapTable.h
+++ b/Headers/gnustep/base/NSMapTable.h
@ -30,7 +30,7 @@
 #include <Foundation/NSObject.h>
 #include <Foundation/NSString.h>
 #include <Foundation/NSArray.h>
-#include <gnustep/base/o_map.h>
+#include <base/o_map.h>

 /**** Type, Constant, and Macro Definitions **********************************/

--- a/Headers/gnustep/base/NSNotification.h
+++ b/Headers/gnustep/base/NSNotification.h
@ -63,7 +63,7 @@
@end


-#include <gnustep/base/NotificationDispatcher.h>
+#include <base/NotificationDispatcher.h>

 /* Put this in a category to avoid unimportant errors due to behaviors. */
@interface NSNotificationCenter : NSObject
--- a/Headers/gnustep/base/NSObject.h
+++ b/Headers/gnustep/base/NSObject.h
@ -38,7 +38,7 @@
 #include <objc/objc.h>
 #include <objc/Protocol.h>
 #include <Foundation/NSZone.h>
-#include <gnustep/base/fake-main.h>
+#include <base/fake-main.h>

@class NSArchiver;
@class NSArray;
--- a/Headers/gnustep/base/NSPathUtilities.h
+++ b/Headers/gnustep/base/NSPathUtilities.h
@ -24,7 +24,7 @@
 #ifndef __NSPathUtilities_h_GNUSTEP_BASE_INCLUDE
 #define __NSPathUtilities_h_GNUSTEP_BASE_INCLUDE

-#include <gnustep/base/preface.h>
+#include <base/preface.h>
 #include <Foundation/NSString.h>

 extern NSString *NSUserName ();
--- a/Headers/gnustep/base/NSPortCoder.h
+++ b/Headers/gnustep/base/NSPortCoder.h
@ -24,9 +24,9 @@
 #ifndef __NSPortCoder_h
 #define __NSPortCoder_h

-#include <gnustep/base/preface.h>
+#include <base/preface.h>
 #include <Foundation/NSCoder.h>
-#include <gnustep/base/Port.h>
+#include <base/Port.h>

@class NSConnection;

--- a/Headers/gnustep/base/NSProcessInfo.h
+++ b/Headers/gnustep/base/NSProcessInfo.h
@ -26,7 +26,7 @@
 #ifndef __NSProcessInfo_h_GNUSTEP_BASE_INCLUDE
 #define __NSProcessInfo_h_GNUSTEP_BASE_INCLUDE

-#include <gnustep/base/preface.h>
+#include <base/preface.h>

@class NSArray;
@class NSMutableArray;
--- a/Headers/gnustep/base/NSProxy.h
+++ b/Headers/gnustep/base/NSProxy.h
@ -24,7 +24,7 @@
 #ifndef __NSProxy_h_GNUSTEP_BASE_INCLUDE
 #define __NSProxy_h_GNUSTEP_BASE_INCLUDE

-#include <gnustep/base/preface.h>
+#include <base/preface.h>
 #include <Foundation/NSObject.h>


--- a/Headers/gnustep/base/NSRunLoop.h
+++ b/Headers/gnustep/base/NSRunLoop.h
@ -24,7 +24,7 @@
 #ifndef __NSRunLoop_h_GNUSTEP_BASE_INCLUDE
 #define __NSRunLoop_h_GNUSTEP_BASE_INCLUDE

-#include <gnustep/base/preface.h>
+#include <base/preface.h>
 #include <Foundation/NSMapTable.h>

@class NSTimer, NSDate, NSPort;
--- a/Headers/gnustep/base/NSScanner.h
+++ b/Headers/gnustep/base/NSScanner.h
@ -24,7 +24,7 @@
 #ifndef __NSScanner_h_GNUSTEP_INCLUDE
 #define __NSScanner_h_GNUSTEP_INCLUDE

-#include <gnustep/base/preface.h>
+#include <base/preface.h>
 #include <Foundation/NSDictionary.h>
 #include <Foundation/NSCharacterSet.h>

--- a/Headers/gnustep/base/NSSet.h
+++ b/Headers/gnustep/base/NSSet.h
@ -24,7 +24,7 @@
 #ifndef _NSSet_h_GNUSTEP_BASE_INCLUDE
 #define _NSSet_h_GNUSTEP_BASE_INCLUDE

-#include <gnustep/base/preface.h>
+#include <base/preface.h>

@class NSArray, NSString, NSEnumerator, NSDictionary;

@ -94,7 +94,7 @@

 #ifndef NO_GNUSTEP

-#include <gnustep/base/KeyedCollecting.h>
+#include <base/KeyedCollecting.h>
 #include <Foundation/NSSet.h>

 /* Eventually we'll make a Constant version of this protocol. */
--- a/Headers/gnustep/base/NSString.h
+++ b/Headers/gnustep/base/NSString.h
@ -24,7 +24,7 @@
 #ifndef __NSString_h_GNUSTEP_BASE_INCLUDE
 #define __NSString_h_GNUSTEP_BASE_INCLUDE

-#include <gnustep/base/preface.h>
+#include <base/preface.h>

 #include <Foundation/NSRange.h>

--- a/Headers/gnustep/base/NSTask.h
+++ b/Headers/gnustep/base/NSTask.h
@ -24,7 +24,7 @@
 #ifndef __NSTask_h_GNUSTEP_BASE_INCLUDE
 #define __NSTask_h_GNUSTEP_BASE_INCLUDE

-#include <gnustep/base/preface.h>
+#include <base/preface.h>
 #include <Foundation/NSObject.h>
 #include <Foundation/NSString.h>
 #include <Foundation/NSArray.h>
--- a/Headers/gnustep/base/NSThread.h
+++ b/Headers/gnustep/base/NSThread.h
@ -25,7 +25,7 @@
 #ifndef __NSThread_h_GNUSTEP_BASE_INCLUDE
 #define __NSThread_h_GNUSTEP_BASE_INCLUDE

-#include <gnustep/base/preface.h>
+#include <base/preface.h>
 #include <objc/thr.h>
 #include <Foundation/NSDictionary.h>
 #include <Foundation/NSDate.h>
--- a/Headers/gnustep/base/NSTimer.h
+++ b/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 <gnustep/base/preface.h>
+#include <base/preface.h>
 #include <Foundation/NSDate.h>

@interface NSTimer : NSObject
--- a/Headers/gnustep/base/NotificationDispatcher.h
+++ b/Headers/gnustep/base/NotificationDispatcher.h
@ -56,9 +56,9 @@

   */

-#include <gnustep/base/preface.h>
-#include <gnustep/base/LinkedList.h>
-#include <gnustep/base/Array.h>
+#include <base/preface.h>
+#include <base/LinkedList.h>
+#include <base/Array.h>
 #include <Foundation/NSMapTable.h>
 #include <Foundation/NSString.h>
 #include <Foundation/NSLock.h>
--- a/Headers/gnustep/base/OrderedCollecting.h
+++ b/Headers/gnustep/base/OrderedCollecting.h
@ -35,8 +35,8 @@
 #ifndef __OrderedCollecting_h_GNUSTEP_BASE_INCLUDE
 #define __OrderedCollecting_h_GNUSTEP_BASE_INCLUDE

-#include <gnustep/base/preface.h>
-#include <gnustep/base/IndexedCollecting.h>
+#include <base/preface.h>
+#include <base/IndexedCollecting.h>

@protocol OrderedCollecting <IndexedCollecting>

--- a/Headers/gnustep/base/OrderedCollection.h
+++ b/Headers/gnustep/base/OrderedCollection.h
@ -24,9 +24,9 @@
 #ifndef __OrderedCollection_h_GNUSTEP_BASE_INCLUDE
 #define __OrderedCollection_h_GNUSTEP_BASE_INCLUDE

-#include <gnustep/base/preface.h>
-#include <gnustep/base/IndexedCollection.h>
-#include <gnustep/base/OrderedCollecting.h>
+#include <base/preface.h>
+#include <base/IndexedCollection.h>
+#include <base/OrderedCollecting.h>

@interface OrderedCollection : IndexedCollection
@end
--- a/Headers/gnustep/base/Ordering.h
+++ b/Headers/gnustep/base/Ordering.h
@ -24,7 +24,7 @@
 #ifndef __Ordering_h_GNUSTEP_BASE_INCLUDE
 #define __Ordering_h_GNUSTEP_BASE_INCLUDE

-#include <gnustep/base/preface.h>
+#include <base/preface.h>
 #include <objc/objc.h>

@protocol Ordering
--- a/Headers/gnustep/base/Port.h
+++ b/Headers/gnustep/base/Port.h
@ -24,13 +24,13 @@
 #ifndef __Port_h_GNUSTEP_BASE_INCLUDE
 #define __Port_h_GNUSTEP_BASE_INCLUDE

-#include <gnustep/base/preface.h>
-#include <gnustep/base/Coding.h>
-#include <gnustep/base/MemoryStream.h>
+#include <base/preface.h>
+#include <base/Coding.h>
+#include <base/MemoryStream.h>
 #include <Foundation/NSPort.h>
 #include <Foundation/NSDate.h>
 #include <Foundation/NSString.h>
-#include <gnustep/base/Invocation.h>
+#include <base/Invocation.h>

 /* xxx Use something like this? */
@protocol PacketSending
--- a/Headers/gnustep/base/Queue.h
+++ b/Headers/gnustep/base/Queue.h
@ -24,8 +24,8 @@
 #ifndef __Queue_h_GNUSTEP_BASE_INCLUDE
 #define __Queue_h_GNUSTEP_BASE_INCLUDE

-#include <gnustep/base/preface.h>
-#include <gnustep/base/CircularArray.h>
+#include <base/preface.h>
+#include <base/CircularArray.h>

@interface Queue : CircularArray

--- a/Headers/gnustep/base/RBTree.h
+++ b/Headers/gnustep/base/RBTree.h
@ -24,8 +24,8 @@
 #ifndef __RBTree_h_GNUSTEP_BASE_INCLUDE
 #define __RBTree_h_GNUSTEP_BASE_INCLUDE

-#include <gnustep/base/preface.h>
-#include <gnustep/base/BinaryTree.h>
+#include <base/preface.h>
+#include <base/BinaryTree.h>

@protocol RBTreeComprising <BinaryTreeComprising>
 - (BOOL) isRed;
--- a/Headers/gnustep/base/RBTreeNode.h
+++ b/Headers/gnustep/base/RBTreeNode.h
@ -24,9 +24,9 @@
 #ifndef __RBTreeNode_h_GNUSTEP_BASE_INCLUDE
 #define __RBTreeNode_h_GNUSTEP_BASE_INCLUDE

-#include <gnustep/base/preface.h>
-#include <gnustep/base/BinaryTreeNode.h>
-#include <gnustep/base/RBTree.h>
+#include <base/preface.h>
+#include <base/BinaryTreeNode.h>
+#include <base/RBTree.h>

@interface RBTreeNode : BinaryTreeNode <RBTreeComprising>
 {
--- a/Headers/gnustep/base/RNGAdditiveCongruential.h
+++ b/Headers/gnustep/base/RNGAdditiveCongruential.h
@ -27,8 +27,8 @@
 #ifndef __RNGAdditiveCongruential_h_GNUSTEP_BASE_INCLUDE
 #define __RNGAdditiveCongruential_h_GNUSTEP_BASE_INCLUDE

-#include <gnustep/base/preface.h>
-#include <gnustep/base/RandomGenerating.h>
+#include <base/preface.h>
+#include <base/RandomGenerating.h>

@interface RNGAdditiveCongruential : NSObject <RandomGenerating>
 {
--- a/Headers/gnustep/base/RNGBerkeley.h
+++ b/Headers/gnustep/base/RNGBerkeley.h
@ -47,8 +47,8 @@
 * It was reworked for the GNU Objective-C Library by Andrew Kachites McCallum
 */

-#include <gnustep/base/preface.h>
-#include <gnustep/base/RandomGenerating.h>
+#include <base/preface.h>
+#include <base/RandomGenerating.h>

@interface RNGBerkeley : NSObject <RandomGenerating>
 {
--- a/Headers/gnustep/base/Random.h
+++ b/Headers/gnustep/base/Random.h
@ -24,8 +24,8 @@
 #ifndef __Random_h_GNUSTEP_BASE_INCLUDE
 #define __Random_h_GNUSTEP_BASE_INCLUDE

-#include <gnustep/base/preface.h>
-#include <gnustep/base/RandomGenerating.h>
+#include <base/preface.h>
+#include <base/RandomGenerating.h>

@interface Random : NSObject
 {
--- a/Headers/gnustep/base/RandomGenerating.h
+++ b/Headers/gnustep/base/RandomGenerating.h
@ -24,7 +24,7 @@
 #ifndef __RandomGenerating_h_GNUSTEP_BASE_INCLUDE
 #define __RandomGenerating_h_GNUSTEP_BASE_INCLUDE

-#include <gnustep/base/preface.h>
+#include <base/preface.h>

@protocol RandomGenerating <NSObject, NSCoding>

--- a/Headers/gnustep/base/RawCStream.h
+++ b/Headers/gnustep/base/RawCStream.h
@ -24,9 +24,9 @@
 #ifndef __RawCStream_h_GNUSTEP_BASE_INCLUDE
 #define __RawCStream_h_GNUSTEP_BASE_INCLUDE

-#include <gnustep/base/preface.h>
-#include <gnustep/base/Stream.h>
-#include <gnustep/base/CStream.h>
+#include <base/preface.h>
+#include <base/Stream.h>
+#include <base/CStream.h>

@interface RawCStream : CStream

--- a/Headers/gnustep/base/Retaining.h
+++ b/Headers/gnustep/base/Retaining.h
@ -24,7 +24,7 @@
 #ifndef __Retaining_h_GNUSTEP_BASE_INCLUDE
 #define __Retaining_h_GNUSTEP_BASE_INCLUDE

-#include <gnustep/base/preface.h>
+#include <base/preface.h>

@protocol Retaining

--- a/Headers/gnustep/base/Set.h
+++ b/Headers/gnustep/base/Set.h
@ -24,8 +24,8 @@
 #ifndef __Set_h_GNUSTEP_BASE_INCLUDE
 #define __Set_h_GNUSTEP_BASE_INCLUDE

-#include <gnustep/base/preface.h>
-#include <gnustep/base/Collection.h>
+#include <base/preface.h>
+#include <base/Collection.h>
 #include <Foundation/NSHashTable.h>

@interface Set : Collection
--- a/Headers/gnustep/base/SplayTree.h
+++ b/Headers/gnustep/base/SplayTree.h
@ -34,8 +34,8 @@
 #ifndef __SplayTree_h_GNUSTEP_BASE_INCLUDE
 #define __SplayTree_h_GNUSTEP_BASE_INCLUDE

-#include <gnustep/base/preface.h>
-#include <gnustep/base/BinaryTree.h>
+#include <base/preface.h>
+#include <base/BinaryTree.h>

@interface SplayTree : BinaryTree
 {
--- a/Headers/gnustep/base/Stack.h
+++ b/Headers/gnustep/base/Stack.h
@ -24,8 +24,8 @@
 #ifndef __Stack_h_GNUSTEP_BASE_INCLUDE
 #define __Stack_h_GNUSTEP_BASE_INCLUDE

-#include <gnustep/base/preface.h>
-#include <gnustep/base/Array.h>
+#include <base/preface.h>
+#include <base/Array.h>

@interface Stack : Array

--- a/Headers/gnustep/base/StdioStream.h
+++ b/Headers/gnustep/base/StdioStream.h
@ -24,8 +24,8 @@
 #ifndef __StdioStream_h__GNUSTEP_BASE_INCLUDE
 #define __StdioStream_h__GNUSTEP_BASE_INCLUDE

-#include <gnustep/base/preface.h>
-#include <gnustep/base/Stream.h>
+#include <base/preface.h>
+#include <base/Stream.h>
 #include <stdio.h>

@interface StdioStream : Stream
--- a/Headers/gnustep/base/Stream.h
+++ b/Headers/gnustep/base/Stream.h
@ -24,8 +24,8 @@
 #ifndef __Stream_h__GNUSTEP_BASE_INCLUDE
 #define __Stream_h__GNUSTEP_BASE_INCLUDE

-#include <gnustep/base/preface.h>
-#include <gnustep/base/Streaming.h>
+#include <base/preface.h>
+#include <base/Streaming.h>

 extern NSString* StreamException;

--- a/Headers/gnustep/base/Streaming.h
+++ b/Headers/gnustep/base/Streaming.h
@ -24,7 +24,7 @@
 #ifndef __Streaming_h__GNUSTEP_BASE_INCLUDE
 #define __Streaming_h__GNUSTEP_BASE_INCLUDE

-#include <gnustep/base/preface.h>
+#include <base/preface.h>

@protocol Streaming <NSObject>

--- a/Headers/gnustep/base/TcpPort.h
+++ b/Headers/gnustep/base/TcpPort.h
@ -24,9 +24,9 @@
 #ifndef __TcpPort_h__GNUSTEP_BASE_INCLUDE
 #define __TcpPort_h__GNUSTEP_BASE_INCLUDE

-#include <gnustep/base/preface.h>
-#include <gnustep/base/Port.h>
-#include <gnustep/base/RunLoop.h>
+#include <base/preface.h>
+#include <base/Port.h>
+#include <base/RunLoop.h>
 #ifndef __WIN32__
 #include <sys/socket.h>
 #include <netinet/in.h>
--- a/Headers/gnustep/base/TextCStream.h
+++ b/Headers/gnustep/base/TextCStream.h
@ -24,9 +24,9 @@
 #ifndef __TextCStream_h_GNUSTEP_BASE_INCLUDE
 #define __TextCStream_h_GNUSTEP_BASE_INCLUDE

-#include <gnustep/base/preface.h>
-#include <gnustep/base/Stream.h>
-#include <gnustep/base/CStream.h>
+#include <base/preface.h>
+#include <base/Stream.h>
+#include <base/CStream.h>

@interface TextCStream : CStream

--- a/Headers/gnustep/base/Time.h
+++ b/Headers/gnustep/base/Time.h
@ -26,8 +26,8 @@
 #ifndef __Time_h_GNUSTEP_BASE_INCLUDE
 #define __Time_h_GNUSTEP_BASE_INCLUDE

-#include <gnustep/base/preface.h>
-#include <gnustep/base/Magnitude.h>
+#include <base/preface.h>
+#include <base/Magnitude.h>

 #ifndef __WIN32__
 #include <sys/time.h>
--- a/Headers/gnustep/base/UdpPort.h
+++ b/Headers/gnustep/base/UdpPort.h
@ -24,8 +24,8 @@
 #ifndef __UdpPort_h_GNUSTEP_BASE_INCLUDE
 #define __UdpPort_h_GNUSTEP_BASE_INCLUDE

-#include <gnustep/base/preface.h>
-#include <gnustep/base/Port.h>
+#include <base/preface.h>
+#include <base/Port.h>
 #include <sys/types.h>
 #ifndef __WIN32__
 # include <sys/socket.h>
--- a/Headers/gnustep/base/ValueHolding.h
+++ b/Headers/gnustep/base/ValueHolding.h
@ -24,7 +24,7 @@
 #ifndef __ValueHolding_h_GNUSTEP_BASE_INCLUDE
 #define __ValueHolding_h_GNUSTEP_BASE_INCLUDE

-#include <gnustep/base/preface.h>
+#include <base/preface.h>

 /* protocol String; */

--- a/Headers/gnustep/base/all.h
+++ b/Headers/gnustep/base/all.h
@ -24,44 +24,44 @@
 #ifndef __o_h_GNUSTEP_BASE_INCLUDE
 #define __o_h_GNUSTEP_BASE_INCLUDE

-#include <gnustep/base/preface.h>
+#include <base/preface.h>

 /* Collection objects */
-#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>
+#include <base/Set.h>
+#include <base/Bag.h>
+#include <base/Dictionary.h>
+#include <base/Array.h>
+#include <base/Stack.h>
+#include <base/Queue.h>
+#include <base/GapArray.h>
+#include <base/CircularArray.h>
+#include <base/DelegatePool.h>
+#include <base/MappedCollector.h>
+#include <base/Heap.h>
+#include <base/LinkedList.h>
+#include <base/LinkedListNode.h>
+#include <base/BinaryTree.h>
+#include <base/BinaryTreeNode.h>
+#include <base/RBTree.h>
+#include <base/RBTreeNode.h>
+#include <base/SplayTree.h>

 /* Stream objects */
-#include <gnustep/base/Stream.h>
-#include <gnustep/base/StdioStream.h>
-#include <gnustep/base/MemoryStream.h>
+#include <base/Stream.h>
+#include <base/StdioStream.h>
+#include <base/MemoryStream.h>

 /* Coder objects */
-#include <gnustep/base/Coder.h>
-#include <gnustep/base/BinaryCStream.h>
-#include <gnustep/base/TextCStream.h>
+#include <base/Coder.h>
+#include <base/BinaryCStream.h>
+#include <base/TextCStream.h>

 /* Port objects */
-#include <gnustep/base/Port.h>
+#include <base/Port.h>

 /* Remote messaging support objects */
-#include <gnustep/base/ConnectedCoder.h>
+#include <base/ConnectedCoder.h>

-#include <gnustep/base/Invocation.h>
+#include <base/Invocation.h>

 #endif /* __o_h_GNUSTEP_BASE_INCLUDE */
--- a/Headers/gnustep/base/fast.x
+++ b/Headers/gnustep/base/fast.x
@ -24,7 +24,7 @@
 #ifndef fast_x_INCLUDE
 #define fast_x_INCLUDE

-#include <gnustep/base/preface.h>
+#include <base/preface.h>
 #include <objc/objc-api.h>

 #ifndef	INLINE
--- a/Headers/gnustep/base/o_array.h
+++ b/Headers/gnustep/base/o_array.h
@ -29,8 +29,8 @@

 #include <stdlib.h>
 #include <Foundation/NSZone.h>
-#include <gnustep/base/o_cbs.h>
-#include <gnustep/base/o_hash.h>
+#include <base/o_cbs.h>
+#include <base/o_hash.h>

 /**** Type, Constant, and Macro Definitions **********************************/

@ -81,8 +81,8 @@ struct _o_array_enumerator

 /** Basics **/

-#include <gnustep/base/o_array_bas.h>
-#include <gnustep/base/o_array_cbs.h>
+#include <base/o_array_bas.h>
+#include <base/o_array_cbs.h>

 /** Creating **/

--- a/Headers/gnustep/base/o_hash.h
+++ b/Headers/gnustep/base/o_hash.h
@ -29,7 +29,7 @@

 #include <Foundation/NSZone.h>
 #include <Foundation/NSString.h>
-#include <gnustep/base/o_cbs.h>
+#include <base/o_cbs.h>

 /**** Type, Constant, and Macro Definitions **********************************/

@ -114,8 +114,8 @@ struct _o_hash_enumerator
 /* All the structures (hashes, maps, lists, and arrays) have
 * the same basic ideas behind them. */

-#include <gnustep/base/o_hash_bas.h>
-#include <gnustep/base/o_hash_cbs.h>
+#include <base/o_hash_bas.h>
+#include <base/o_hash_cbs.h>

 /** Callbacks... **/

--- a/Headers/gnustep/base/o_list.h
+++ b/Headers/gnustep/base/o_list.h
@ -28,9 +28,9 @@
 /**** Included Headers *******************************************************/

 #include <Foundation/NSZone.h>
-#include <gnustep/base/o_cbs.h>
-#include <gnustep/base/o_hash.h>
-#include <gnustep/base/o_array.h>
+#include <base/o_cbs.h>
+#include <base/o_hash.h>
+#include <base/o_array.h>

 /**** Type, Constant, and Macro Definitions **********************************/

@ -81,8 +81,8 @@ struct _o_list_enumerator

 /** Basics **/

-#include <gnustep/base/o_list_bas.h>
-#include <gnustep/base/o_list_cbs.h>
+#include <base/o_list_bas.h>
+#include <base/o_list_cbs.h>

 /** Creating **/

--- a/Show more
+++ b/Show more