Fixed header including in sigencore

5 files changed, 28 insertions, 7 deletions

diff --git a/sigencore/Arena.h b/sigencore/Arena.h
index 58986e40..82a6d336 100644
--- a/sigencore/Arena.h
+++ b/sigencore/Arena.h
@@ -20,14 +20,16 @@
 
 // Sigencore includes
 #include "Global.h"
-#include "Team.h"
 #include "TeamMember.h"
 
+// Sigscript includes
+#include "../sigscript/Config.h"
+
 // Qt includes
 #include <QtCore/QList>
-#include <QtCore/QObject>
+#include <QtCore/QMap>
+#include <QtCore/QMetaType>
 #include <QtCore/QPair>
-#include <QtCore/QSet>
 #include <QtCore/QUuid>
 
 // Forward declarations
@@ -50,6 +52,7 @@ namespace Sigencore
 {
 class Client;
 class Player;
+class Team;
 
 class SIGENCORE_EXPORT Arena : public Sigscript::Config
 {
diff --git a/sigencore/Containment.h b/sigencore/Containment.h
index aae927ca..8e9c3960 100644
--- a/sigencore/Containment.h
+++ b/sigencore/Containment.h
@@ -26,13 +26,14 @@
 
 // Qt includes
 #include <QtCore/QMetaType>
-#include <QtCore/QUuid>
+#include <QtCore/QList>
 
 // Forward declarations
 namespace Sigscript
 {
 class SigmodWrapper;
 }
+class QUuid;
 
 namespace Sigencore
 {
diff --git a/sigencore/Player.cpp b/sigencore/Player.cpp
index 9b8831a3..67bd8213 100644
--- a/sigencore/Player.cpp
+++ b/sigencore/Player.cpp
@@ -18,6 +18,9 @@
 // Header include
 #include "Player.h"
 
+// Sigencore includes
+#include "Team.h"
+
 // Sigscript includes
 #include "../sigscript/ItemWrapper.h"
 #include "../sigscript/ItemTypeWrapper.h"
diff --git a/sigencore/Player.h b/sigencore/Player.h
index ed1b71b9..63325fe8 100644
--- a/sigencore/Player.h
+++ b/sigencore/Player.h
@@ -21,12 +21,20 @@
 // Sigencore includes
 #include "Client.h"
 #include "Global.h"
-#include "Team.h"
 #include "TeamMember.h"
 
+// Qt includes
+#include <QtCore/QMetaType>
+
+// Forward declarations
+namespace Sigscript
+{
+class ItemWrapper;
+}
+
 namespace Sigencore
 {
-// Forward declarations
+class Arena;
 class Team;
 
 class SIGENCORE_EXPORT Player : public Client
diff --git a/sigencore/Team.h b/sigencore/Team.h
index 008d388a..6c7684a6 100644
--- a/sigencore/Team.h
+++ b/sigencore/Team.h
@@ -21,10 +21,16 @@
 // Sigencore includes
 #include "Containment.h"
 
+// Forward declarations
+namespace Sigscript
+{
+class SigmodWrapper;
+}
+
 namespace Sigencore
 {
-// Forward declarations
 class Arena;
+class TeamMember;
 
 class SIGENCORE_EXPORT Team : public Containment
 {