7 files changed, 9 insertions, 10 deletions
diff --git a/src/scxml/qscxmldatamodel.h b/src/scxml/qscxmldatamodel.h
index bb86c81..c5e57ad 100644
--- a/src/scxml/qscxmldatamodel.h
+++ b/src/scxml/qscxmldatamodel.h
@@ -98,4 +98,6 @@ protected:
 
 QT_END_NAMESPACE
 
+Q_DECLARE_METATYPE(QScxmlDataModel *)
+
 #endif // QSCXMLDATAMODEL_H
diff --git a/src/scxml/qscxmlerror.h b/src/scxml/qscxmlerror.h
index cc8d53b..6e6e459 100644
--- a/src/scxml/qscxmlerror.h
+++ b/src/scxml/qscxmlerror.h
@@ -42,7 +42,7 @@
 
 #include <QtScxml/qscxmlglobals.h>
 #include <QtCore/qobjectdefs.h>
-
+#include <QtCore/qmetatype.h>
 #include <QtCore/qstring.h>
 
 QT_BEGIN_NAMESPACE
@@ -81,4 +81,6 @@ private:
 
 QT_END_NAMESPACE
 
+Q_DECLARE_METATYPE(QScxmlError)
+
 #endif // QSCXMLERROR_H
diff --git a/src/scxml/qscxmlstatemachine.h b/src/scxml/qscxmlstatemachine.h
index e437eb2..2017444 100644
--- a/src/scxml/qscxmlstatemachine.h
+++ b/src/scxml/qscxmlstatemachine.h
@@ -45,6 +45,7 @@
 #include <QtScxml/qscxmlerror.h>
 #include <QtScxml/qscxmlevent.h>
 #include <QtScxml/qscxmlcompiler.h>
+#include <QtScxml/qscxmlinvokableservice.h>
 
 #include <QtCore/qstring.h>
 #include <QtCore/qvector.h>
@@ -58,7 +59,6 @@ QT_BEGIN_NAMESPACE
 class QIODevice;
 class QXmlStreamWriter;
 class QTextStream;
-class QScxmlInvokableService;
 
 class QScxmlStateMachinePrivate;
 class Q_SCXML_EXPORT QScxmlStateMachine: public QObject
@@ -355,4 +355,7 @@ private:
 
 QT_END_NAMESPACE
 
+Q_DECLARE_METATYPE(QScxmlStateMachine *)
+Q_DECLARE_METATYPE(QVector<QScxmlInvokableService *>)
+
 #endif // QSCXMLSTATEMACHINE_H
diff --git a/tests/auto/compiled/tst_compiled.cpp b/tests/auto/compiled/tst_compiled.cpp
index ab590f7..6382328 100644
--- a/tests/auto/compiled/tst_compiled.cpp
+++ b/tests/auto/compiled/tst_compiled.cpp
@@ -40,8 +40,6 @@
 #include "connection.h"
 #include "topmachine.h"
 
-Q_DECLARE_METATYPE(QScxmlError);
-
 enum { SpyWaitTime = 8000 };
 
 class tst_Compiled: public QObject
diff --git a/tests/auto/parser/tst_parser.cpp b/tests/auto/parser/tst_parser.cpp
index 202e783..13eed5a 100644
--- a/tests/auto/parser/tst_parser.cpp
+++ b/tests/auto/parser/tst_parser.cpp
@@ -32,8 +32,6 @@
 #include <QtScxml/qscxmlcompiler.h>
 #include <QtScxml/qscxmlstatemachine.h>
 
-Q_DECLARE_METATYPE(QScxmlError);
-
 class tst_Parser: public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/statemachine/tst_statemachine.cpp b/tests/auto/statemachine/tst_statemachine.cpp
index 4575737..94b1d6f 100644
--- a/tests/auto/statemachine/tst_statemachine.cpp
+++ b/tests/auto/statemachine/tst_statemachine.cpp
@@ -34,8 +34,6 @@
 #include <QtScxml/qscxmlinvokableservice.h>
 #include <QtScxml/private/qscxmlstatemachine_p.h>
 
-Q_DECLARE_METATYPE(QScxmlError);
-
 enum { SpyWaitTime = 8000 };
 
 class tst_StateMachine: public QObject
diff --git a/tests/auto/statemachineinfo/tst_statemachineinfo.cpp b/tests/auto/statemachineinfo/tst_statemachineinfo.cpp
index b1ecfe7..a87e807 100644
--- a/tests/auto/statemachineinfo/tst_statemachineinfo.cpp
+++ b/tests/auto/statemachineinfo/tst_statemachineinfo.cpp
@@ -30,8 +30,6 @@
 #include <QtScxml/qscxmlstatemachine.h>
 #include <QtScxml/private/qscxmlstatemachineinfo_p.h>
 
-Q_DECLARE_METATYPE(QScxmlError);
-
 class tst_StateMachineInfo: public QObject
 {
     Q_OBJECT