diff --git a/Source/Coder.m b/Source/Coder.m
index 96c6f6137..395eb4af6 100644
--- a/Source/Coder.m
+++ b/Source/Coder.m
@@ -56,8 +56,8 @@ my_object_is_class(id object)
       && CLS_ISMETA(((Class)object)->isa)
       && ((Class)object)->isa != ((Class)object)->isa)
 #else
-      && CLS_ISMETA(((Class*)object)->class_pointer)
-      && ((Class*)object)->class_pointer != ((Class*)object)->class_pointer)
+      && CLS_ISMETA(((Class)object)->class_pointer)
+      && ((Class)object)->class_pointer != ((Class)object)->class_pointer)
 #endif
     return YES;
   else
diff --git a/Source/NSObject.m b/Source/NSObject.m
index bed833564..a81f3850e 100644
--- a/Source/NSObject.m
+++ b/Source/NSObject.m
@@ -1,8 +1,31 @@
+/* Implementation of NSObject for GNUStep
+   Copyright (C) 1994, 1995 Free Software Foundation, Inc.
+   
+   Written by:  R. Andrew McCallum <mccallum@gnu.ai.mit.edu>
+   Date: August 1994
+   
+   This file is part of the GNU Objective C Class 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 <objects/stdobjects.h>
 #include <foundation/NSObject.h>
-#include <foundation/NSMethodSignature.h>
-#include <foundation/NSArchiver.h>
-#include <foundation/NSCoder.h>
+// #include <foundation/NSMethodSignature.h>
+// #include <foundation/NSArchiver.h>
+// #include <foundation/NSCoder.h>
 
 @implementation NSObject
 
@@ -36,6 +59,12 @@
   return object_dispose(self);
 }
 
+- free
+{
+  [self error:"Use `dealloc' instead of `free'."];
+  return nil;
+}
+
 - (id) init
 {
   return self;
@@ -100,6 +129,11 @@
   return nil;
 }
 
+- (BOOL) isProxy
+{
+  return NO;
+}
+
 + (NSString*) description
 {
   return nil;
@@ -152,7 +186,7 @@
   return;
 }
 
-- (id) awakAfterUsingCoder: (NSCoder*)aDecoder
+- (id) awakeAfterUsingCoder: (NSCoder*)aDecoder
 {
   return self;
 }
@@ -179,4 +213,28 @@
 
 @end
 
-#endif /* __NSNSObject_h_INCLUDE_GNU */
+NSObject *NSAllocateObject(Class aClass, unsigned extraBytes, NSZone *zone)
+{
+  
+}
+
+void NSDeallocateObject(NSObject *anObject)
+{
+  
+}
+
+NSObject *NSCopyObject(NSObject *anObject, unsigned extraBytes, NSZone *zone)
+{
+}
+
+BOOL NSShouldRetainWithZone(NSObject *anObject, NSZone *requestedZone)
+{
+}
+
+void NSIncrementExtraRefCount(id anObject)
+{
+}
+
+BOOL NSDecrementExtraRefCountWasZero(id anObject)
+{
+}
diff --git a/Source/NXConnection.m b/Source/NXConnection.m
index b004465d8..f5fc83152 100644
--- a/Source/NXConnection.m
+++ b/Source/NXConnection.m
@@ -26,7 +26,7 @@
 #include <objects/ConnectedCoder.h>
 #include <assert.h>
 
-static Class* NXConnectionProxyClass;
+static Class NXConnectionProxyClass;
 
 /* Just to make -encodeRemotelyFor:... work */
 @interface NXConnectedCoder : ConnectedCoder
@@ -54,13 +54,13 @@ static Class* NXConnectionProxyClass;
   return self;
 }
 
-+ setDefaultProxyClass: (Class*)aClass
++ setDefaultProxyClass: (Class)aClass
 {
   NXConnectionProxyClass = aClass;
   return self;
 }
 
-+ (Class*) defaultProxyClass
++ (Class) defaultProxyClass
 {
   return NXConnectionProxyClass;
 }
@@ -223,13 +223,13 @@ static Class* NXConnectionProxyClass;
   return [self setRootObject:anObj];
 }
 
-- (Class*) proxyClass
+- (Class) proxyClass
 {
   /* we might replace this with a per-Connection proxy class. */
   return NXConnectionProxyClass;
 }
 
-- (Class*) coderClass
+- (Class) coderClass
 {
   return [NXConnectedCoder class];
 }
diff --git a/Source/Proxy.m b/Source/Proxy.m
index 5ae0824df..7d96e6301 100644
--- a/Source/Proxy.m
+++ b/Source/Proxy.m
@@ -96,9 +96,9 @@ static id tmp_kludge_protocol = nil;
   return self;
 }
 #else
-+ (Class*) class
++ (Class) class
 {
-  return (Class*)self;
+  return (Class)self;
 }
 #endif
 
diff --git a/Source/objc-gnu2next.m b/Source/objc-gnu2next.m
index 7475f19a1..aaa09ee68 100644
--- a/Source/objc-gnu2next.m
+++ b/Source/objc-gnu2next.m
@@ -72,7 +72,7 @@ objc_sizeof_type(const char* type)
     break;
 
   case _C_CLASS:
-    return sizeof(Class*);
+    return sizeof(Class);
     break;
 
   case _C_SEL:
@@ -179,7 +179,7 @@ objc_alignof_type(const char* type)
     break;
 
   case _C_CLASS:
-    return __alignof__(Class*);
+    return __alignof__(Class);
     break;
     
   case _C_SEL: