diff --git a/include/zyre.h b/include/zyre.h
index 19d2e9bfc4..c226183cb0 100644
--- a/include/zyre.h
+++ b/include/zyre.h
@@ -111,5 +111,9 @@ CZMQ_EXPORT void
 }
 #endif
 
+//  Additional public API classes
+
+#include "zyre_event.h"
+
 #endif
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 61767f8e0c..d71b58fe2b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -5,16 +5,16 @@ pkgconfig_DATA = libzyre.pc
 
 libzyre_la_includedir = $(includedir)
 libzyre_la_include_HEADERS = \
-    zyre_log.h \
-    zyre_peer.h \
-    zyre_group.h \
-    zyre_node.h \
     ../include/zre_msg.h \
     ../include/zre_log_msg.h \
     ../include/zyre_event.h \
     ../include/zyre.h
 
 libzyre_la_SOURCES = \
+    zyre_log.h \
+    zyre_peer.h \
+    zyre_group.h \
+    zyre_node.h \
     zyre_log.c \
     zyre_group.c \
     zyre_peer.c \