diff --git a/include/tr/event_dispatcher.h b/include/tr/event_dispatcher.h
index b1e6cd2..7d2c3d7 100644
--- a/include/tr/event_dispatcher.h
+++ b/include/tr/event_dispatcher.h
@@ -64,12 +64,13 @@ void   TR_eventDispatcherRegisterHandler(TR_EventDispatcher, TR_EventHandler);
 void   TR_eventDispatcherSetHeartbeat(TR_EventDispatcher, time_t);
 time_t TR_eventDispatcherGetBeatTime(TR_EventDispatcher);
 time_t TR_eventDispatcherGerDataWaitTime(TR_EventDispatcher);
-//void   TR_eventDispatcherEnqueueEvent(TR_EventDispatcher, TR_Event);
 void   TR_eventDispatcherStart(TR_EventDispatcher);
-void   TR_eventDispatcherStop(TR_EventDispatcher);
 void   TR_eventDispatcherShutdown(TR_EventDispatcher);
 
-#define TR_eventDispatcherEnqueueEvent(disp,ev)	(TR_queuePut((disp)->events, (ev)))
+#define TR_eventDispatcherEnqueueEvent(disp,ev)	\
+	(TR_queuePut((disp)->events, (ev)))
+#define TR_eventDispatcherStop(disp) \
+	(((TR_EventDispatcher)disp)->running = 0)
 
 #endif // __TR_EVENT_DISPATCHER_H__
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 2c52d0d..0e093c7 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -9,6 +9,8 @@ TREVENT = event.c \
 	  event_dispatcher_set_hearbeat.c \
 	  event_dispatcher_get_beat_time.c \
 	  event_dispatcher_get_data_wait_time.c \
+	  event_dispatcher_start.c \
+	  event_dispatcher_shutdown.c \
 	  event_handler.c \
 	  event_handler_handle_event.c \
 	  event_handler_issue_event.c \