diff --git a/Source/Coder.m b/Source/Coder.m
index 10cf5125e..0cf281a6d 100644
--- a/Source/Coder.m
+++ b/Source/Coder.m
@@ -35,7 +35,6 @@
 #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>
@@ -276,7 +275,7 @@ static BOOL debug_coder = NO;
 + (NSData*) archivedDataWithRootObject: (id)rootObject
 {
   id d = [[NSMutableData alloc] init];
-  id a = [[Archiver alloc] initForWritingWithMutableData:d];
+  id a = [[NSArchiver alloc] initForWritingWithMutableData:d];
   [a encodeRootObject:rootObject];
   return [d autorelease];
 }
diff --git a/Source/ConnectedCoder.m b/Source/ConnectedCoder.m
index 5ca796fc4..cd53a44be 100644
--- a/Source/ConnectedCoder.m
+++ b/Source/ConnectedCoder.m
@@ -23,7 +23,6 @@
 
 #include <config.h>
 #include <base/preface.h>
-#include <base/RunLoop.h>
 #include <base/ConnectedCoder.h>
 #include <base/CStream.h>
 #include <base/Port.h>
@@ -31,6 +30,7 @@
 #include <Foundation/NSConnection.h>
 #include <Foundation/NSProxy.h>
 #include <Foundation/NSException.h>
+#include <Foundation/NSRunLoop.h>
 
 #define PTR2LONG(P) (((char*)(P))-(char*)0)
 #define LONG2PTR(L) (((char*)0)+(L))