Major header movement

- Used IWYU to reorganize headers
- Dropped PHP support
- Updated tests

5 files changed, 10 insertions, 1 deletions

diff --git a/test/src/test-datamodel.cpp b/test/src/test-datamodel.cpp
index 452d2b9..0dc8d8a 100644
--- a/test/src/test-datamodel.cpp
+++ b/test/src/test-datamodel.cpp
@@ -1,6 +1,7 @@
 #include "uscxml/URL.h"
 #include "uscxml/Message.h"
 #include "uscxml/Interpreter.h"
+#include "uscxml/Factory.h"
 #include "uscxml/server/HTTPServer.h"
 
 #include <SAX/helpers/InputSourceResolver.hpp>
diff --git a/test/src/test-eventdelay.cpp b/test/src/test-eventdelay.cpp
index a3fec34..12cc751 100644
--- a/test/src/test-eventdelay.cpp
+++ b/test/src/test-eventdelay.cpp
@@ -1,4 +1,5 @@
 #include "uscxml/concurrency/eventqueue/DelayedEventQueue.h"
+#include <iostream>
 
 int eventCalled = 0;
 
diff --git a/test/src/test-stress.cpp b/test/src/test-stress.cpp
index 6782328..06c1aa6 100644
--- a/test/src/test-stress.cpp
+++ b/test/src/test-stress.cpp
@@ -1,5 +1,8 @@
 #include "uscxml/config.h"
 #include "uscxml/Interpreter.h"
+#include "uscxml/Factory.h"
+#include "uscxml/server/HTTPServer.h"
+
 #include <glog/logging.h>
 
 #include "uscxml/plugins/invoker/filesystem/dirmon/DirMonInvoker.h"
diff --git a/test/src/test-url.cpp b/test/src/test-url.cpp
index 9c4d941..046cc8b 100644
--- a/test/src/test-url.cpp
+++ b/test/src/test-url.cpp
@@ -74,7 +74,7 @@ int main(int argc, char** argv) {
 	{

 		Interpreter interpreter = Interpreter::fromURI("/Users/sradomski/Desktop/application_small.scxml");

 		assert(interpreter);

-		std::vector<std::string> states;

+		std::list<std::string> states;

 		states.push_back("b");

 		interpreter.setConfiguration(states);

 		interpreter.interpret();

diff --git a/test/src/test-w3c.cpp b/test/src/test-w3c.cpp
index 1052fda..4d866c0 100644
--- a/test/src/test-w3c.cpp
+++ b/test/src/test-w3c.cpp
@@ -1,6 +1,10 @@
 #include "uscxml/config.h"
 #include "uscxml/Interpreter.h"
 #include "uscxml/DOMUtils.h"
+
+#include "uscxml/Factory.h"
+#include "uscxml/server/HTTPServer.h"
+
 #include "uscxml/transform/ChartToFSM.h"
 #include <glog/logging.h>
 #include <boost/algorithm/string.hpp>