diff --git a/buffer.h b/buffer.h
index 4658ee12..12822740 100644
--- a/buffer.h
+++ b/buffer.h
@@ -6,12 +6,12 @@
 #include <stdlib.h>
 
 #define BUFFER_SIZE 128
-static BUFFER_TYPE *buffered_object_buffer[BUFFER_SIZE];
-static BUFFER_TYPE **buffered_object_overflow;
+static BUFFER_TYPE buffered_object_buffer[BUFFER_SIZE];
+static BUFFER_TYPE *buffered_object_overflow;
 static int buffered_objects;
 static int buffered_object_overflow_space;
 
-static void set_buffered_object_at_index(BUFFER_TYPE *cat, unsigned int i)
+static void set_buffered_object_at_index(BUFFER_TYPE cat, unsigned int i)
 {
 	if (i < BUFFER_SIZE)
 	{
@@ -23,20 +23,20 @@ static void set_buffered_object_at_index(BUFFER_TYPE *cat, unsigned int i)
 		if (NULL == buffered_object_overflow)
 		{
 			buffered_object_overflow =
-				calloc(BUFFER_SIZE, sizeof(BUFFER_TYPE*));
+				calloc(BUFFER_SIZE, sizeof(BUFFER_TYPE));
 			buffered_object_overflow_space = BUFFER_SIZE;
 		}
 		while (i >= buffered_object_overflow_space)
 		{
 			buffered_object_overflow_space <<= 1;
 			buffered_object_overflow = realloc(buffered_object_overflow,
-					buffered_object_overflow_space * sizeof(BUFFER_TYPE*));
+					buffered_object_overflow_space * sizeof(BUFFER_TYPE));
 		}
 		buffered_object_overflow[i] = cat;
 	}
 }
 
-static BUFFER_TYPE *buffered_object_at_index(unsigned int i)
+static BUFFER_TYPE buffered_object_at_index(unsigned int i)
 {
 	if (i<BUFFER_SIZE)
 	{
@@ -52,7 +52,7 @@ static void compact_buffer(void)
 	unsigned insert = 0;
 	for (unsigned i=0 ; i<size ; i++)
 	{
-		BUFFER_TYPE *c = buffered_object_at_index(i);
+		BUFFER_TYPE c = buffered_object_at_index(i);
 		if (c != NULL)
 		{
 			set_buffered_object_at_index(c, insert++);
diff --git a/category_loader.c b/category_loader.c
index cb0e020a..8dce139c 100644
--- a/category_loader.c
+++ b/category_loader.c
@@ -4,7 +4,7 @@
 #include "loader.h"
 #include "dtable.h"
 
-#define BUFFER_TYPE struct objc_category
+#define BUFFER_TYPE struct objc_category *
 #include "buffer.h"
 
 void objc_send_load_message(Class class);
diff --git a/protocol.c b/protocol.c
index 9c11e462..e6323542 100644
--- a/protocol.c
+++ b/protocol.c
@@ -5,7 +5,7 @@
 #include "lock.h"
 #include <stdlib.h>
 
-#define BUFFER_TYPE struct objc_protocol_list
+#define BUFFER_TYPE struct objc_protocol_list *
 #include "buffer.h"
 
 // Get the functions for string hashing
diff --git a/statics_loader.c b/statics_loader.c
index 6b2b1d40..7dc440c8 100644
--- a/statics_loader.c
+++ b/statics_loader.c
@@ -5,7 +5,7 @@
 #include "constant_string.h"
 #include "visibility.h"
 
-#define BUFFER_TYPE struct objc_static_instance_list
+#define BUFFER_TYPE struct objc_static_instance_list *
 #include "buffer.h"
 
 static BOOL try_init_statics(struct objc_static_instance_list *statics)