diff --git a/opal/event/buffer.c b/opal/event/buffer.c
index 1c40d4bafd..1a96c09b1a 100644
--- a/opal/event/buffer.c
+++ b/opal/event/buffer.c
@@ -62,7 +62,7 @@ evbuffer_new(void)
 {
 	struct evbuffer *buffer;
 	
-	buffer = (evbuffer*)calloc(1, sizeof(struct evbuffer));
+	buffer = (struct evbuffer*)calloc(1, sizeof(struct evbuffer));
 
 	return (buffer);
 }
diff --git a/opal/event/event-internal.h b/opal/event/event-internal.h
index 674c7eccdd..42221ca961 100644
--- a/opal/event/event-internal.h
+++ b/opal/event/event-internal.h
@@ -31,7 +31,7 @@
 extern "C" {
 #endif
 
-RB_HEAD(opal_event_tree, opal_event);
+typedef RB_HEAD(opal_event_tree, opal_event) opal_event_tree;
 
 struct event_base {
 	const struct opal_eventop *evsel;
diff --git a/opal/event/event.c b/opal/event/event.c
index 0befdae339..75589a86c0 100644
--- a/opal/event/event.c
+++ b/opal/event/event.c
@@ -416,7 +416,7 @@ opal_event_base_priority_init(struct event_base *base, int npriorities)
 		event_err(1, "%s: calloc", __func__);
 
 	for (i = 0; i < base->nactivequeues; ++i) {
-		base->activequeues[i] = (opal_event_list*)malloc(sizeof(struct opal_event_list));
+		base->activequeues[i] = (struct opal_event_list*)malloc(sizeof(struct opal_event_list));
 		if (base->activequeues[i] == NULL)
 			event_err(1, "%s: malloc", __func__);
 		TAILQ_INIT(base->activequeues[i]);