@@ -178,11 +178,11 @@
 	size_t i;
 
 	if (cls->superclass->subclass_list == NULL) {
 		if ((cls->superclass->subclass_list =
 		    malloc(2 * sizeof(Class))) == NULL)
-			ERROR("Not enough memory for subclass list of "
+			OBJC_ERROR("Not enough memory for subclass list of "
 			    "class %s!", cls->superclass->name);
 
 		cls->superclass->subclass_list[0] = cls;
 		cls->superclass->subclass_list[1] = Nil;
 
@@ -193,11 +193,11 @@
 
 	cls->superclass->subclass_list =
 	    realloc(cls->superclass->subclass_list, (i + 2) * sizeof(Class));
 
 	if (cls->superclass->subclass_list == NULL)
-		ERROR("Not enough memory for subclass list of class %s\n",
+		OBJC_ERROR("Not enough memory for subclass list of class %s\n",
 		    cls->superclass->name);
 
 	cls->superclass->subclass_list[i] = cls;
 	cls->superclass->subclass_list[i + 1] = Nil;
 }
@@ -314,11 +314,11 @@
 					load_queue = realloc(load_queue,
 					    sizeof(Class) *
 					    (load_queue_cnt + 1));
 
 				if (load_queue == NULL)
-					ERROR("Not enough memory for load "
+					OBJC_ERROR("Not enough memory for load "
 					    "queue!");
 
 				load_queue[load_queue_cnt++] = cls;
 			}
 		} else
@@ -344,11 +344,11 @@
 
 			load_queue = realloc(load_queue,
 			    sizeof(Class) * load_queue_cnt);
 
 			if (load_queue == NULL)
-				ERROR("Not enough memory for load queue!");
+				OBJC_ERROR("Not enough memory for load queue!");
 		}
 	}
 }
 
 inline Class
@@ -378,11 +378,11 @@
 objc_get_class(const char *name)
 {
 	Class cls;
 
 	if ((cls = objc_lookup_class(name)) == Nil)
-		ERROR("Class %s not found!", name);
+		OBJC_ERROR("Class %s not found!", name);
 
 	return cls;
 }
 
 const char*
@@ -512,11 +512,11 @@
 		}
 	}
 
 	/* FIXME: We need a way to free this at objc_exit() */
 	if ((ml = malloc(sizeof(struct objc_method_list))) == NULL)
-		ERROR("Not enough memory to replace method!");
+		OBJC_ERROR("Not enough memory to replace method!");
 
 	ml->next = cls->methodlist;
 	ml->count = 1;
 	ml->methods[0].sel.uid = sel->uid;
 	ml->methods[0].sel.types = types;