Some refactoring for improved compile times

28 files changed, 75 insertions, 49 deletions

diff --git a/src/uscxml/plugins/DataModel.h b/src/uscxml/plugins/DataModel.h
index f229a94..1a64d28 100644
--- a/src/uscxml/plugins/DataModel.h
+++ b/src/uscxml/plugins/DataModel.h
@@ -22,13 +22,16 @@
 
 #include "uscxml/config.h"
 #include "uscxml/Common.h"
+#include "uscxml/InterpreterInfo.h"
 #include "uscxml/plugins/EventHandler.h"
 
-#ifdef BUILD_PROFILING
-#include "uscxml/concurrency/Timer.h"
-#define TIME_BLOCK Measurement msm(&timer);
-#else
-#define TIME_BLOCK (0);
+#ifndef TIME_BLOCK
+#	ifdef BUILD_PROFILING
+#		include "uscxml/concurrency/Timer.h"
+#		define TIME_BLOCK Measurement msm(&timer);
+#	else
+#		define TIME_BLOCK
+#	endif
 #endif
 
 #include <list>
diff --git a/src/uscxml/plugins/datamodel/ecmascript/JavaScriptCore/JSCDOM.h b/src/uscxml/plugins/datamodel/ecmascript/JavaScriptCore/JSCDOM.h
index cb196ff..0b49c92 100644
--- a/src/uscxml/plugins/datamodel/ecmascript/JavaScriptCore/JSCDOM.h
+++ b/src/uscxml/plugins/datamodel/ecmascript/JavaScriptCore/JSCDOM.h
@@ -20,7 +20,7 @@
 #ifndef JSCDOM_H_1RC5LCG8
 #define JSCDOM_H_1RC5LCG8
 
-#include "uscxml/Interpreter.h"
+#include "uscxml/InterpreterInfo.h"
 #include <JavaScriptCore/JavaScriptCore.h>
 #include <XPath/XPath.hpp>
 #include "../Storage.h"
diff --git a/src/uscxml/plugins/datamodel/ecmascript/JavaScriptCore/JSCDataModel.cpp b/src/uscxml/plugins/datamodel/ecmascript/JavaScriptCore/JSCDataModel.cpp
index 86bafd3..d3eb0ef 100644
--- a/src/uscxml/plugins/datamodel/ecmascript/JavaScriptCore/JSCDataModel.cpp
+++ b/src/uscxml/plugins/datamodel/ecmascript/JavaScriptCore/JSCDataModel.cpp
@@ -19,6 +19,8 @@
 
 #include "uscxml/Common.h"
 #include "uscxml/config.h"
+#include "uscxml/URL.h"
+#include "uscxml/util/String.h"
 
 #include "JSCDataModel.h"
 #include "JSCDOM.h"
@@ -41,7 +43,7 @@
 #include "dom/JSCDataView.h"
 
 #include "uscxml/Message.h"
-#include "uscxml/DOMUtils.h"
+#include "uscxml/dom/DOMUtils.h"
 #include <glog/logging.h>
 
 #ifdef BUILD_AS_PLUGINS
@@ -94,7 +96,7 @@ void JSCDataModel::addExtension(DataModelExtension* ext) {
 	_extensions.insert(ext);
 
 	JSObjectRef currScope = JSContextGetGlobalObject(_ctx);
-	std::list<std::string> locPath = InterpreterImpl::tokenize(ext->provides(), '.');
+	std::list<std::string> locPath = tokenize(ext->provides(), '.');
 	std::list<std::string>::iterator locIter = locPath.begin();
 	while(true) {
 		std::string pathComp = *locIter;
@@ -309,7 +311,7 @@ void JSCDataModel::setEvent(const Event& event) {
 				handleException(exception);
 		} else {
 			JSStringRef propName = JSStringCreateWithUTF8CString("data");
-			JSStringRef contentStr = JSStringCreateWithUTF8CString(InterpreterImpl::spaceNormalize(event.content).c_str());
+			JSStringRef contentStr = JSStringCreateWithUTF8CString(spaceNormalize(event.content).c_str());
 			JSObjectSetProperty(_ctx, eventObj, propName, JSValueMakeString(_ctx, contentStr), 0, &exception);
 			JSStringRelease(propName);
 			JSStringRelease(contentStr);
@@ -701,7 +703,7 @@ void JSCDataModel::assign(const Element<std::string>& assignElem,
 				throw Event();
 			assign(key, Data(d, Data::INTERPRETED));
 		} catch (Event e) {
-			assign(key, Data("\"" + InterpreterImpl::spaceNormalize(content) + "\"", Data::INTERPRETED));
+			assign(key, Data("\"" + spaceNormalize(content) + "\"", Data::INTERPRETED));
 		}
 	} else {
 		JSValueRef exception = NULL;
diff --git a/src/uscxml/plugins/datamodel/ecmascript/JavaScriptCore/JSCDataModel.h b/src/uscxml/plugins/datamodel/ecmascript/JavaScriptCore/JSCDataModel.h
index 2a2b1cc..ccadc79 100644
--- a/src/uscxml/plugins/datamodel/ecmascript/JavaScriptCore/JSCDataModel.h
+++ b/src/uscxml/plugins/datamodel/ecmascript/JavaScriptCore/JSCDataModel.h
@@ -20,7 +20,8 @@
 #ifndef JSCDATAMODEL_H_KN8TWG0V
 #define JSCDATAMODEL_H_KN8TWG0V
 
-#include "uscxml/Interpreter.h"
+#include "uscxml/InterpreterInfo.h"
+#include "uscxml/plugins/DataModel.h"
 #include <list>
 #include <JavaScriptCore/JavaScriptCore.h>
 #include "JSCDOM.h"
diff --git a/src/uscxml/plugins/datamodel/ecmascript/Storage.cpp b/src/uscxml/plugins/datamodel/ecmascript/Storage.cpp
index edab33c..980fc5d 100644
--- a/src/uscxml/plugins/datamodel/ecmascript/Storage.cpp
+++ b/src/uscxml/plugins/datamodel/ecmascript/Storage.cpp
@@ -19,6 +19,8 @@
 
 #include "Storage.h"
 #include <iostream>
+#include <fstream>
+#include <istream>
 
 namespace uscxml {
 
diff --git a/src/uscxml/plugins/datamodel/ecmascript/Storage.h b/src/uscxml/plugins/datamodel/ecmascript/Storage.h
index 6ec62dd..35bde86 100644
--- a/src/uscxml/plugins/datamodel/ecmascript/Storage.h
+++ b/src/uscxml/plugins/datamodel/ecmascript/Storage.h
@@ -22,8 +22,6 @@
 
 #include <string>
 #include <map>
-#include <fstream>
-#include <istream>
 
 namespace uscxml {
 
diff --git a/src/uscxml/plugins/datamodel/ecmascript/TypedArray.h b/src/uscxml/plugins/datamodel/ecmascript/TypedArray.h
index 7509390..a49410c 100644
--- a/src/uscxml/plugins/datamodel/ecmascript/TypedArray.h
+++ b/src/uscxml/plugins/datamodel/ecmascript/TypedArray.h
@@ -21,7 +21,7 @@
 #define TYPEDARRAY_H_99815BLY
 
 #include "uscxml/Common.h"
-#include "uscxml/Message.h"
+#include "uscxml/messages/Blob.h"
 
 #include <string>
 #include <vector>
diff --git a/src/uscxml/plugins/datamodel/ecmascript/v8/V8DataModel.cpp b/src/uscxml/plugins/datamodel/ecmascript/v8/V8DataModel.cpp
index 3004b91..85ae0cd 100644
--- a/src/uscxml/plugins/datamodel/ecmascript/v8/V8DataModel.cpp
+++ b/src/uscxml/plugins/datamodel/ecmascript/v8/V8DataModel.cpp
@@ -46,7 +46,7 @@
 #include "dom/V8DataView.h"
 
 #include "uscxml/Message.h"
-#include "uscxml/DOMUtils.h"
+#include "uscxml/dom/DOMUtils.h"
 #include <glog/logging.h>
 
 #ifdef BUILD_AS_PLUGINS
@@ -102,7 +102,7 @@ void V8DataModel::addExtension(DataModelExtension* ext) {
 	v8::Context::Scope contextScope(_contexts.front());
 	v8::Handle<v8::Object> currScope = _contexts.front()->Global();
 
-	std::list<std::string> locPath = InterpreterImpl::tokenize(ext->provides(), '.');
+	std::list<std::string> locPath = tokenize(ext->provides(), '.');
 	std::list<std::string>::iterator locIter = locPath.begin();
 	while(true) {
 		std::string pathComp = *locIter;
@@ -317,7 +317,7 @@ void V8DataModel::setEvent(const Event& event) {
 		if (!json.empty()) {
 			eventObj->Set(v8::String::New("data"), getDataAsValue(json));
 		} else {
-			eventObj->Set(v8::String::New("data"), v8::String::New(InterpreterImpl::spaceNormalize(event.content).c_str()));
+			eventObj->Set(v8::String::New("data"), v8::String::New(spaceNormalize(event.content).c_str()));
 		}
 	} else {
 		// _event.data is KVP
@@ -716,7 +716,7 @@ void V8DataModel::assign(const Element<std::string>& assignElem,
 		try {
 			evalAsValue(key + " = " + content);
 		} catch (...) {
-			evalAsValue(key + " = " + "\"" + InterpreterImpl::spaceNormalize(content) + "\"");
+			evalAsValue(key + " = " + "\"" + spaceNormalize(content) + "\"");
 		}
 	} else {
 		global->Set(v8::String::New(key.c_str()), v8::Undefined());
diff --git a/src/uscxml/plugins/datamodel/ecmascript/v8/V8DataModel.h b/src/uscxml/plugins/datamodel/ecmascript/v8/V8DataModel.h
index 35cc12d..8e665b7 100644
--- a/src/uscxml/plugins/datamodel/ecmascript/v8/V8DataModel.h
+++ b/src/uscxml/plugins/datamodel/ecmascript/v8/V8DataModel.h
@@ -20,7 +20,7 @@
 #ifndef V8DATAMODEL_H_KN8TWG0V
 #define V8DATAMODEL_H_KN8TWG0V
 
-#include "uscxml/Interpreter.h"
+#include "uscxml/InterpreterInfo.h"
 #include <list>
 #include <v8.h>
 #include "V8DOM.h"
diff --git a/src/uscxml/plugins/datamodel/lua/LuaDataModel.cpp b/src/uscxml/plugins/datamodel/lua/LuaDataModel.cpp
index c204946..c23b483 100644
--- a/src/uscxml/plugins/datamodel/lua/LuaDataModel.cpp
+++ b/src/uscxml/plugins/datamodel/lua/LuaDataModel.cpp
@@ -20,6 +20,7 @@
 #include <boost/algorithm/string.hpp>
 
 #include "uscxml/Common.h"
+#include "uscxml/util/String.h"
 #include "LuaDataModel.h"
 
 // disable forcing to bool performance warning
@@ -28,7 +29,7 @@
 #include "LuaBridge.h"
 #pragma warning(pop)
 
-#include "uscxml/DOMUtils.h"
+#include "uscxml/dom/DOMUtils.h"
 
 #include "uscxml/Message.h"
 #include <glog/logging.h>
@@ -123,7 +124,7 @@ LuaDataModel::LuaDataModel() {
 
 static int luaInFunction(lua_State * l) {
 	luabridge::LuaRef ref = luabridge::getGlobal(l, "__interpreter");
-	InterpreterImpl* interpreter = ref.cast<InterpreterImpl*>();
+	InterpreterInfo* interpreter = ref.cast<InterpreterInfo*>();
 
 	int stackSize = lua_gettop(l);
 	for (int i = 0; i < stackSize; i++) {
@@ -278,7 +279,7 @@ void LuaDataModel::setEvent(const Event& event) {
 			std::string trimmed = boost::trim_copy(event.content);
 			if ((boost::starts_with(trimmed, "'") && boost::ends_with(trimmed, "'")) ||
 			        (boost::starts_with(trimmed, "\"") && boost::ends_with(trimmed, "\""))) {
-				luaEvent["data"] = InterpreterImpl::spaceNormalize(event.content);
+				luaEvent["data"] = spaceNormalize(event.content);
 			} else {
 				Data tmp(event.content, Data::INTERPRETED);
 				luaEvent["data"] = getDataAsLua(_luaState, tmp);
@@ -464,7 +465,7 @@ void LuaDataModel::assign(const Arabica::DOM::Element<std::string>& assignElem,
 		try {
 			eval(Arabica::DOM::Element<std::string>(), key + " = " + content + ";");
 		} catch (...) {
-			eval(Arabica::DOM::Element<std::string>(), key + " = " + "\"" + InterpreterImpl::spaceNormalize(content) + "\";");
+			eval(Arabica::DOM::Element<std::string>(), key + " = " + "\"" + spaceNormalize(content) + "\";");
 		}
 	} else {
 		eval(Arabica::DOM::Element<std::string>(), key + " = " + "nil;");
diff --git a/src/uscxml/plugins/datamodel/lua/LuaDataModel.h b/src/uscxml/plugins/datamodel/lua/LuaDataModel.h
index bce1d62..eb23815 100644
--- a/src/uscxml/plugins/datamodel/lua/LuaDataModel.h
+++ b/src/uscxml/plugins/datamodel/lua/LuaDataModel.h
@@ -20,7 +20,8 @@
 #ifndef LUADATAMODEL_H_113E014C
 #define LUADATAMODEL_H_113E014C
 
-#include "uscxml/Interpreter.h"
+#include "uscxml/InterpreterInfo.h"
+#include "uscxml/plugins/DataModel.h"
 #include <list>
 
 #ifdef BUILD_AS_PLUGINS
diff --git a/src/uscxml/plugins/datamodel/null/NULLDataModel.cpp b/src/uscxml/plugins/datamodel/null/NULLDataModel.cpp
index c9f0d5a..7211dc5 100644
--- a/src/uscxml/plugins/datamodel/null/NULLDataModel.cpp
+++ b/src/uscxml/plugins/datamodel/null/NULLDataModel.cpp
@@ -21,7 +21,7 @@
 
 #include "uscxml/Common.h"
 #include "NULLDataModel.h"
-#include "uscxml/DOMUtils.h"
+#include "uscxml/dom/DOMUtils.h"
 
 #include "uscxml/Message.h"
 #include <glog/logging.h>
diff --git a/src/uscxml/plugins/datamodel/null/NULLDataModel.h b/src/uscxml/plugins/datamodel/null/NULLDataModel.h
index db5fa28..f813ae1 100644
--- a/src/uscxml/plugins/datamodel/null/NULLDataModel.h
+++ b/src/uscxml/plugins/datamodel/null/NULLDataModel.h
@@ -20,7 +20,8 @@
 #ifndef NULLDATAMODEL_H_KN8TWG0V
 #define NULLDATAMODEL_H_KN8TWG0V
 
-#include "uscxml/Interpreter.h"
+#include "uscxml/InterpreterInfo.h"
+#include "uscxml/plugins/DataModel.h"
 #include <list>
 
 #ifdef BUILD_AS_PLUGINS
diff --git a/src/uscxml/plugins/datamodel/prolog/swi/SWIDataModel.cpp b/src/uscxml/plugins/datamodel/prolog/swi/SWIDataModel.cpp
index fc41901..9a59a20 100644
--- a/src/uscxml/plugins/datamodel/prolog/swi/SWIDataModel.cpp
+++ b/src/uscxml/plugins/datamodel/prolog/swi/SWIDataModel.cpp
@@ -21,8 +21,10 @@
 
 #include "uscxml/Common.h"
 #include "uscxml/config.h"
+#include "uscxml/util/String.h"
+#include "uscxml/URL.h"
 #include "SWIDataModel.h"
-#include "uscxml/DOMUtils.h"
+#include "uscxml/dom/DOMUtils.h"
 #include "uscxml/Message.h"
 #include <glog/logging.h>
 
@@ -272,7 +274,7 @@ void SWIDataModel::setEvent(const Event& event) {
 			dataInitStr << "load_xml_file('" << domUrl.asLocalFile(".pl") << "', XML), copy_term(XML,DATA), assert(event(data(DATA)))";
 			PlCall(dataInitStr.str().c_str());
 		} else if (event.content.size() > 0) {
-			PlCall("assert", PlCompound("event", PlCompound("data", PlString(InterpreterImpl::spaceNormalize(event.content).c_str()))));
+			PlCall("assert", PlCompound("event", PlCompound("data", PlString(spaceNormalize(event.content).c_str()))));
 		} else if (!event.data.empty()) {
 			assertFromData(event.data, "event(data(", 2);
 		}
diff --git a/src/uscxml/plugins/datamodel/prolog/swi/SWIDataModel.h b/src/uscxml/plugins/datamodel/prolog/swi/SWIDataModel.h
index 398e24c..e968b61 100644
--- a/src/uscxml/plugins/datamodel/prolog/swi/SWIDataModel.h
+++ b/src/uscxml/plugins/datamodel/prolog/swi/SWIDataModel.h
@@ -20,7 +20,8 @@
 #ifndef SWIDATAMODEL_H_KN8TWG0V
 #define SWIDATAMODEL_H_KN8TWG0V
 
-#include "uscxml/Interpreter.h"
+#include "uscxml/InterpreterInfo.h"
+#include "uscxml/plugins/DataModel.h"
 #include "uscxml/SWIConfig.h"
 
 #include <list>
diff --git a/src/uscxml/plugins/datamodel/promela/PromelaDataModel.cpp b/src/uscxml/plugins/datamodel/promela/PromelaDataModel.cpp
index d9f50cf..02df56d 100644
--- a/src/uscxml/plugins/datamodel/promela/PromelaDataModel.cpp
+++ b/src/uscxml/plugins/datamodel/promela/PromelaDataModel.cpp
@@ -21,8 +21,9 @@
 
 #include "uscxml/Common.h"
 #include "uscxml/config.h"
+#include "uscxml/util/String.h"
 #include "PromelaDataModel.h"
-#include "uscxml/DOMUtils.h"
+#include "uscxml/dom/DOMUtils.h"
 #include "uscxml/Message.h"
 #include <glog/logging.h>
 #include <cctype>
@@ -138,7 +139,7 @@ void PromelaDataModel::setEvent(const Event& event) {
 			if (isNumeric(event.content.c_str(), 10)) {
 				variable.compound["value"].compound["data"] = Data(event.content, Data::INTERPRETED);
 			} else {
-				variable.compound["value"].compound["data"] = Data(InterpreterImpl::spaceNormalize(event.content), Data::VERBATIM);
+				variable.compound["value"].compound["data"] = Data(spaceNormalize(event.content), Data::VERBATIM);
 			}
 		}
 	} else {
diff --git a/src/uscxml/plugins/datamodel/promela/PromelaDataModel.h b/src/uscxml/plugins/datamodel/promela/PromelaDataModel.h
index 060560d..0778ecf 100644
--- a/src/uscxml/plugins/datamodel/promela/PromelaDataModel.h
+++ b/src/uscxml/plugins/datamodel/promela/PromelaDataModel.h
@@ -20,7 +20,8 @@
 #ifndef PROMELADATAMODEL_H_4VG0TDMU
 #define PROMELADATAMODEL_H_4VG0TDMU
 
-#include "uscxml/Interpreter.h"
+#include "uscxml/InterpreterInfo.h"
+#include "uscxml/plugins/DataModel.h"
 #include <list>
 
 #ifdef BUILD_AS_PLUGINS
diff --git a/src/uscxml/plugins/datamodel/xpath/XPathDataModel.cpp b/src/uscxml/plugins/datamodel/xpath/XPathDataModel.cpp
index de8eecb..3bb22cc 100644
--- a/src/uscxml/plugins/datamodel/xpath/XPathDataModel.cpp
+++ b/src/uscxml/plugins/datamodel/xpath/XPathDataModel.cpp
@@ -22,10 +22,16 @@
 #include "XPathDataModel.h"
 
 #include "uscxml/Message.h"
-#include "uscxml/DOMUtils.h"
+#include "uscxml/util/String.h"
+#include "uscxml/dom/DOMUtils.h"
 #include <glog/logging.h>
 #include <boost/algorithm/string.hpp>
 
+#include <DOM/SAX2DOM/SAX2DOM.hpp>
+//#include <SAX/helpers/CatchErrorHandler.hpp>
+//#include <DOM/Events/EventTarget.hpp>
+//#include <DOM/Events/EventListener.hpp>
+
 #ifdef BUILD_AS_PLUGINS
 #include <Pluma/Connector.hpp>
 #endif
@@ -195,7 +201,7 @@ void XPathDataModel::setEvent(const Event& event) {
 	}
 
 	if (event.content.size() > 0) {
-		Text<std::string> textNode = _doc.createTextNode(InterpreterImpl::spaceNormalize(event.content).c_str());
+		Text<std::string> textNode = _doc.createTextNode(spaceNormalize(event.content).c_str());
 		eventDataElem.appendChild(textNode);
 	}
 	if (event.dom) {
@@ -503,7 +509,7 @@ void XPathDataModel::assign(const Element<std::string>& assignElem,
 		}
 		assign(key, nodeSet, assignElem);
 	} else if (content.length() > 0) {
-		Text<std::string> textNode = _doc.createTextNode(InterpreterImpl::spaceNormalize(content));
+		Text<std::string> textNode = _doc.createTextNode(spaceNormalize(content));
 		nodeSet.push_back(textNode);
 		assign(key, nodeSet, assignElem);
 	} else if (HAS_ATTR(assignElem, "expr")) {
diff --git a/src/uscxml/plugins/datamodel/xpath/XPathDataModel.h b/src/uscxml/plugins/datamodel/xpath/XPathDataModel.h
index 9a71b79..7a085d2 100644
--- a/src/uscxml/plugins/datamodel/xpath/XPathDataModel.h
+++ b/src/uscxml/plugins/datamodel/xpath/XPathDataModel.h
@@ -20,7 +20,9 @@
 #ifndef XPATHDATAMODEL_H_KN8TWG0V
 #define XPATHDATAMODEL_H_KN8TWG0V
 
-#include "uscxml/Interpreter.h"
+#include "uscxml/InterpreterInfo.h"
+#include "uscxml/plugins/DataModel.h"
+
 #include <list>
 
 #ifdef BUILD_AS_PLUGINS
diff --git a/src/uscxml/plugins/element/fetch/FetchElement.cpp b/src/uscxml/plugins/element/fetch/FetchElement.cpp
index 595c913..bf3129b 100644
--- a/src/uscxml/plugins/element/fetch/FetchElement.cpp
+++ b/src/uscxml/plugins/element/fetch/FetchElement.cpp
@@ -20,7 +20,7 @@
 #include <boost/algorithm/string.hpp>
 
 #include "FetchElement.h"
-#include "uscxml/DOMUtils.h"
+#include "uscxml/dom/DOMUtils.h"
 #include <glog/logging.h>
 
 #include <event2/http.h>
diff --git a/src/uscxml/plugins/element/file/FileElement.cpp b/src/uscxml/plugins/element/file/FileElement.cpp
index decd5ca..c2e4f55 100644
--- a/src/uscxml/plugins/element/file/FileElement.cpp
+++ b/src/uscxml/plugins/element/file/FileElement.cpp
@@ -24,7 +24,8 @@
 #include <boost/algorithm/string.hpp>
 #include "uscxml/messages/Blob.h"
 
-#include "uscxml/DOMUtils.h"
+#include "uscxml/dom/DOMUtils.h"
+#include "uscxml/dom/NameSpacingParser.h"
 
 #ifdef BUILD_AS_PLUGINS
 #include <Pluma/Connector.hpp>
diff --git a/src/uscxml/plugins/element/mmi/MMIEvents.h b/src/uscxml/plugins/element/mmi/MMIEvents.h
index 82d0b22..74c66c0 100644
--- a/src/uscxml/plugins/element/mmi/MMIEvents.h
+++ b/src/uscxml/plugins/element/mmi/MMIEvents.h
@@ -42,8 +42,8 @@ public:\
 	std::string getLocalName() { return "elementName"; }\
 	std::string getNamespace() { return "http://www.w3.org/2008/04/mmi-arch"; }\
 	bool processChildren()     { return false; }\
-	void enterElement(const Arabica::DOM::Node<std::string>& node);\
-	void exitElement(const Arabica::DOM::Node<std::string>& node) {}\
+	void enterElement(const Arabica::DOM::Element<std::string>& node) {}\
+	void exitElement(const Arabica::DOM::Element<std::string>& node) {}\
 };
 
 namespace uscxml {
diff --git a/src/uscxml/plugins/element/postpone/PostponeElement.cpp b/src/uscxml/plugins/element/postpone/PostponeElement.cpp
index a041a9e..460cc88 100644
--- a/src/uscxml/plugins/element/postpone/PostponeElement.cpp
+++ b/src/uscxml/plugins/element/postpone/PostponeElement.cpp
@@ -21,7 +21,7 @@
 
 #include "PostponeElement.h"
 #include "uscxml/plugins/invoker/http/HTTPServletInvoker.h"
-#include "uscxml/DOMUtils.h"
+#include "uscxml/dom/DOMUtils.h"
 #include <glog/logging.h>
 
 #ifdef BUILD_AS_PLUGINS
diff --git a/src/uscxml/plugins/element/respond/RespondElement.cpp b/src/uscxml/plugins/element/respond/RespondElement.cpp
index a62f934..65babd7 100644
--- a/src/uscxml/plugins/element/respond/RespondElement.cpp
+++ b/src/uscxml/plugins/element/respond/RespondElement.cpp
@@ -20,7 +20,7 @@
 #include "RespondElement.h"
 #include "uscxml/plugins/invoker/http/HTTPServletInvoker.h"
 #include "uscxml/server/InterpreterServlet.h"
-#include "uscxml/DOMUtils.h"
+#include "uscxml/dom/DOMUtils.h"
 #include <glog/logging.h>
 
 #ifdef BUILD_AS_PLUGINS
@@ -79,7 +79,7 @@ void RespondElement::enterElement(const Arabica::DOM::Element<std::string>& node
 	httpReply.status = strTo<int>(statusStr);;
 
 	// extract the content
-	Arabica::XPath::NodeSet<std::string> contents = InterpreterImpl::filterChildElements(_interpreter->getNameSpaceInfo().getXMLPrefixForNS(getNamespace()) + "content", node);
+	Arabica::XPath::NodeSet<std::string> contents = DOMUtils::filterChildElements(_interpreter->getNameSpaceInfo().getXMLPrefixForNS(getNamespace()) + "content", node);
 	if (contents.size() > 0) {
 		Arabica::DOM::Element<std::string> contentElem = Arabica::DOM::Element<std::string>(contents[0]);
 		if (HAS_ATTR(contentElem, "expr")) { // -- content is evaluated string from datamodel ------
@@ -143,7 +143,7 @@ void RespondElement::enterElement(const Arabica::DOM::Element<std::string>& node
 	}
 
 	// process headers
-	Arabica::XPath::NodeSet<std::string> headers = InterpreterImpl::filterChildElements(_interpreter->getNameSpaceInfo().getXMLPrefixForNS(getNamespace()) + "header", node);
+	Arabica::XPath::NodeSet<std::string> headers = DOMUtils::filterChildElements(_interpreter->getNameSpaceInfo().getXMLPrefixForNS(getNamespace()) + "header", node);
 	for (int i = 0; i < headers.size(); i++) {
 		Arabica::DOM::Element<std::string> headerElem = Arabica::DOM::Element<std::string>(headers[i]);
 
diff --git a/src/uscxml/plugins/invoker/heartbeat/HeartbeatInvoker.cpp b/src/uscxml/plugins/invoker/heartbeat/HeartbeatInvoker.cpp
index f8b4904..0b54228 100644
--- a/src/uscxml/plugins/invoker/heartbeat/HeartbeatInvoker.cpp
+++ b/src/uscxml/plugins/invoker/heartbeat/HeartbeatInvoker.cpp
@@ -20,7 +20,7 @@
 #include <boost/algorithm/string.hpp>
 
 #include "HeartbeatInvoker.h"
-#include "uscxml/DOMUtils.h"
+#include "uscxml/dom/DOMUtils.h"
 #include <glog/logging.h>
 
 #ifdef BUILD_AS_PLUGINS
diff --git a/src/uscxml/plugins/invoker/scxml/USCXMLInvoker.cpp b/src/uscxml/plugins/invoker/scxml/USCXMLInvoker.cpp
index 7bd40d9..62f7a1e 100644
--- a/src/uscxml/plugins/invoker/scxml/USCXMLInvoker.cpp
+++ b/src/uscxml/plugins/invoker/scxml/USCXMLInvoker.cpp
@@ -19,7 +19,8 @@
 
 #include "USCXMLInvoker.h"
 #include <glog/logging.h>
-#include "uscxml/DOMUtils.h"
+#include "uscxml/dom/DOMUtils.h"
+#include <DOM/SAX2DOM/SAX2DOM.hpp>
 
 #ifdef BUILD_AS_PLUGINS
 #include <Pluma/Connector.hpp>
@@ -91,7 +92,7 @@ void USCXMLInvoker::invoke(const InvokeRequest& req) {
 	}
 	if (_invokedInterpreter) {
 		if (req.elem && HAS_ATTR(req.elem, "initial")) {
-			_invokedInterpreter.setInitalConfiguration(InterpreterImpl::tokenize(ATTR(req.elem, "initial")));
+			_invokedInterpreter.setInitalConfiguration(tokenize(ATTR(req.elem, "initial")));
 		}
 
 		DataModel dataModel(_invokedInterpreter.getImpl()->getDataModel());
diff --git a/src/uscxml/plugins/invoker/xhtml/XHTMLInvoker.cpp b/src/uscxml/plugins/invoker/xhtml/XHTMLInvoker.cpp
index 196d6d2..9c85f37 100644
--- a/src/uscxml/plugins/invoker/xhtml/XHTMLInvoker.cpp
+++ b/src/uscxml/plugins/invoker/xhtml/XHTMLInvoker.cpp
@@ -22,7 +22,7 @@
 #include <uscxml/config.h>
 #include "XHTMLInvoker.h"
 #include <glog/logging.h>
-#include "uscxml/DOMUtils.h"
+#include "uscxml/dom/DOMUtils.h"
 #include <uscxml/plugins/ioprocessor/comet/CometIOProcessor.h>
 #include <DOM/io/Stream.hpp>
 
diff --git a/src/uscxml/plugins/ioprocessor/basichttp/BasicHTTPIOProcessor.cpp b/src/uscxml/plugins/ioprocessor/basichttp/BasicHTTPIOProcessor.cpp
index 49aa8dc..1bced48 100644
--- a/src/uscxml/plugins/ioprocessor/basichttp/BasicHTTPIOProcessor.cpp
+++ b/src/uscxml/plugins/ioprocessor/basichttp/BasicHTTPIOProcessor.cpp
@@ -21,7 +21,9 @@
 
 #include "uscxml/plugins/ioprocessor/basichttp/BasicHTTPIOProcessor.h"
 #include "uscxml/Message.h"
-#include "uscxml/DOMUtils.h"
+#include "uscxml/dom/DOMUtils.h"
+#include "uscxml/dom/NameSpacingParser.h"
+
 #include <iostream>
 #include <event2/dns.h>
 #include <event2/buffer.h>