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

Source/Archiver.m

@@ -22,8 +22,8 @@
    */ 
 
 #include <config.h>
-#include <gnustep/base/preface.h>
-#include <gnustep/base/Archiver.h>
+#include <base/preface.h>
+#include <base/Archiver.h>
 
 /* Eventually some functionality may be moved out of Encoder and
    Decoder and into these objects.

Source/Array.m

@@ -22,11 +22,11 @@
 */ 
 
 #include <config.h>
-#include <gnustep/base/Array.h>
-#include <gnustep/base/ArrayPrivate.h>
-#include <gnustep/base/NSString.h>
-#include <gnustep/base/OrderedCollection.h>
-#include <gnustep/base/behavior.h>
+#include <base/Array.h>
+#include <base/ArrayPrivate.h>
+#include <base/NSString.h>
+#include <base/OrderedCollection.h>
+#include <base/behavior.h>
 
 @implementation ConstantArray
 

Source/Bag.m

@@ -22,8 +22,8 @@
 */ 
 
 #include <config.h>
-#include <gnustep/base/Bag.h>
-#include <gnustep/base/CollectionPrivate.h>
+#include <base/Bag.h>
+#include <base/CollectionPrivate.h>
 
 #define DEFAULT_BAG_CAPACITY 32
 

Source/BinaryCStream.m

@@ -22,11 +22,11 @@
    */ 
 
 #include <config.h>
-#include <gnustep/base/preface.h>
-#include <gnustep/base/BinaryCStream.h>
-#include <gnustep/base/NSString.h>
-#include <gnustep/base/StdioStream.h>
-#include <gnustep/base/TextCStream.h>
+#include <base/preface.h>
+#include <base/BinaryCStream.h>
+#include <base/NSString.h>
+#include <base/StdioStream.h>
+#include <base/TextCStream.h>
 #include <Foundation/NSData.h>
 #include <Foundation/NSException.h>
 #include <math.h>

Source/BinaryTree.m

@@ -22,10 +22,10 @@
 */ 
 
 #include <config.h>
-#include <gnustep/base/BinaryTree.h>
-#include <gnustep/base/IndexedCollectionPrivate.h>
-#include <gnustep/base/BinaryTreeNode.h>
-#include <gnustep/base/NSString.h>
+#include <base/BinaryTree.h>
+#include <base/IndexedCollectionPrivate.h>
+#include <base/BinaryTreeNode.h>
+#include <base/NSString.h>
 
 /* the sentinal */
 static id nilBinaryTreeNode;

Source/BinaryTreeNode.m

@@ -22,8 +22,8 @@
 */ 
 
 #include <config.h>
-#include <gnustep/base/BinaryTreeNode.h>
-#include <gnustep/base/NSString.h>
+#include <base/BinaryTreeNode.h>
+#include <base/NSString.h>
 
 @implementation BinaryTreeNode
 

Source/CStream.m

@@ -22,11 +22,11 @@
    */ 
 
 #include <config.h>
-#include <gnustep/base/preface.h>
-#include <gnustep/base/CStream.h>
-#include <gnustep/base/NSString.h>
-#include <gnustep/base/StdioStream.h>
-#include <gnustep/base/CoderPrivate.h> /* for SIGNATURE_FORMAT_STRING */
+#include <base/preface.h>
+#include <base/CStream.h>
+#include <base/NSString.h>
+#include <base/StdioStream.h>
+#include <base/CoderPrivate.h> /* for SIGNATURE_FORMAT_STRING */
 #include <Foundation/NSException.h>
 
 id CStreamSignatureMalformedException = @"CStreamSignatureMalformedException";

Source/CircularArray.m

@@ -23,8 +23,8 @@
 
 
 #include <config.h>
-#include <gnustep/base/CircularArray.h>
-#include <gnustep/base/CircularArrayPrivate.h>
+#include <base/CircularArray.h>
+#include <base/CircularArrayPrivate.h>
 
 @implementation CircularArray
 

Source/Coder.m

@@ -22,22 +22,22 @@
    */ 
 
 #include <config.h>
-#include <gnustep/base/preface.h>
-#include <gnustep/base/behavior.h>
-#include <gnustep/base/Coder.h>
-#include <gnustep/base/CoderPrivate.h>
-#include <gnustep/base/MemoryStream.h>
-#include <gnustep/base/Coding.h>
-#include <gnustep/base/Stack.h>
-#include <gnustep/base/Set.h>
-#include <gnustep/base/Streaming.h>
-#include <gnustep/base/Stream.h>
-#include <gnustep/base/CStreaming.h>
-#include <gnustep/base/CStream.h>
-#include <gnustep/base/TextCStream.h>
-#include <gnustep/base/BinaryCStream.h>
-#include <gnustep/base/StdioStream.h>
-#include <gnustep/base/Archiver.h>
+#include <base/preface.h>
+#include <base/behavior.h>
+#include <base/Coder.h>
+#include <base/CoderPrivate.h>
+#include <base/MemoryStream.h>
+#include <base/Coding.h>
+#include <base/Stack.h>
+#include <base/Set.h>
+#include <base/Streaming.h>
+#include <base/Stream.h>
+#include <base/CStreaming.h>
+#include <base/CStream.h>
+#include <base/TextCStream.h>
+#include <base/BinaryCStream.h>
+#include <base/StdioStream.h>
+#include <base/Archiver.h>
 #include <Foundation/NSDictionary.h>
 #include <Foundation/NSString.h>
 #include <Foundation/NSException.h>

Source/Collection.m

@@ -22,13 +22,13 @@
 */ 
 
 #include <config.h>
-#include <gnustep/base/Collection.h>
-#include <gnustep/base/CollectionPrivate.h>
+#include <base/Collection.h>
+#include <base/CollectionPrivate.h>
 #include <stdarg.h>
-#include <gnustep/base/Bag.h>		/* for -contentsEqual: */
-#include <gnustep/base/Array.h>		/* for -safeWithElementsCall: */
-#include <gnustep/base/Coder.h>
-#include <gnustep/base/NSString.h>
+#include <base/Bag.h>		/* for -contentsEqual: */
+#include <base/Array.h>		/* for -safeWithElementsCall: */
+#include <base/Coder.h>
+#include <base/NSString.h>
 
 @implementation Enumerator
 

Source/ConnectedCoder.m

@@ -22,12 +22,12 @@
    */ 
 
 #include <config.h>
-#include <gnustep/base/preface.h>
-#include <gnustep/base/RunLoop.h>
-#include <gnustep/base/ConnectedCoder.h>
-#include <gnustep/base/CStream.h>
-#include <gnustep/base/Port.h>
-#include <gnustep/base/MemoryStream.h>
+#include <base/preface.h>
+#include <base/RunLoop.h>
+#include <base/ConnectedCoder.h>
+#include <base/CStream.h>
+#include <base/Port.h>
+#include <base/MemoryStream.h>
 #include <Foundation/NSConnection.h>
 #include <Foundation/NSProxy.h>
 #include <Foundation/NSException.h>

Source/Decoder.m

@@ -22,13 +22,13 @@
    */ 
 
 #include <config.h>
-#include <gnustep/base/preface.h>
-#include <gnustep/base/Coder.h>
-#include <gnustep/base/CoderPrivate.h>
-#include <gnustep/base/CStream.h>
-#include <gnustep/base/Stream.h>
-#include <gnustep/base/StdioStream.h>
-#include <gnustep/base/Array.h>
+#include <base/preface.h>
+#include <base/Coder.h>
+#include <base/CoderPrivate.h>
+#include <base/CStream.h>
+#include <base/Stream.h>
+#include <base/StdioStream.h>
+#include <base/Array.h>
 #include <Foundation/NSException.h>
 
 static int debug_coder = 0;

Source/DelegatePool.m

@@ -22,8 +22,8 @@
    */ 
 
 #include <config.h>
-#include <gnustep/base/DelegatePool.h>
-#include <gnustep/base/NSString.h>
+#include <base/DelegatePool.h>
+#include <base/NSString.h>
 
 @implementation DelegatePool
 

Source/Dictionary.m

@@ -22,8 +22,8 @@
 */ 
 
 #include <config.h>
-#include <gnustep/base/Dictionary.h>
-#include <gnustep/base/CollectionPrivate.h>
+#include <base/Dictionary.h>
+#include <base/CollectionPrivate.h>
 #include <Foundation/NSCharacterSet.h>
 
 #define DEFAULT_DICTIONARY_CAPACITY 32

Source/Encoder.m

@@ -22,12 +22,12 @@
    */ 
 
 #include <config.h>
-#include <gnustep/base/preface.h>
-#include <gnustep/base/Coder.h>
-#include <gnustep/base/CoderPrivate.h>
-#include <gnustep/base/MemoryStream.h>
-#include <gnustep/base/StdioStream.h>
-#include <gnustep/base/BinaryCStream.h>
+#include <base/preface.h>
+#include <base/Coder.h>
+#include <base/CoderPrivate.h>
+#include <base/MemoryStream.h>
+#include <base/StdioStream.h>
+#include <base/BinaryCStream.h>
 #include <Foundation/NSArchiver.h>
 #include <Foundation/NSException.h>
 

Source/GapArray.m

@@ -25,8 +25,8 @@
 
 
 #include <config.h>
-#include <gnustep/base/GapArray.h>
-#include <gnustep/base/GapArrayPrivate.h>
+#include <base/GapArray.h>
+#include <base/GapArrayPrivate.h>
 
 @implementation GapArray
 

Source/HashTable.m

@@ -20,7 +20,7 @@
    */ 
 
 #include <config.h>
-#include <gnustep/base/preface.h>
+#include <base/preface.h>
 #include <objc/HashTable.h>
 
 #define DEFAULT_HASH_CAPACITY 32

Source/Heap.m

@@ -25,8 +25,8 @@
    IndexedCollection, but not OrderedCollection. */
 
 #include <config.h>
-#include <gnustep/base/Heap.h>
-#include <gnustep/base/ArrayPrivate.h>
+#include <base/Heap.h>
+#include <base/ArrayPrivate.h>
 
 #define HEAP_PARENT(i) (i/2)
 #define HEAP_LEFT(i) (2 * i)

Source/IndexedCollection.m

@@ -22,12 +22,12 @@
 */ 
 
 #include <config.h>
-#include <gnustep/base/IndexedCollection.h>
-#include <gnustep/base/IndexedCollectionPrivate.h>
+#include <base/IndexedCollection.h>
+#include <base/IndexedCollectionPrivate.h>
 #include <stdio.h>
-#include <gnustep/base/Array.h>
-#include <gnustep/base/NSString.h>
-#include <gnustep/base/behavior.h>
+#include <base/Array.h>
+#include <base/NSString.h>
+#include <base/behavior.h>
 
 @implementation ReverseEnumerator
 

Source/Invocation.m

@@ -22,8 +22,8 @@
 */ 
 
 #include <config.h>
-#include <gnustep/base/preface.h>
-#include <gnustep/base/Invocation.h>
+#include <base/preface.h>
+#include <base/Invocation.h>
 #include <Foundation/DistributedObjects.h>
 #include <Foundation/NSValue.h>
 #include <Foundation/NSString.h>

Source/KeyedCollection.m

@@ -22,12 +22,12 @@
 */ 
 
 #include <config.h>
-#include <gnustep/base/KeyedCollection.h>
-#include <gnustep/base/CollectionPrivate.h>
+#include <base/KeyedCollection.h>
+#include <base/CollectionPrivate.h>
 #include <stdio.h>
-#include <gnustep/base/Array.h>
-#include <gnustep/base/NSString.h>
-#include <gnustep/base/behavior.h>
+#include <base/Array.h>
+#include <base/NSString.h>
+#include <base/behavior.h>
 
 @implementation KeyEnumerator
 

Source/LinkedList.m

@@ -22,9 +22,9 @@
 */ 
 
 #include <config.h>
-#include <gnustep/base/LinkedList.h>
-#include <gnustep/base/IndexedCollectionPrivate.h>
-#include <gnustep/base/Coder.h>
+#include <base/LinkedList.h>
+#include <base/IndexedCollectionPrivate.h>
+#include <base/Coder.h>
 
 @implementation LinkedList
 

Source/LinkedListNode.m

@@ -22,8 +22,8 @@
 */ 
 
 #include <config.h>
-#include <gnustep/base/LinkedListNode.h>
-#include <gnustep/base/Coder.h>
+#include <base/LinkedListNode.h>
+#include <base/Coder.h>
 
 @implementation LinkedListNode
 

Source/List.m

@@ -22,7 +22,7 @@
    */ 
 
 #include <config.h>
-#include <gnustep/base/preface.h>
+#include <base/preface.h>
 #include <objc/List.h>
 
 /* Change this #define to 0 if you want -makeObjectsPerform: and 

Source/MachPort.m

@@ -26,10 +26,10 @@
 #if __mach__
 
 #include <config.h>
-#include <gnustep/base/MachPort.h>
+#include <base/MachPort.h>
 #include <Foundation/NSLock.h>
 #include <Foundation/NSException.h>
-#include <gnustep/base/Set.h>
+#include <base/Set.h>
 
 #include <mach/cthreads.h>
 #include <mach/notify.h>

Source/Magnitude.m

@@ -22,8 +22,8 @@
 */ 
 
 #include <config.h>
-#include <gnustep/base/preface.h>
-#include <gnustep/base/Magnitude.h>
+#include <base/preface.h>
+#include <base/Magnitude.h>
 
 /* These methods accesses no instance variables.  It is exactly the kind
    of thing that should be a "behavior" associated with a protocol.

Source/Makefile.postamble

@@ -106,17 +106,15 @@ after-distclean::
 
 # Local links to the include files
 gnustep/base: FORCE
-	if [ ! -d gnustep ]; then \
-	  mkdir gnustep; \
-	  cd gnustep ; $(LN_S) ../include base; \
+	if [ ! -h base ]; then \
+	  $(LN_S) include base; \
 	fi
 	# Make necessary links to source headers if compiling in seperate dir
 	# These are separate directories because one contains the .h files
 	# generated during the build; the other contains the unchanged sources.
 	if [ ! -r ./srcdir-include/Foundation/NSObject.h ]; then \
 	  mkdir srcdir-include; \
-	  mkdir srcdir-include/gnustep; \
-	  (cd srcdir-include/gnustep; $(LN_S) ../../$(srcdir)/include ./base) ; \
+	  (cd srcdir-include; $(LN_S) ../$(srcdir)/include ./base) ; \
 	  (cd srcdir-include; $(LN_S) ../$(srcdir)/include ./Foundation) ; \
 	fi
 
@@ -179,18 +177,15 @@ $(GNUSTEP_OBJ_DIR)/preface${OEXT}: include/preface.h
 # The config.h file is specific to a target
 #
 $(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS)/config.h: ../config.status
-	$(GNUSTEP_MAKEFILES)/mkinstalldirs \
-	   $(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS)
+	$(MKDIRS) $(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS)
 	-mv include/config.h $(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS)
 
 $(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS)/GSConfig.h: ../config.status
-	$(GNUSTEP_MAKEFILES)/mkinstalldirs \
-	   $(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS)
+	$(MKDIRS) $(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS)
 	-mv include/GSConfig.h $(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS)
 
 $(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS)/mframe.h: ../config.status
-	$(GNUSTEP_MAKEFILES)/mkinstalldirs \
-	   $(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS)
+	$(MKDIRS) $(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS)
 	-mv include/mframe.h $(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS)
 
 include/o_%_bas.h: include/o_x_bas.h.in

Source/MappedCollector.m

@@ -22,9 +22,9 @@
 */ 
 
 #include <config.h>
-#include <gnustep/base/MappedCollector.h>
-#include <gnustep/base/Dictionary.h>
-#include <gnustep/base/CollectionPrivate.h>
+#include <base/MappedCollector.h>
+#include <base/Dictionary.h>
+#include <base/CollectionPrivate.h>
 
 @implementation MappedCollector
 

Source/MemoryStream.m

@@ -22,9 +22,9 @@
    */ 
 
 #include <config.h>
-#include <gnustep/base/preface.h>
-#include <gnustep/base/MemoryStream.h>
-#include <gnustep/base/Coder.h>
+#include <base/preface.h>
+#include <base/MemoryStream.h>
+#include <base/Coder.h>
 #include <Foundation/NSData.h>
 #include <Foundation/NSException.h>
 #include <stdarg.h>

Source/NSArchiver.m

@@ -46,7 +46,7 @@
 #include <Foundation/NSUtilities.h>
 #include <Foundation/NSString.h>
 
-#include <gnustep/base/fast.x>
+#include <base/fast.x>
 
 typedef	unsigned char	uchar;
 

Source/NSArray.m

@@ -27,7 +27,7 @@
    */
 
 #include <config.h>
-#include <gnustep/base/behavior.h>
+#include <base/behavior.h>
 #include <Foundation/NSArray.h>
 #include <Foundation/NSCoder.h>
 #include <Foundation/NSString.h>
@@ -37,7 +37,7 @@
 #include <Foundation/NSException.h>
 #include <Foundation/NSAutoreleasePool.h>
 
-#include <gnustep/base/fast.x>
+#include <base/fast.x>
 
 @class NSArrayEnumerator;
 @class NSArrayEnumeratorReverse;

Source/NSAutoreleasePool.m

@@ -22,7 +22,7 @@
    */ 
 
 #include <config.h>
-#include <gnustep/base/preface.h>
+#include <base/preface.h>
 #include <Foundation/NSAutoreleasePool.h>
 #include <Foundation/NSException.h>
 #include <Foundation/NSThread.h>

Source/NSBundle.m

@@ -23,7 +23,7 @@
 */
 
 #include <config.h>
-#include <gnustep/base/preface.h>
+#include <base/preface.h>
 #include <Foundation/objc-load.h>
 #include <Foundation/NSBundle.h>
 #include <Foundation/NSException.h>

Source/NSCTemplateValue.m

@@ -27,7 +27,7 @@
 #include <Foundation/NSString.h>
 #include <Foundation/NSException.h>
 #include <Foundation/NSCoder.h>
-#include <gnustep/base/preface.h>
+#include <base/preface.h>
 
 /* This file should be run through a preprocessor with the macro TYPE_ORDER
    defined to a number from 0 to 4 cooresponding to each value type */

Source/NSCoder.m

@@ -23,7 +23,7 @@
    */
 
 #include <config.h>
-#include <gnustep/base/preface.h>
+#include <base/preface.h>
 #include <Foundation/NSData.h>
 #include <Foundation/NSCoder.h>
 #include <Foundation/NSSerialization.h>

Source/NSConcreteNumber.m

@@ -29,7 +29,7 @@
 #include <Foundation/NSException.h>
 #include <Foundation/NSCoder.h>
 #include <Foundation/NSPortCoder.h>
-#include <gnustep/base/Coder.h>
+#include <base/Coder.h>
 
 /* This file should be run through a preprocessor with the macro TYPE_ORDER
    defined to a number from 0 to 12 cooresponding to each number type */

Source/NSConcreteValue.m

@@ -28,7 +28,7 @@
 #include <Foundation/NSException.h>
 #include <Foundation/NSCoder.h>
 #include <Foundation/NSZone.h>
-#include <gnustep/base/preface.h>
+#include <base/preface.h>
 
 /* This is the real, general purpose value object.  I've implemented all the
    methods here (like pointValue) even though most likely, other concrete

Source/NSConnection.m

@@ -31,11 +31,11 @@
    It's an instance of PortEncoder or PortDecoder. */
 
 #include <config.h>
-#include <gnustep/base/preface.h>
+#include <base/preface.h>
 #include <Foundation/DistributedObjects.h>
-#include <gnustep/base/TcpPort.h>
+#include <base/TcpPort.h>
 #include <mframe.h>
-#include <gnustep/base/NotificationDispatcher.h>
+#include <base/NotificationDispatcher.h>
 #include <Foundation/NSData.h>
 #include <Foundation/NSRunLoop.h>
 #include <Foundation/NSArray.h>

Source/NSCopyObject.m

@@ -22,7 +22,7 @@
    */ 
 
 #include <config.h>
-#include <gnustep/base/preface.h>
+#include <base/preface.h>
 
 NSObject *NSCopyObject(NSObject *anObject, unsigned extraBytes, NSZone *zone)
 {

Source/NSCountedSet.m

@@ -22,7 +22,7 @@
    */
 
 #include <config.h>
-#include <gnustep/base/behavior.h>
+#include <base/behavior.h>
 #include <Foundation/NSSet.h>
 #include <Foundation/NSGSet.h>
 #include <Foundation/NSArray.h>

Source/NSData.m

@@ -62,9 +62,9 @@
 
 #include <config.h>
 #include <objc/objc-api.h>
-#include <gnustep/base/preface.h>
-#include <gnustep/base/fast.x>
-#include <gnustep/base/behavior.h>
+#include <base/preface.h>
+#include <base/fast.x>
+#include <base/behavior.h>
 #include <Foundation/NSByteOrder.h>
 #include <Foundation/NSCoder.h>
 #include <Foundation/NSData.h>

Source/NSDictionary.m

@@ -23,7 +23,7 @@
    */
 
 #include <config.h>
-#include <gnustep/base/behavior.h>
+#include <base/behavior.h>
 #include <Foundation/NSDictionary.h>
 #include <Foundation/NSArray.h>
 #include <Foundation/NSUtilities.h>

Source/NSEnumerator.m

@@ -22,7 +22,7 @@
 */
 
 #include <config.h>
-#include <gnustep/base/preface.h>
+#include <base/preface.h>
 #include <Foundation/NSUtilities.h>
 
 @implementation NSEnumerator

Source/NSException.m

@@ -22,7 +22,7 @@
 */
 
 #include <config.h>
-#include <gnustep/base/preface.h>
+#include <base/preface.h>
 #include <Foundation/NSException.h>
 #include <Foundation/NSString.h>
 #include <Foundation/NSArray.h>

Source/NSFileHandle.m

@@ -22,7 +22,7 @@
    */
 
 #include <config.h>
-#include <gnustep/base/preface.h>
+#include <base/preface.h>
 #include <Foundation/NSObject.h>
 #include <Foundation/NSData.h>
 #include <Foundation/NSString.h>

Source/NSFileManager.m

@@ -25,7 +25,7 @@
 */
 
 #include <config.h>
-#include <gnustep/base/preface.h>
+#include <base/preface.h>
 #include <Foundation/NSFileManager.h>
 #include <Foundation/NSException.h>
 #include <Foundation/NSAutoreleasePool.h>

Source/NSGArchiver.m

@@ -22,13 +22,13 @@
    */
 
 #include <config.h>
-#include <gnustep/base/preface.h>
+#include <base/preface.h>
 #include <Foundation/NSGArchiver.h>
-#include <gnustep/base/Archiver.h>
-#include <gnustep/base/CStream.h>
-#include <gnustep/base/behavior.h>
-#include <gnustep/base/CoderPrivate.h>
-#include <gnustep/base/MemoryStream.h>
+#include <base/Archiver.h>
+#include <base/CStream.h>
+#include <base/behavior.h>
+#include <base/CoderPrivate.h>
+#include <base/MemoryStream.h>
 #include <Foundation/NSException.h>
 
 #define USE_OPENSTEP_STYLE_FORWARD_REFERENCES 1

Source/NSGArray.m

@@ -23,9 +23,9 @@
    */
 
 #include <config.h>
-#include <gnustep/base/preface.h>
+#include <base/preface.h>
 #include <Foundation/NSArray.h>
-#include <gnustep/base/behavior.h>
+#include <base/behavior.h>
 #include <Foundation/NSException.h>
 #include <Foundation/NSPortCoder.h>
 

Source/NSGCString.m

@@ -24,18 +24,18 @@
 */ 
 
 #include <config.h>
-#include <gnustep/base/preface.h>
+#include <base/preface.h>
 #include <Foundation/NSString.h>
 #include <Foundation/NSCoder.h>
-#include <gnustep/base/NSGString.h>
-#include <gnustep/base/NSGCString.h>
-#include <gnustep/base/IndexedCollection.h>
-#include <gnustep/base/IndexedCollectionPrivate.h>
+#include <base/NSGString.h>
+#include <base/NSGCString.h>
+#include <base/IndexedCollection.h>
+#include <base/IndexedCollectionPrivate.h>
 #include <Foundation/NSValue.h>
-#include <gnustep/base/behavior.h>
+#include <base/behavior.h>
 
-#include <gnustep/base/Unicode.h>
-#include <gnustep/base/fast.x>
+#include <base/Unicode.h>
+#include <base/fast.x>
 
 static	SEL	csInitSel = @selector(initWithCStringNoCopy:length:fromZone:);
 static	SEL	msInitSel = @selector(initWithCapacity:);

Source/NSGCountedSet.m

@@ -23,7 +23,7 @@
 
 #include <config.h>
 #include <Foundation/NSSet.h>
-#include <gnustep/base/behavior.h>
+#include <base/behavior.h>
 #include <Foundation/NSAutoreleasePool.h>
 #include <Foundation/NSException.h>
 #include <Foundation/NSUtilities.h>

Source/NSGDictionary.m

@@ -30,7 +30,7 @@
 #include <Foundation/NSException.h>
 #include <Foundation/NSPortCoder.h>
 
-#include <gnustep/base/fast.x>
+#include <base/fast.x>
 
 /*
  *	Evil hack - this structure MUST correspond to the layout of all

Source/NSGDictionary.m.old

@@ -1,146 +0,0 @@
-/* Concrete implementation of NSDictionary based on GNU Dictionary class
-   Copyright (C) 1995, 1996 Free Software Foundation, Inc.
-   
-   Written by:  Andrew Kachites McCallum <mccallum@gnu.ai.mit.edu>
-   Created: April 1995
-   
-   This file is part of the GNUstep Base Library.
-   
-   This library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
-   
-   This library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-   
-   You should have received a copy of the GNU Library General Public
-   License along with this library; if not, write to the Free
-   Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-   */
-
-#include <config.h>
-#include <Foundation/NSDictionary.h>
-#include <gnustep/base/behavior.h>
-#include <gnustep/base/Dictionary.h>
-#include <Foundation/NSUtilities.h>
-#include <Foundation/NSString.h>
-
-@interface NSGDictionary : NSDictionary
-@end
-
-@interface NSGMutableDictionary : NSMutableDictionary
-@end
-
-@class NSDictionaryNonCore;
-@class NSMutableDictionaryNonCore;
-
-@interface NSGDictionaryKeyEnumerator : NSEnumerator
-{
-  NSDictionary *dictionary;
-  void *enum_state;
-}
-@end
-
-@implementation NSGDictionaryKeyEnumerator
-
-- initWithDictionary: (NSDictionary*)d
-{
-  [super init];
-  dictionary = d;
-  [dictionary retain];
-  enum_state = 0;
-  return self;
-}
-
-- nextObject
-{
-  id k;
-  [dictionary nextObjectAndKey: &k withEnumState: &enum_state];
-  return k;
-}
-
-- (void) dealloc
-{
-  [dictionary release];
-  [super dealloc];
-}
-
-@end
-
-@interface NSGDictionaryObjectEnumerator : NSGDictionaryKeyEnumerator
-@end
-
-@implementation NSGDictionaryObjectEnumerator
-
-- nextObject
-{
-  id k;
-  [dictionary nextObjectAndKey: &k withEnumState: &enum_state];
-  return k;
-}
-
-@end
-
-
-@implementation NSGDictionary
-
-+ (void) initialize
-{
-  if (self == [NSGDictionary class])
-    {
-      behavior_class_add_class (self, [NSDictionaryNonCore class]);
-      behavior_class_add_class (self, [Dictionary class]);
-    }
-}
-
-- objectForKey: aKey
-{
-  /* xxx Should I change the method name in Dictionary?
-     I don't really want to; I think "at" is better. */
-  return [self objectAtKey: aKey];
-}
-
-/* 
-   Comes from Dictionary.m 
-   - initWithObjects: (id*)objects
-	  forKeys: (NSObject**)keys
-	    count: (unsigned)count
-   - (unsigned) count 
-   - (NSEnumerator*) keyEnumerator
-   - (NSEnumerator*) objectEnumerator
-   */
-
-@end
-
-@implementation NSGMutableDictionary
-
-+ (void) initialize
-{
-  if (self == [NSGMutableDictionary class])
-    {
-      behavior_class_add_class (self, [NSMutableDictionaryNonCore class]);
-      behavior_class_add_class (self, [NSGDictionary class]);
-      behavior_class_add_class (self, [Dictionary class]);
-    }
-}
-
-
-/* This is the designated initializer */
-/* Comes from Dictionary.m
-   - initWithCapacity: (unsigned)numItems
-   */
-
-- (void) setObject:anObject forKey:(NSObject *)aKey
-{
-  [self putObject: anObject atKey: aKey];
-}
-
-- (void) removeObjectForKey:(NSObject *)aKey
-{
-  [self removeObjectAtKey: aKey];
-}
-
-@end

Source/NSGSequence.m

@@ -23,8 +23,8 @@
 
 
 #include <config.h>
-#include <gnustep/base/preface.h>
-#include <gnustep/base/Coding.h>
+#include <base/preface.h>
+#include <base/Coding.h>
 #include <Foundation/NSString.h>
 #include <Foundation/NSArray.h>
 #include <Foundation/NSCharacterSet.h>
@@ -32,8 +32,8 @@
 #include <Foundation/NSValue.h>
 #include <Foundation/NSDictionary.h>
 #include <Foundation/NSUserDefaults.h>
-#include <gnustep/base/IndexedCollection.h>
-#include <gnustep/base/IndexedCollectionPrivate.h>
+#include <base/IndexedCollection.h>
+#include <base/IndexedCollectionPrivate.h>
 #include <limits.h>
 #include <string.h>		// for strstr()
 #include <sys/stat.h>
@@ -42,8 +42,8 @@
 #include <fcntl.h>
 #include <stdio.h>
 
-#include <gnustep/base/NSGSequence.h>
-#include <gnustep/base//Unicode.h>
+#include <base/NSGSequence.h>
+#include <base//Unicode.h>
 
 
 #define FALSE 0

Source/NSGSet.m

@@ -24,7 +24,7 @@
 
 #include <config.h>
 #include <Foundation/NSSet.h>
-#include <gnustep/base/behavior.h>
+#include <base/behavior.h>
 #include <Foundation/NSAutoreleasePool.h>
 #include <Foundation/NSException.h>
 #include <Foundation/NSUtilities.h>

Source/NSGString.m

@@ -30,19 +30,19 @@
 */ 
 
 #include <config.h>
-#include <gnustep/base/preface.h>
+#include <base/preface.h>
 #include <Foundation/NSString.h>
 #include <Foundation/NSGString.h>
 #include <Foundation/NSCoder.h>
-#include <gnustep/base/IndexedCollection.h>
-#include <gnustep/base/IndexedCollectionPrivate.h>
+#include <base/IndexedCollection.h>
+#include <base/IndexedCollectionPrivate.h>
 #include <Foundation/NSValue.h>
-#include <gnustep/base/behavior.h>
-#include <gnustep/base/NSGSequence.h>
+#include <base/behavior.h>
+#include <base/NSGSequence.h>
 /* memcpy(), strlen(), strcmp() are gcc builtin's */
 
-#include <gnustep/base/fast.x>
-#include <gnustep/base/Unicode.h>
+#include <base/fast.x>
+#include <base/Unicode.h>
 
 
 @implementation NSGString

Source/NSGeometry.m

@@ -24,7 +24,7 @@
 
 #include <config.h>
 #include <math.h>
-#include <gnustep/base/preface.h>
+#include <base/preface.h>
 #include <Foundation/NSString.h>
 #include <Foundation/NSGeometry.h>
 #include <Foundation/NSScanner.h>

Source/NSHashTable.m

@@ -30,7 +30,7 @@
 #include <Foundation/NSArray.h>
 #include <Foundation/NSException.h>
 #include <Foundation/NSHashTable.h>
-#include <gnustep/base/o_hash.h>
+#include <base/o_hash.h>
 #include "NSCallBacks.h"
 
 /** Macros... **/

Source/NSHost.m

@@ -22,7 +22,7 @@
    */ 
 
 #include <config.h>
-#include <gnustep/base/preface.h>
+#include <base/preface.h>
 #include <Foundation/NSLock.h>
 #include <Foundation/NSHost.h>
 #include <Foundation/NSArray.h>

Source/NSLock.m

@@ -22,7 +22,7 @@
 */ 
 
 #include <config.h>
-#include <gnustep/base/preface.h>
+#include <base/preface.h>
 #include <Foundation/NSLock.h>
 #include <Foundation/NSException.h>
 

Source/NSMapTable.m

@@ -31,7 +31,7 @@
 #include <Foundation/NSException.h>
 #include <Foundation/NSZone.h>
 #include <Foundation/NSMapTable.h>
-#include <gnustep/base/o_map.h>
+#include <base/o_map.h>
 #include "NSCallBacks.h"
 
 /** Dummy callbacks... **/

Source/NSMethodSignature.m

@@ -24,7 +24,7 @@
    */ 
 
 #include <config.h>
-#include <gnustep/base/preface.h>
+#include <base/preface.h>
 #include <mframe.h>
 
 #include <Foundation/NSMethodSignature.h>

Source/NSNotificationCenter.m

@@ -23,8 +23,8 @@
 
 #include <config.h>
 #include <Foundation/NSNotification.h>
-#include <gnustep/base/NotificationDispatcher.h>
-#include <gnustep/base/behavior.h>
+#include <base/NotificationDispatcher.h>
+#include <base/behavior.h>
 
 @implementation NSNotificationCenter
 

Source/NSNotificationQueue.m

@@ -46,7 +46,7 @@
    */
 
 #include <config.h>
-#include <gnustep/base/preface.h>
+#include <base/preface.h>
 #include <Foundation/NSRunLoop.h>
 #include <Foundation/NSNotificationQueue.h>
 #include <Foundation/NSNotification.h>

Source/NSNumber.m

@@ -23,7 +23,7 @@
 */
 
 #include <config.h>
-#include <gnustep/base/preface.h>
+#include <base/preface.h>
 #include <Foundation/NSException.h>
 #include <Foundation/NSString.h>
 #include <Foundation/NSConcreteNumber.h>

Source/NSObjCRuntime.m

@@ -22,8 +22,8 @@
    */ 
 
 #include <config.h>
-#include <gnustep/base/preface.h>
-#include <gnustep/base/fast.x>
+#include <base/preface.h>
+#include <base/fast.x>
 #include <Foundation/NSObjCRuntime.h>
 #include <Foundation/NSString.h>
 #include <mframe.h>

Source/NSObject.m

@@ -22,17 +22,17 @@
    */ 
 
 #include <config.h>
-#include <gnustep/base/preface.h>
+#include <base/preface.h>
 #include <stdarg.h>
 #include <Foundation/NSObject.h>
 #include <objc/Protocol.h>
 #include <objc/objc-api.h>
 #include <Foundation/NSMethodSignature.h>
-#include <gnustep/base/Invocation.h>
+#include <base/Invocation.h>
 #include <Foundation/NSInvocation.h>
 #include <Foundation/NSAutoreleasePool.h>
 #include <Foundation/NSString.h>
-#include <gnustep/base/o_map.h>
+#include <base/o_map.h>
 #include <Foundation/NSArray.h>
 #include <Foundation/NSException.h>
 #include <Foundation/NSPortCoder.h>
@@ -40,7 +40,7 @@
 #include <Foundation/NSZone.h>
 #include <limits.h>
 
-#include <gnustep/base/fast.x>
+#include <base/fast.x>
 
 fastCls	_fastCls;	/* Structure to cache classes.	*/
 fastImp	_fastImp;	/* Structure to cache methods.	*/

Source/NSPage.m

@@ -22,7 +22,7 @@
    */ 
 
 #include <config.h>
-#include <gnustep/base/preface.h>
+#include <base/preface.h>
 #include <string.h>
 #ifndef __WIN32__
 #include <unistd.h>

Source/NSPipe.m

@@ -22,7 +22,7 @@
    */
 
 #include <config.h>
-#include <gnustep/base/preface.h>
+#include <base/preface.h>
 #include <Foundation/NSObject.h>
 #include <Foundation/NSFileHandle.h>
 

Source/NSPortCoder.m

@@ -30,11 +30,11 @@
    */
 
 #include <config.h>
-#include <gnustep/base/preface.h>
-#include <gnustep/base/Coder.h>
-#include <gnustep/base/CStream.h>
-#include <gnustep/base/Port.h>
-#include <gnustep/base/MemoryStream.h>
+#include <base/preface.h>
+#include <base/Coder.h>
+#include <base/CStream.h>
+#include <base/Port.h>
+#include <base/MemoryStream.h>
 #include <Foundation/NSException.h>
 #include <Foundation/DistributedObjects.h>
 

Source/NSPortNameServer.m

@@ -35,7 +35,7 @@
 #include <Foundation/NSSet.h>
 #include <Foundation/NSHost.h>
 #include <Foundation/NSPortNameServer.h>
-#include <gnustep/base/TcpPort.h>
+#include <base/TcpPort.h>
 
 /*
  *	Protocol definition stuff for talking to gdomap process.

Source/NSRunLoop.m

@@ -51,8 +51,8 @@
    */
 
 #include <config.h>
-#include <gnustep/base/preface.h>
-#include <gnustep/base/Heap.h>
+#include <base/preface.h>
+#include <base/Heap.h>
 #include <Foundation/NSMapTable.h>
 #include <Foundation/NSDate.h>
 #include <Foundation/NSValue.h>

Source/NSSerializer.m

@@ -22,8 +22,8 @@
    */
 
 #include <config.h>
-#include <gnustep/base/preface.h>
-#include <gnustep/base/fast.x>
+#include <base/preface.h>
+#include <base/fast.x>
 #include <mframe.h>
 #include <Foundation/NSData.h>
 #include <Foundation/NSDictionary.h>

Source/NSSet.m

@@ -22,7 +22,7 @@
    */
 
 #include <config.h>
-#include <gnustep/base/behavior.h>
+#include <base/behavior.h>
 #include <Foundation/NSSet.h>
 #include <Foundation/NSGSet.h>
 #include <Foundation/NSArray.h>

Source/NSString.m

@@ -40,8 +40,8 @@
 */
 
 #include <config.h>
-#include <gnustep/base/preface.h>
-#include <gnustep/base/Coding.h>
+#include <base/preface.h>
+#include <base/Coding.h>
 #include <Foundation/NSString.h>
 #include <Foundation/NSArray.h>
 #include <Foundation/NSCharacterSet.h>
@@ -53,10 +53,10 @@
 #include <Foundation/NSPortCoder.h>
 #include <Foundation/NSPathUtilities.h>
 
-#include <gnustep/base/IndexedCollection.h>
+#include <base/IndexedCollection.h>
 #include <Foundation/NSData.h>
 #include <Foundation/NSBundle.h>
-#include <gnustep/base/IndexedCollectionPrivate.h>
+#include <base/IndexedCollectionPrivate.h>
 #include <limits.h>
 #include <string.h>		// for strstr()
 #include <sys/stat.h>
@@ -65,15 +65,15 @@
 #include <fcntl.h>
 #include <stdio.h>
 
-#include <gnustep/base/behavior.h>
+#include <base/behavior.h>
 
-#include <gnustep/base/NSGSequence.h>
-#include <gnustep/base/Unicode.h>
-#include <gnustep/base/GetDefEncoding.h>
-#include <gnustep/base/NSGString.h>
-#include <gnustep/base/NSGCString.h>
+#include <base/NSGSequence.h>
+#include <base/Unicode.h>
+#include <base/GetDefEncoding.h>
+#include <base/NSGString.h>
+#include <base/NSGCString.h>
 
-#include <gnustep/base/fast.x>
+#include <base/fast.x>
 
 
 // Uncomment when implemented

Source/NSTask.m

@@ -22,7 +22,7 @@
    */
 
 #include <config.h>
-#include <gnustep/base/preface.h>
+#include <base/preface.h>
 #include <Foundation/NSObject.h>
 #include <Foundation/NSData.h>
 #include <Foundation/NSDate.h>

Source/NSThread.m

@@ -26,8 +26,8 @@
 #include <Foundation/NSThread.h>
 #include <Foundation/NSLock.h>
 #include <Foundation/NSString.h>
-#include <gnustep/base/o_map.h>
-#include <gnustep/base/NotificationDispatcher.h>
+#include <base/o_map.h>
+#include <base/NotificationDispatcher.h>
 
 // Class variables
 

Source/NSTimeZone.m

@@ -42,7 +42,7 @@
    FIXME?: use leap seconds? */
 
 #include <config.h>
-#include <gnustep/base/preface.h>
+#include <base/preface.h>
 #include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>

Source/NSUnarchiver.m

@@ -44,7 +44,7 @@
 #include <Foundation/NSUtilities.h>
 #include <Foundation/NSString.h>
 
-#include <gnustep/base/fast.x>
+#include <base/fast.x>
 
 typedef	unsigned char uchar;
 

Source/NSUser.m

@@ -23,7 +23,7 @@
 
 #include <config.h>
 #include <objc/objc-api.h>
-#include <gnustep/base/preface.h>
+#include <base/preface.h>
 #include <Foundation/NSString.h>
 #include <Foundation/NSPathUtilities.h>
 #include <Foundation/NSArray.h>

Source/NSUserDefaults.m

@@ -23,7 +23,7 @@
 */ 
 
 #include <config.h>
-#include <gnustep/base/preface.h>
+#include <base/preface.h>
 #if 0 
 /* My Linux doesn't have <libc.h>.  Why is this necessary? 
    What is a work-around that will work for all?  -mccallum*/

Source/NSValue.m

@@ -22,7 +22,7 @@
 */
 
 #include <config.h>
-#include <gnustep/base/preface.h>
+#include <base/preface.h>
 #include <Foundation/NSConcreteValue.h>
 #include <Foundation/NSCoder.h>
 #include <Foundation/NSDictionary.h>

Source/NSZone.m

@@ -81,7 +81,7 @@
 
 
 #include <config.h>
-#include <gnustep/base/preface.h>
+#include <base/preface.h>
 #include <stddef.h>
 #include <string.h>
 #include <objc/objc-api.h>

Source/NXStringTable.m

@@ -31,7 +31,7 @@
 #include <config.h>
 #include <stdio.h>
 #include <string.h>
-#include <gnustep/base/preface.h>
+#include <base/preface.h>
 #include <objc/NXStringTable.h>
 
 char *

Source/NotificationDispatcher.m

@@ -28,10 +28,10 @@
    NotificationDistributor class. */
 
 #include <config.h>
-#include <gnustep/base/NotificationDispatcher.h>
-#include <gnustep/base/LinkedListNode.h>
-#include <gnustep/base/Array.h>
-#include <gnustep/base/Invocation.h>
+#include <base/NotificationDispatcher.h>
+#include <base/LinkedListNode.h>
+#include <base/Array.h>
+#include <base/Invocation.h>
 #include <Foundation/NSNotification.h>
 #include <Foundation/NSException.h>
 

Source/OrderedCollection.m

@@ -22,10 +22,10 @@
 */ 
 
 #include <config.h>
-#include <gnustep/base/OrderedCollection.h>
+#include <base/OrderedCollection.h>
 #include <stdio.h>
-#include <gnustep/base/Array.h>
-#include <gnustep/base/NSString.h>
+#include <base/Array.h>
+#include <base/NSString.h>
 #include <Foundation/NSException.h>
 
 

Source/Port.m

@@ -22,9 +22,9 @@
    */ 
 
 #include <config.h>
-#include <gnustep/base/Port.h>
-#include <gnustep/base/Coder.h>	/* for Coding protocol in Object category */
-#include <gnustep/base/NotificationDispatcher.h>
+#include <base/Port.h>
+#include <base/Coder.h>	/* for Coding protocol in Object category */
+#include <base/NotificationDispatcher.h>
 #include <Foundation/NSException.h>
 
 @implementation Port

Source/Queue.m

@@ -22,8 +22,8 @@
 */ 
 
 #include <config.h>
-#include <gnustep/base/Queue.h>
-#include <gnustep/base/ArrayPrivate.h>
+#include <base/Queue.h>
+#include <base/ArrayPrivate.h>
 
 @implementation Queue
   

Source/RBTree.m

@@ -22,9 +22,9 @@
 */ 
 
 #include <config.h>
-#include <gnustep/base/RBTree.h>
-#include <gnustep/base/IndexedCollectionPrivate.h>
-#include <gnustep/base/RBTreeNode.h>
+#include <base/RBTree.h>
+#include <base/IndexedCollectionPrivate.h>
+#include <base/RBTreeNode.h>
 
 #define NODE_IS_RED(NODE) ([NODE isRed])
 #define NODE_IS_BLACK(NODE) (![NODE isRed])

Source/RBTreeNode.m

@@ -22,8 +22,8 @@
 */ 
 
 #include <config.h>
-#include <gnustep/base/RBTreeNode.h>
-#include <gnustep/base/NSString.h>
+#include <base/RBTreeNode.h>
+#include <base/NSString.h>
 
 @implementation RBTreeNode
 

Source/RNGAdditiveCongruential.m

@@ -22,8 +22,8 @@
 */ 
 
 #include <config.h>
-#include <gnustep/base/RNGAdditiveCongruential.h>
-#include <gnustep/base/Coder.h>
+#include <base/RNGAdditiveCongruential.h>
+#include <base/Coder.h>
 #include <limits.h>
 
 /* Additive Congruential Method,

Source/RNGBerkeley.m

@@ -45,8 +45,8 @@
  */
 
 #include <config.h>
-#include <gnustep/base/RNGBerkeley.h>
-#include <gnustep/base/Coder.h>
+#include <base/RNGBerkeley.h>
+#include <base/Coder.h>
 #include <errno.h>
 #include <limits.h>
 #include <stddef.h>

Source/Random.m

@@ -27,10 +27,10 @@
 */
 
 #include <config.h>
-#include <gnustep/base/Random.h>
-#include <gnustep/base/RNGBerkeley.h>
-#include <gnustep/base/Time.h>
-#include <gnustep/base/Coder.h>
+#include <base/Random.h>
+#include <base/RNGBerkeley.h>
+#include <base/Time.h>
+#include <base/Coder.h>
 #include <Foundation/NSException.h>
 #include <limits.h>
 

Source/RawCStream.m

@@ -26,12 +26,12 @@
    WARNING: This encoding is *not* machine-independent. */
 
 #include <config.h>
-#include <gnustep/base/preface.h>
-#include <gnustep/base/RawCStream.h>
-#include <gnustep/base/NSString.h>
-#include <gnustep/base/StdioStream.h>
-#include <gnustep/base/TextCStream.h>
-#include <gnustep/base/NSException.h>
+#include <base/preface.h>
+#include <base/RawCStream.h>
+#include <base/NSString.h>
+#include <base/StdioStream.h>
+#include <base/TextCStream.h>
+#include <base/NSException.h>
 
 #define DEFAULT_FORMAT_VERSION 0
 

Source/Set.m

@@ -22,9 +22,9 @@
 */ 
 
 #include <config.h>
-#include <gnustep/base/Set.h>
-#include <gnustep/base/CollectionPrivate.h>
-#include <gnustep/base/Coder.h>
+#include <base/Set.h>
+#include <base/CollectionPrivate.h>
+#include <base/Coder.h>
 #include <Foundation/NSHashTable.h>
 
 #define DEFAULT_SET_CAPACITY 32

Source/SplayTree.m

@@ -22,8 +22,8 @@
 */ 
 
 #include <config.h>
-#include <gnustep/base/SplayTree.h>
-#include <gnustep/base/IndexedCollectionPrivate.h>
+#include <base/SplayTree.h>
+#include <base/IndexedCollectionPrivate.h>
 
 @implementation SplayTree
 

Source/Stack.m

@@ -22,8 +22,8 @@
    */ 
 
 #include <config.h>
-#include <gnustep/base/Stack.h>
-#include <gnustep/base/ArrayPrivate.h>
+#include <base/Stack.h>
+#include <base/ArrayPrivate.h>
 
 @implementation Stack 
   

Source/StdioStream.m

@@ -26,9 +26,9 @@
 #endif
 
 #include <config.h>
-#include <gnustep/base/preface.h>
-#include <gnustep/base/StdioStream.h>
-#include <gnustep/base/Coder.h>
+#include <base/preface.h>
+#include <base/StdioStream.h>
+#include <base/Coder.h>
 #include <Foundation/NSException.h>
 #include <Foundation/NSDebug.h>
 #include <stdarg.h>

Source/Storage.m

@@ -23,7 +23,7 @@
 
 #include <config.h>
 #include <objc/Storage.h>
-#include <gnustep/base/preface.h>
+#include <base/preface.h>
 /* memcpy() and memcmp() are gcc builtin's */
 
 /* Deal with bzero: */

Source/Stream.m

@@ -22,11 +22,11 @@
    */ 
 
 #include <config.h>
-#include <gnustep/base/preface.h>
-#include <gnustep/base/Stream.h>
-#include <gnustep/base/Coder.h>
-#include <gnustep/base/Coder.h>
-#include <gnustep/base/NSString.h>
+#include <base/preface.h>
+#include <base/Stream.h>
+#include <base/Coder.h>
+#include <base/Coder.h>
+#include <base/NSString.h>
 
 @implementation Stream
 

Source/TcpPort.m

@@ -34,13 +34,13 @@
    */
 
 #include <config.h>
-#include <gnustep/base/preface.h>
-#include <gnustep/base/TcpPort.h>
-#include <gnustep/base/Array.h>
-#include <gnustep/base/NotificationDispatcher.h>
-#include <gnustep/base/NSException.h>
+#include <base/preface.h>
+#include <base/TcpPort.h>
+#include <base/Array.h>
+#include <base/NotificationDispatcher.h>
+#include <base/NSException.h>
 #include <Foundation/NSRunLoop.h>
-#include <gnustep/base/Invocation.h>
+#include <base/Invocation.h>
 #include <Foundation/NSData.h>
 #include <Foundation/NSDate.h>
 #include <Foundation/NSPortNameServer.h>