1 files changed, 11 insertions, 11 deletions
diff --git a/pokemod/Species.h b/pokemod/Species.h
index 11410b9e..5cb1d98d 100644
--- a/pokemod/Species.h
+++ b/pokemod/Species.h
@@ -29,14 +29,13 @@
 
 #include <Exception.h>
 #include <Frac.h>
-#include <Ref.h>
 
 #include "Object.h"
-#include "SpeciesAbility.h"
-#include "SpeciesEvolution.h"
-#include "SpeciesItem.h"
-#include "SpeciesMove.h"
 
+class SpeciesAbility;
+class SpeciesEvolution;
+class SpeciesItem;
+class SpeciesMove;
 class Pokemod;
 
 class Species : public Object
@@ -57,6 +56,7 @@ class Species : public Object
         Species(const Pokemod* par, const int _id);
         Species(const Pokemod* par, const Species& s, const int _id);
         Species(const Pokemod* par, const QString& fname, const int _id = -1);
+        ~Species();
         
         void load(const QString& fname, const int _id = -1) throw(Exception);
         void save() const throw(Exception);
@@ -170,8 +170,8 @@ class Species : public Object
         int getNewMoveId() const;
         
         QString name;
-        bool baseStats[ST_End_GSC];
-        bool effortValues[ST_End_GSC];
+        bool baseStats[Pokemod::ST_End_GSC];
+        bool effortValues[Pokemod::ST_End_GSC];
         int growth;
         int experienceValue;
         unsigned char catchValue;
@@ -189,10 +189,10 @@ class Species : public Object
         QList<int> types;
         QList<int> eggGroups;
         
-        QList<SpeciesAbility> abilities;
-        QList<SpeciesEvolution> evolutions;
-        QList<SpeciesItem> items;
-        QList<SpeciesMove> moves;
+        QList<SpeciesAbility*> abilities;
+        QList<SpeciesEvolution*> evolutions;
+        QList<SpeciesItem*> items;
+        QList<SpeciesMove*> moves;
 };
 
 #endif