@@ -59,11 +59,11 @@
 	unsigned long version;
 	unsigned long info;
 	long instance_size;
 	struct objc_ivar_list *ivars;
 	struct objc_method_list *methodlist;
-	struct objc_sparsearray *dtable;
+	struct objc_dtable *dtable;
 	Class *subclass_list;
 	void *sibling_class;
 	struct objc_protocol_list *protocols;
 	void *gc_object_type;
 	unsigned long abi_version;
@@ -215,11 +215,11 @@
 extern bool protocol_isEqual(Protocol*, Protocol*);
 extern bool protocol_conformsToProtocol(Protocol*, Protocol*);
 extern void objc_exit(void);
 extern objc_uncaught_exception_handler objc_setUncaughtExceptionHandler(
     objc_uncaught_exception_handler);
-extern void objc_setForwardHandler(void*, void*);
+extern void objc_setForwardHandler(IMP, IMP);
 extern id objc_autorelease(id);
 extern void* objc_autoreleasePoolPush(void);
 extern void objc_autoreleasePoolPop(void*);
 extern id _objc_rootAutorelease(id);
 /* Used by the compiler, but can be called manually. */