4 files changed, 12 insertions, 3 deletions
diff --git a/src/uscxml/messages/Data.cpp b/src/uscxml/messages/Data.cpp
index 7afad43..53d4571 100644
--- a/src/uscxml/messages/Data.cpp
+++ b/src/uscxml/messages/Data.cpp
@@ -22,7 +22,12 @@
 
 #include <boost/algorithm/string.hpp>
 
-#include "uscxml/DOMUtils.h"
+#include "uscxml/dom/DOMUtils.h"
+#include "uscxml/dom/NameSpacingParser.h"
+#include <DOM/SAX2DOM/SAX2DOM.hpp>
+#include <SAX/helpers/DefaultHandler.hpp>
+#include <SAX/helpers/CatchErrorHandler.hpp>
+
 #include "glog/logging.h"
 
 #ifdef HAS_STRING_H
diff --git a/src/uscxml/messages/Event.cpp b/src/uscxml/messages/Event.cpp
index fda24dd..072c1b9 100644
--- a/src/uscxml/messages/Event.cpp
+++ b/src/uscxml/messages/Event.cpp
@@ -18,7 +18,10 @@
  */
 
 #include "uscxml/messages/Event.h"
-#include "uscxml/DOMUtils.h"
+#include "uscxml/dom/DOMUtils.h"
+#include <DOM/SAX2DOM/SAX2DOM.hpp>
+#include <SAX/helpers/DefaultHandler.hpp>
+#include <SAX/helpers/CatchErrorHandler.hpp>
 
 namespace uscxml {
 
diff --git a/src/uscxml/messages/MMIMessages.cpp b/src/uscxml/messages/MMIMessages.cpp
index 35e8b66..1c6cc7d 100644
--- a/src/uscxml/messages/MMIMessages.cpp
+++ b/src/uscxml/messages/MMIMessages.cpp
@@ -26,7 +26,7 @@
 #include <DOM/SAX2DOM/SAX2DOM.hpp>
 #include <SAX/helpers/InputSourceResolver.hpp>
 
-#include <uscxml/DOMUtils.h>
+#include <uscxml/dom/DOMUtils.h>
 
 #include <boost/algorithm/string.hpp>
 
diff --git a/src/uscxml/messages/MMIMessages.h b/src/uscxml/messages/MMIMessages.h
index 4f3947e..3538816 100644
--- a/src/uscxml/messages/MMIMessages.h
+++ b/src/uscxml/messages/MMIMessages.h
@@ -22,6 +22,7 @@
 
 #define MMI_WITH_OPERATOR_EVENT 1
 
+#include <iostream>
 #include <DOM/Node.hpp>
 #include <DOM/Document.hpp>
 #include <uscxml/Interpreter.h>