5 files changed, 9 insertions, 6 deletions
diff --git a/src/bindings/swig/csharp/uscxml.i b/src/bindings/swig/csharp/uscxml.i
index e9f94f2..ac154c5 100644
--- a/src/bindings/swig/csharp/uscxml.i
+++ b/src/bindings/swig/csharp/uscxml.i
@@ -71,6 +71,7 @@ typedef uscxml::InterpreterIssue InterpreterIssue;
 
 #include "../../../uscxml/plugins/Factory.h"
 #include "../../../uscxml/plugins/DataModelImpl.h"
+#include "../../../uscxml/plugins/ExecutableContent.h"
 
 #include "../wrapped/WrappedInvoker.h"
 #include "../wrapped/WrappedDataModel.h"
diff --git a/src/bindings/swig/java/uscxml.i b/src/bindings/swig/java/uscxml.i
index db3b221..eb6da2b 100644
--- a/src/bindings/swig/java/uscxml.i
+++ b/src/bindings/swig/java/uscxml.i
@@ -65,6 +65,7 @@ typedef uscxml::InterpreterIssue InterpreterIssue;
 
 #include "../../../uscxml/plugins/Factory.h"
 #include "../../../uscxml/plugins/DataModelImpl.h"
+#include "../../../uscxml/plugins/ExecutableContent.h"
 
 #include "../wrapped/WrappedInvoker.h"
 #include "../wrapped/WrappedDataModel.h"
diff --git a/src/bindings/swig/lua/uscxml.i b/src/bindings/swig/lua/uscxml.i
index 9c2f115..0df7508 100644
--- a/src/bindings/swig/lua/uscxml.i
+++ b/src/bindings/swig/lua/uscxml.i
@@ -66,6 +66,7 @@ typedef uscxml::InterpreterIssue InterpreterIssue;
 
 #include "../../../uscxml/plugins/Factory.h"
 #include "../../../uscxml/plugins/DataModelImpl.h"
+#include "../../../uscxml/plugins/ExecutableContent.h"
 
 #include "../wrapped/WrappedInvoker.h"
 #include "../wrapped/WrappedDataModel.h"
diff --git a/src/bindings/swig/wrapped/WrappedInvoker.cpp b/src/bindings/swig/wrapped/WrappedInvoker.cpp
index 407323d..bdf9c76 100644
--- a/src/bindings/swig/wrapped/WrappedInvoker.cpp
+++ b/src/bindings/swig/wrapped/WrappedInvoker.cpp
@@ -21,8 +21,8 @@
 
 namespace uscxml {
 
-WrappedInvoker::WrappedInvoker(InterpreterImpl* interpreter) {
-	_interpreter = interpreter;
+WrappedInvoker::WrappedInvoker(InvokerCallbacks* callbacks) {
+	_callbacks = callbacks;
 }
 WrappedInvoker::~WrappedInvoker() {}
 
diff --git a/src/bindings/swig/wrapped/WrappedInvoker.h b/src/bindings/swig/wrapped/WrappedInvoker.h
index bb5d1ba..dde8602 100644
--- a/src/bindings/swig/wrapped/WrappedInvoker.h
+++ b/src/bindings/swig/wrapped/WrappedInvoker.h
@@ -40,15 +40,15 @@ namespace uscxml {
 
 class WrappedInvoker : public InvokerImpl {
 public:
-	WrappedInvoker(InterpreterImpl* interpreter);
+	WrappedInvoker(InvokerCallbacks* callbacks);
 	virtual ~WrappedInvoker();
 
 	virtual std::list<std::string> getNames() {
 		return std::list<std::string>();
 	};
 
-	virtual std::shared_ptr<InvokerImpl> create(InterpreterImpl* interpreter) {
-		std::shared_ptr<InvokerImpl> inv = std::shared_ptr<InvokerImpl>(new WrappedInvoker(interpreter));
+	virtual std::shared_ptr<InvokerImpl> create(InvokerCallbacks* callbacks) {
+		std::shared_ptr<InvokerImpl> inv = std::shared_ptr<InvokerImpl>(new WrappedInvoker(callbacks));
 		return inv;
 	}
 	virtual void invoke(const std::string& source, const Event& invokeEvent) {}
@@ -75,7 +75,7 @@ public:
 	}
 
 private:
-	InterpreterImpl* _interpreter;
+	InvokerCallbacks* _callbacks;
 
 };