diff --git a/ChangeLog b/ChangeLog
index 54f1548f1..8c9c67b11 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Aug 31 16:28:58 1998  Adam Fedor  <fedor@ultra.doc.com>
+
+	* src/NSBundle.m (+mainBundle:): Remove *_obj directory to
+	find main bundle path.
+
 Wed Sep 02 14:15:00 1998  Richard Frith-Macdonald <richard@brainstorm.co.uk>
 
 	* src/Coder.m: ([-decodeObject:]) fixed to autorelease as it should.
diff --git a/Source/NSBundle.m b/Source/NSBundle.m
index 4e21be48d..9722f337c 100644
--- a/Source/NSBundle.m
+++ b/Source/NSBundle.m
@@ -280,6 +280,10 @@ _bundle_load_callback(Class theClass, Category *theCategory)
       s = [path lastPathComponent];
       if ([s isEqual: gnustep_target_cpu])
 	path = [path stringByDeletingLastPathComponent];
+      /* object dir */
+      s = [path lastPathComponent];
+      if ([s hasSuffix: @"_obj"])
+	path = [path stringByDeletingLastPathComponent];
 
       NSDebugLLog(@"NSBundle", @"(NSBundle): Found main in %@\n", path);
       /* We do alloc and init separately so initWithPath: knows
diff --git a/Source/StdioStream.m b/Source/StdioStream.m
index 77d2a12a9..131791d51 100644
--- a/Source/StdioStream.m
+++ b/Source/StdioStream.m
@@ -21,7 +21,9 @@
    Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
    */ 
 
+#ifndef _REENTRANT
 #define _REENTRANT
+#endif
 
 #include <config.h>
 #include <gnustep/base/preface.h>
diff --git a/Testing/GNUmakefile b/Testing/GNUmakefile
index fd01607bc..e8c11d2ca 100644
--- a/Testing/GNUmakefile
+++ b/Testing/GNUmakefile
@@ -37,7 +37,6 @@ TEST_TOOL_NAME = \
 test01 \
 test02 \
 heap \
-nxst \
 prepend \
 pipes \
 server \
diff --git a/Testing/tcpport-server.m b/Testing/tcpport-server.m
index 4d17858fe..e1c7f543b 100644
--- a/Testing/tcpport-server.m
+++ b/Testing/tcpport-server.m
@@ -1,7 +1,7 @@
 #include <stdio.h>
 #include <gnustep/base/TcpPort.h>
-#include <gnustep/base/Notification.h>
 #include <gnustep/base/Invocation.h>
+#include <Foundation/NSNotification.h>
 #include <Foundation/NSRunLoop.h>
 
 id announce_new_connection (id notification)