diff --git a/ChangeLog b/ChangeLog
index 15bcec655..9c049b8b1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-09-08  Richard Frith-Macdonald <rfm@gnu.org>
+
+	* Headers/Foundation/NSObject.h:
+	* Source/NSObject.m:
+	Remove old TypedStream methods
+	* Source/NSFileManager.m:
+	Warn if filesystem support is not available.
+
 2010-09-07 Eric Wasylishen <ewasylishen@gmail.com>
 
 	* Headers/Additions/GNUstepBase/preface.h.in: Remove include of
diff --git a/Headers/Additions/GNUstepBase/preface.h.in b/Headers/Additions/GNUstepBase/preface.h.in
index 1dc495129..5b537ade0 100644
--- a/Headers/Additions/GNUstepBase/preface.h.in
+++ b/Headers/Additions/GNUstepBase/preface.h.in
@@ -81,8 +81,6 @@
  #include <objc/objc.h>
  #include <objc/objc-api.h>
  #include <objc/encoding.h>
- /* #include <objc/sarray.h> */
- /* #include <objc/objc-list.h> */
 #endif
 
 /*
diff --git a/Headers/Foundation/NSObject.h b/Headers/Foundation/NSObject.h
index 1c315a0b8..d013f54d7 100644
--- a/Headers/Foundation/NSObject.h
+++ b/Headers/Foundation/NSObject.h
@@ -29,7 +29,6 @@
 
 #import	<Foundation/NSObjCRuntime.h>
 #import <objc/objc.h>
-#import <objc/typedstream.h>
 #import	<Foundation/NSZone.h>
 
 #ifndef	GS_WITH_GC
@@ -411,8 +410,6 @@ GS_EXPORT NSRecursiveLock *gnustep_global_lock;
 #if GS_API_VERSION(GS_API_NONE, 011700)
 @interface NSObject (GNUstep)
 + (void) enableDoubleReleaseCheck: (BOOL)enable;
-- (id) read: (TypedStream*)aStream;
-- (id) write: (TypedStream*)aStream;
 @end
 #endif
 
diff --git a/Source/NSFileManager.m b/Source/NSFileManager.m
index ad8eed65a..2400cd4ac 100644
--- a/Source/NSFileManager.m
+++ b/Source/NSFileManager.m
@@ -1957,7 +1957,7 @@ static NSStringEncoding	defaultEncoding;
 
   return [NSDictionary dictionaryWithObjects: values forKeys: keys count: 5];
 #else
-  NSDebugMLLog(@"NSFileManager", @"no support for filesystem attributes");
+  NSLog(@"NSFileManager", @"no support for filesystem attributes");
   return nil;
 #endif
 #endif /* MINGW */
diff --git a/Source/NSObject.m b/Source/NSObject.m
index bcdd26d16..56f7e5445 100644
--- a/Source/NSObject.m
+++ b/Source/NSObject.m
@@ -2325,50 +2325,24 @@ objc_create_block_classes_as_subclasses_of(Class super) __attribute__((weak));
 		      YES));
 }
 
-+ (NSInteger) streamVersion: (TypedStream*)aStream
++ (NSInteger) streamVersion: (void*)aStream
 {
-#if !defined(NeXT_RUNTIME) && !defined(__GNUSTEP_RUNTIME__)
-  if (aStream->mode == OBJC_READONLY)
-    return objc_get_stream_class_version (aStream, self);
-  else
-#endif
-    return class_get_version (self);
+  GSOnceMLog(@"[NSObject+streamVersion:] is deprecated ... do not use");
+  return class_get_version (self);
 }
-
-//NOTE: original comments included the following excerpt, however it is
-//      probably not relevant now since the implementations are stubbed out.
-//  Subclasses should extend these, by calling
-//  [super read/write: aStream] before doing their own archiving.  These
-//  methods are private, in the sense that they should only be called from
-//  subclasses.
-
-/**
- * Originally used to read the instance variables declared in this
- * particular part of the object from a stream.  Currently stubbed out.
- */
-- (id) read: (TypedStream*)aStream
+- (id) read: (void*)aStream
 {
-  // [super read: aStream];
+  GSOnceMLog(@"[NSObject-read:] is deprecated ... do not use");
   return self;
 }
-
-/**
- * Originally used to write the instance variables declared in this
- * particular part of the object to a stream.  Currently stubbed out.
- */
-- (id) write: (TypedStream*)aStream
+- (id) write: (void*)aStream
 {
-  // [super write: aStream];
+  GSOnceMLog(@"[NSObject-write:] is deprecated ... do not use");
   return self;
 }
-
-/**
- * Originally used before [NSCoder] and related classes existed.  Currently
- * stubbed out.
- */
 - (id) awake
 {
-  // [super awake];
+  GSOnceMLog(@"[NSObject-awake] is deprecated ... do not use");
   return self;
 }