diff --git a/include/Makefile.am b/include/Makefile.am
index 7dd8b2c26fe2f46b84217544a05bd82e23e03c3e..61bb5226429b2751a5186babec424d2fe1020e58 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -82,7 +82,8 @@ noinst_HEADERS = \
 	maestro/i_ketopt.h     \
 	maestro/i_hashing.h    \
 	maestro/i_memlock.h    \
-    maestro/i_memory.h    \
+	maestro/i_memory.h     \
+	maestro/i_event.h      \
 	maestro/i_misc.h
 
 
diff --git a/maestro/Makefile.am b/maestro/Makefile.am
index 954b1f599b71736878ab6df976f4dd458e4d3a72..ed11b68a45405d3e388d65cd0ddb83dfdb3fdfee 100644
--- a/maestro/Makefile.am
+++ b/maestro/Makefile.am
@@ -65,9 +65,9 @@ libmaestro_core_la_SOURCES = \
 	pool_manager_protocol.c \
         pool_manager_registry.c \
         pool_client.c i_pool_client.h \
-        pool_manager.c i_pool_manager.h \
+        pool_manager.c \
         subscription_registry.c i_subscription_registry.h \
-	i_event.h event.c \
+	event.c \
 	cdo_sel_parse.c cdo_sel_parse.h \
 	i_groups.h groups.c \
 	i_maestro_numa.h \