3 files changed, 8 insertions, 6 deletions
diff --git a/src/uscxml/concurrency/eventqueue/DelayedEventQueue.cpp b/src/uscxml/concurrency/eventqueue/DelayedEventQueue.cpp
index 46c12e4..642c4a0 100644
--- a/src/uscxml/concurrency/eventqueue/DelayedEventQueue.cpp
+++ b/src/uscxml/concurrency/eventqueue/DelayedEventQueue.cpp
@@ -17,12 +17,13 @@
  *  @endcond
  */
 
-#include "uscxml/Message.h"
 #include "DelayedEventQueue.h"
+#include "uscxml/messages/Event.h"
+
 #include <glog/logging.h>
-#include <assert.h>
+
 #include <event2/event.h>
-#include <sstream>
+#include "event2/thread.h"
 
 namespace uscxml {
 
diff --git a/src/uscxml/concurrency/eventqueue/DelayedEventQueue.h b/src/uscxml/concurrency/eventqueue/DelayedEventQueue.h
index 0059bb5..2248c47 100644
--- a/src/uscxml/concurrency/eventqueue/DelayedEventQueue.h
+++ b/src/uscxml/concurrency/eventqueue/DelayedEventQueue.h
@@ -22,15 +22,15 @@
 
 #include "uscxml/concurrency/tinythread.h"
 
-#include <event2/thread.h>
-#include <event2/http.h>
+
+#include "uscxml/Common.h"
+#include "event2/util.h"                // for evutil_socket_t
 #include <event2/event.h>
 
 #include <inttypes.h>
 
 #include <map>
 #include <string>
-#include <iostream>
 
 namespace uscxml {
 
diff --git a/src/uscxml/concurrency/tinythread.h b/src/uscxml/concurrency/tinythread.h
index 867f036..cf313d5 100644
--- a/src/uscxml/concurrency/tinythread.h
+++ b/src/uscxml/concurrency/tinythread.h
@@ -25,6 +25,7 @@ freely, subject to the following restrictions:
 #define _TINYTHREAD_H_
 
 #include "uscxml/Common.h"
+#include <ostream>
 
 /// @file
 /// @mainpage TinyThread++ API Reference