diff --git a/Headers/Foundation/NSObject.h b/Headers/Foundation/NSObject.h
index b9c185fe9..15844ee23 100644
--- a/Headers/Foundation/NSObject.h
+++ b/Headers/Foundation/NSObject.h
@@ -298,7 +298,7 @@ extern "C" {
  * instance variables of the object.<br />
  * This function is used by the [NSObject+allocWithZone:] method.
  */
-GS_EXPORT NSObject *
+GS_EXPORT id
 NSAllocateObject(Class aClass, NSUInteger extraBytes, NSZone *zone);
 
 /**
@@ -306,7 +306,7 @@ NSAllocateObject(Class aClass, NSUInteger extraBytes, NSZone *zone);
  * This function is used by the [NSObject-dealloc] method.
  */
 GS_EXPORT void
-NSDeallocateObject(NSObject *anObject);
+NSDeallocateObject(id anObject);
 
 /**
  * Used to copy anObject.  This makes a bitwise copy of anObject to
diff --git a/Source/NSObject.m b/Source/NSObject.m
index 5208ff161..4d9c073da 100644
--- a/Source/NSObject.m
+++ b/Source/NSObject.m
@@ -555,7 +555,7 @@ GSIsFinalizable(Class c)
   return NO;
 }
 
-inline NSObject *
+inline id
 NSAllocateObject(Class aClass, NSUInteger extraBytes, NSZone *zone)
 {
   id	new;
@@ -601,7 +601,7 @@ NSAllocateObject(Class aClass, NSUInteger extraBytes, NSZone *zone)
 }
 
 inline void
-NSDeallocateObject(NSObject *anObject)
+NSDeallocateObject(id anObject)
 {
 }
 
@@ -615,7 +615,7 @@ GSObjCZone(NSObject *object)
   return ((obj)object)[-1].zone;
 }
 
-inline NSObject *
+inline id
 NSAllocateObject (Class aClass, NSUInteger extraBytes, NSZone *zone)
 {
   id	new;
@@ -640,7 +640,7 @@ NSAllocateObject (Class aClass, NSUInteger extraBytes, NSZone *zone)
 }
 
 inline void
-NSDeallocateObject(NSObject *anObject)
+NSDeallocateObject(id anObject)
 {
   if ((anObject!=nil) && CLS_ISCLASS(((id)anObject)->class_pointer))
     {