[FIX] pokemod compiles faster due to better placement of #includes

[FIX] Header of pokemodr/PokeModr.h

git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@36 6ecfd1a5-f3ed-3746-8530-beee90d26b22

67 files changed, 197 insertions, 118 deletions

diff --git a/Changelog b/Changelog
index a3117c43..6d2e4589 100644
--- a/Changelog
+++ b/Changelog
@@ -1,4 +1,12 @@
 -----------------
+Rev:  36
+Date: 20 January 2008
+User: MathStuf
+-----------------
+[FIX] pokemod compiles faster due to better placement of #includes
+[FIX] Header of pokemodr/PokeModr.h
+
+-----------------
 Rev:  35
 Date: 20 January 2008
 User: MathStuf
diff --git a/pokemod/Ability.cpp b/pokemod/Ability.cpp
index d5ff41d0..2e29d76e 100644
--- a/pokemod/Ability.cpp
+++ b/pokemod/Ability.cpp
@@ -21,6 +21,13 @@
 //    with this program.  If not, see <http://www.gnu.org/licenses/>.
 /////////////////////////////////////////////////////////////////////////////
 
+#include <QDir>
+#include <QListIterator>
+#include <QMap>
+#include <QMapIterator>
+#include <QStringList>
+#include <QStringListIterator>
+#include "Pokemod.h"
 #include "Ability.h"
 
 PokeMod::Ability::Ability(const Pokemod& par, const unsigned _id) :
diff --git a/pokemod/Ability.h b/pokemod/Ability.h
index 61865ae8..ff5bb82a 100644
--- a/pokemod/Ability.h
+++ b/pokemod/Ability.h
@@ -24,20 +24,16 @@
 #ifndef __POKEMOD_ABILITY__
 #define __POKEMOD_ABILITY__
 
-#include <QDir>
 #include <QList>
-#include <QListIterator>
-#include <QMap>
-#include <QMapIterator>
 #include <QString>
-#include <QStringList>
-#include <QStringListIterator>
 #include "../general/Exception.h"
 #include "Object.h"
 #include "AbilityEffect.h"
 
 namespace PokeMod
 {
+    class Pokemod;
+    
     class Ability : public Object
     {
         public:
diff --git a/pokemod/AbilityEffect.cpp b/pokemod/AbilityEffect.cpp
index eb4f5b1e..fadb51f1 100644
--- a/pokemod/AbilityEffect.cpp
+++ b/pokemod/AbilityEffect.cpp
@@ -20,6 +20,10 @@
 //    with this program.  If not, see <http://www.gnu.org/licenses/>.
 /////////////////////////////////////////////////////////////////////////////
 
+#include "../general/Ref.h"
+#include "Pokemod.h"
+#include "Ability.h"
+#include "Type.h"
 #include "AbilityEffect.h"
 
 const char* PokeMod::AbilityEffect::EffectStr[PokeMod::AbilityEffect::E_End] = {"Damage to HP", "Prevent Damage", "Auto Heal", "Deal Damage", "Wilds", "Stat", "Status", "Ability", "Accuracy/Power Trade", "Bullseye", "Item Effect", "Type", "Fast Hatch", "Weather"};
diff --git a/pokemod/AbilityEffect.h b/pokemod/AbilityEffect.h
index 5eb5a688..82080a83 100644
--- a/pokemod/AbilityEffect.h
+++ b/pokemod/AbilityEffect.h
@@ -26,14 +26,12 @@
 #include <QString>
 #include "../general/Exception.h"
 #include "../general/Frac.h"
-#include "../general/Ref.h"
 #include "Object.h"
-#include "Pokemod.h"
-#include "Ability.h"
-#include "Type.h"
 
 namespace PokeMod
 {
+    class Pokemod;
+    
     class AbilityEffect : public Object
     {
         public:
diff --git a/pokemod/Author.cpp b/pokemod/Author.cpp
index 7dde9f38..e9e84a2c 100644
--- a/pokemod/Author.cpp
+++ b/pokemod/Author.cpp
@@ -20,6 +20,8 @@
 //    with this program.  If not, see <http://www.gnu.org/licenses/>.
 /////////////////////////////////////////////////////////////////////////////
 
+#include <QRegExp>
+#include "Pokemod.h"
 #include "Author.h"
 
 PokeMod::Author::Author(const Pokemod&  par, const unsigned _id) :
diff --git a/pokemod/Author.h b/pokemod/Author.h
index 7ee92ce7..d8b28421 100644
--- a/pokemod/Author.h
+++ b/pokemod/Author.h
@@ -23,13 +23,13 @@
 #ifndef __POKEMOD_AUTHOR__
 #define __POKEMOD_AUTHOR__
 
-#include <QRegExp>
 #include <QString>
 #include "Object.h"
-#include "Pokemod.h"
 
 namespace PokeMod
 {
+    class Pokemod;
+    
     class Author : public Object
     {
         public:
diff --git a/pokemod/Badge.cpp b/pokemod/Badge.cpp
index 4ec1c95a..1cdad1e4 100644
--- a/pokemod/Badge.cpp
+++ b/pokemod/Badge.cpp
@@ -21,6 +21,8 @@
 //    with this program.  If not, see <http://www.gnu.org/licenses/>.
 /////////////////////////////////////////////////////////////////////////////
 
+#include "../general/Ref.h"
+#include "Pokemod.h"
 #include "Badge.h"
 
 const char* PokeMod::Badge::HMStr[PokeMod::Badge::End] = {"Cut", "Fly", "Surf", "Strength", "Flash", "Whirlpool", "Waterfall", "Dive", "Headbutt", "Rock Smash", "Defog", "Rock Climb"};
diff --git a/pokemod/Badge.h b/pokemod/Badge.h
index 1d578a90..9709dc89 100644
--- a/pokemod/Badge.h
+++ b/pokemod/Badge.h
@@ -29,10 +29,11 @@
 #include "../general/Frac.h"
 #include "../general/Ref.h"
 #include "Object.h"
-#include "Pokemod.h"
 
 namespace PokeMod
 {
+    class Pokemod;
+    
     class Badge : public Object
     {
         public:
diff --git a/pokemod/CoinList.cpp b/pokemod/CoinList.cpp
index b7d1d55e..78f33ac9 100644
--- a/pokemod/CoinList.cpp
+++ b/pokemod/CoinList.cpp
@@ -21,6 +21,14 @@
 //    with this program.  If not, see <http://www.gnu.org/licenses/>.
 /////////////////////////////////////////////////////////////////////////////
 
+#include <QDir>
+#include <QListIterator>
+#include <QMap>
+#include <QStringList>
+#include <QStringListIterator>
+#include "Pokemod.h"
+#include "Item.h"
+#include "ItemEffect.h"
 #include "CoinList.h"
 
 PokeMod::CoinList::CoinList(const Pokemod& par, const unsigned _id) :
diff --git a/pokemod/CoinList.h b/pokemod/CoinList.h
index 35bfa4ee..05e29712 100644
--- a/pokemod/CoinList.h
+++ b/pokemod/CoinList.h
@@ -24,22 +24,16 @@
 #ifndef __POKEMOD_COINLIST__
 #define __POKEMOD_COINLIST__
 
-#include <QDir>
 #include <QList>
-#include <QListIterator>
-#include <QMap>
 #include <QString>
-#include <QStringList>
-#include <QStringListIterator>
 #include "../general/Exception.h"
 #include "Object.h"
-#include "Pokemod.h"
 #include "CoinListObject.h"
-#include "Item.h"
-#include "ItemEffect.h"
 
 namespace PokeMod
 {
+    class Pokemod;
+    
     class CoinList : public Object
     {
         public:
diff --git a/pokemod/CoinListObject.cpp b/pokemod/CoinListObject.cpp
index d29a8061..7b214932 100644
--- a/pokemod/CoinListObject.cpp
+++ b/pokemod/CoinListObject.cpp
@@ -20,6 +20,7 @@
 //    with this program.  If not, see <http://www.gnu.org/licenses/>.
 /////////////////////////////////////////////////////////////////////////////
 
+#include "Pokemod.h"
 #include "CoinListObject.h"
 
 const char* PokeMod::CoinListObject::TypeStr[PokeMod::CoinListObject::End] = {"Item", "Pokémon"};
diff --git a/pokemod/CoinListObject.h b/pokemod/CoinListObject.h
index 3fe8537a..36b865a5 100644
--- a/pokemod/CoinListObject.h
+++ b/pokemod/CoinListObject.h
@@ -26,10 +26,11 @@
 #include <QString>
 #include "../general/Exception.h"
 #include "Object.h"
-#include "Pokemod.h"
 
 namespace PokeMod
 {
+    class Pokemod;
+    
     class CoinListObject : public Object
     {
         public:
diff --git a/pokemod/Dialog.cpp b/pokemod/Dialog.cpp
index ca91e14b..d8353018 100644
--- a/pokemod/Dialog.cpp
+++ b/pokemod/Dialog.cpp
@@ -20,6 +20,15 @@
 //    with this program.  If not, see <http://www.gnu.org/licenses/>.
 /////////////////////////////////////////////////////////////////////////////
 
+#include "Pokemod.h"
+#include "Item.h"
+#include "ItemEffect.h"
+#include "Map.h"
+#include "MapEffect.h"
+#include "MapTrainer.h"
+#include "MapWarp.h"
+#include "Move.h"
+#include "Species.h"
 #include "Dialog.h"
 
 const char* PokeMod::Dialog::CommandStr[PokeMod::Dialog::End] = {"Flip Flag", "Set Flag", "Unset Flag", "Randomize Flag", "Test Flag", "Dialog", "Yes/No", "Item Shop", "Give Item", "Take Item", "Check Item", "Coin List", "Teach Move", "Delete Move", "Give Pokemon", "Take Pokemon", "Show Pokemon", "View Pokemon", "Give Money", "Take Money", "Move Effect", "Turn Effect", "Check Direction", "Check Roster", "Check Levels", "Check Species", "Check Held Items", "Check Money", "Trade", "Daycare", "Battle", "Badge", "Warp", "Name", "Music", "Sound Effect", "Timer", "Map Sign", "Wild Scope", "Safari", "Heal Party", "Refresh", "Clear", "Pause", "New Line", "Exit", "Menu"};
diff --git a/pokemod/Dialog.h b/pokemod/Dialog.h
index cb23a5fa..9f7d4fe2 100644
--- a/pokemod/Dialog.h
+++ b/pokemod/Dialog.h
@@ -26,18 +26,11 @@
 #include <QString>
 #include "../general/Exception.h"
 #include "Object.h"
-#include "Pokemod.h"
-#include "Item.h"
-#include "ItemEffect.h"
-#include "Map.h"
-#include "MapEffect.h"
-#include "MapTrainer.h"
-#include "MapWarp.h"
-#include "Move.h"
-#include "Species.h"
 
 namespace PokeMod
 {
+    class Pokemod;
+    
     class Dialog : public Object
     {
         public:
diff --git a/pokemod/EggGroup.cpp b/pokemod/EggGroup.cpp
index 59465985..86032eec 100644
--- a/pokemod/EggGroup.cpp
+++ b/pokemod/EggGroup.cpp
@@ -20,6 +20,7 @@
 //    with this program.  If not, see <http://www.gnu.org/licenses/>.
 /////////////////////////////////////////////////////////////////////////////
 
+#include "Pokemod.h"
 #include "EggGroup.h"
 
 PokeMod::EggGroup::EggGroup(const Pokemod& par, const unsigned _id) :
diff --git a/pokemod/EggGroup.h b/pokemod/EggGroup.h
index 88fb64ea..7908174f 100644
--- a/pokemod/EggGroup.h
+++ b/pokemod/EggGroup.h
@@ -24,11 +24,13 @@
 #define __POKEMOD_EGGGROUP__
 
 #include <QString>
+#include "../general/Exception.h"
 #include "Object.h"
-#include "Pokemod.h"
 
 namespace PokeMod
 {
+    class Pokemod;
+    
     class EggGroup : public Object
     {
         public:
diff --git a/pokemod/Item.cpp b/pokemod/Item.cpp
index 5af126a2..f6658329 100644
--- a/pokemod/Item.cpp
+++ b/pokemod/Item.cpp
@@ -20,6 +20,13 @@
 //    with this program.  If not, see <http://www.gnu.org/licenses/>.
 /////////////////////////////////////////////////////////////////////////////
 
+#include <QDir>
+#include <QListIterator>
+#include <QMap>
+#include <QMapIterator>
+#include <QStringList>
+#include <QStringListIterator>
+#include "Pokemod.h"
 #include "Item.h"
 
 PokeMod::Item::Item(const Pokemod& par, const unsigned _id) :
diff --git a/pokemod/Item.h b/pokemod/Item.h
index 5d13068c..e8499105 100644
--- a/pokemod/Item.h
+++ b/pokemod/Item.h
@@ -23,21 +23,16 @@
 #ifndef __POKEMOD_ITEM__
 #define __POKEMOD_ITEM__
 
-#include <QDir>
 #include <QList>
-#include <QListIterator>
-#include <QMap>
-#include <QMapIterator>
 #include <QString>
-#include <QStringList>
-#include <QStringListIterator>
 #include "../general/Exception.h"
 #include "Object.h"
-#include "Pokemod.h"
 #include "ItemEffect.h"
 
 namespace PokeMod
 {
+    class Pokemod;
+    
     class Item : public Object
     {
         public:
diff --git a/pokemod/ItemEffect.cpp b/pokemod/ItemEffect.cpp
index b3542460..5e949c6a 100644
--- a/pokemod/ItemEffect.cpp
+++ b/pokemod/ItemEffect.cpp
@@ -20,6 +20,10 @@
 //    with this program.  If not, see <http://www.gnu.org/licenses/>.
 /////////////////////////////////////////////////////////////////////////////
 
+#include <QFile>
+#include "../general/Ref.h"
+#include "Pokemod.h"
+#include "MapWildList.h"
 #include "ItemEffect.h"
 
 const char* PokeMod::ItemEffect::EffectStr[PokeMod::ItemEffect::E_End] = {"HP Cure", "Revive", "Cure Status", "Level Boost", "Stat Boost", "Flinch", "Go First", "Keep Alive", "Modify Stat (Battle Only)", "Shield (Battle Only)", "Run (Battle Only)", "PP Boost", "Type Boost", "PP Restore", "Experience Share", "Fishing Rod", "Repel", "Escape", "TM", "HM", "Map", "Ball", "Itemfinder", "Bike", "Scope", "Coin", "Coin Case", "Berry", "Acorn"};
diff --git a/pokemod/ItemEffect.h b/pokemod/ItemEffect.h
index b2cc32d4..e714bfa3 100644
--- a/pokemod/ItemEffect.h
+++ b/pokemod/ItemEffect.h
@@ -23,15 +23,14 @@
 #ifndef __POKEMOD_ITEMEFFECT__
 #define __POKEMOD_ITEMEFFECT__
 
-#include <QFile>
 #include <QString>
 #include "../general/Exception.h"
 #include "Object.h"
-#include "Pokemod.h"
-#include "MapWildList.h"
 
 namespace PokeMod
 {
+    class Pokemod;
+    
     class ItemEffect : public Object
     {
         public:
diff --git a/pokemod/ItemType.cpp b/pokemod/ItemType.cpp
index b554dcea..dba68618 100644
--- a/pokemod/ItemType.cpp
+++ b/pokemod/ItemType.cpp
@@ -20,6 +20,8 @@
 //    with this program.  If not, see <http://www.gnu.org/licenses/>.
 /////////////////////////////////////////////////////////////////////////////
 
+#include <QFile>
+#include "Pokemod.h"
 #include "ItemType.h"
 
 PokeMod::ItemType::ItemType(const Pokemod& par, const unsigned _id) :
diff --git a/pokemod/ItemType.h b/pokemod/ItemType.h
index 7fa351ae..e5bf1909 100644
--- a/pokemod/ItemType.h
+++ b/pokemod/ItemType.h
@@ -23,14 +23,14 @@
 #ifndef __POKEMOD_ITEMTYPE__
 #define __POKEMOD_ITEMTYPE__
 
-#include <QFile>
 #include <QString>
 #include "../general/Exception.h"
 #include "Object.h"
-#include "Pokemod.h"
 
 namespace PokeMod
 {
+    class Pokemod;
+    
     class ItemType : public Object
     {
         public:
diff --git a/pokemod/Map.cpp b/pokemod/Map.cpp
index e6c0d162..bae10f19 100644
--- a/pokemod/Map.cpp
+++ b/pokemod/Map.cpp
@@ -20,6 +20,12 @@
 //    with this program.  If not, see <http://www.gnu.org/licenses/>.
 /////////////////////////////////////////////////////////////////////////////
 
+#include <QDir>
+#include <QMap>
+#include <QMapIterator>
+#include <QStringList>
+#include <QStringListIterator>
+#include "Pokemod.h"
 #include "Map.h"
 
 const char* PokeMod::Map::TypeStr[PokeMod::Map::End] = {"Outdoor", "Dungeon", "Building"};
diff --git a/pokemod/Map.h b/pokemod/Map.h
index 60dba551..14bc87de 100644
--- a/pokemod/Map.h
+++ b/pokemod/Map.h
@@ -23,13 +23,8 @@
 #ifndef __POKEMOD_MAP__
 #define __POKEMOD_MAP__
 
-#include <QDir>
 #include <QList>
-#include <QMap>
-#include <QMapIterator>
 #include <QString>
-#include <QStringList>
-#include <QStringListIterator>
 #include "../general/Exception.h"
 #include "../general/Matrix.h"
 #include "Object.h"
@@ -40,6 +35,8 @@
 
 namespace PokeMod
 {
+    class Pokemod;
+    
     class Map : public Object
     {
         public:
diff --git a/pokemod/MapEffect.cpp b/pokemod/MapEffect.cpp
index d6290436..fe7c6914 100644
--- a/pokemod/MapEffect.cpp
+++ b/pokemod/MapEffect.cpp
@@ -20,6 +20,8 @@
 //    with this program.  If not, see <http://www.gnu.org/licenses/>.
 /////////////////////////////////////////////////////////////////////////////
 
+#include "Pokemod.h"
+#include "Dialog.h"
 #include "MapEffect.h"
 
 const char* PokeMod::MapEffect::MapEffectStr[PokeMod::MapEffect::E_End] = {"Item", "PC", "Strength Block", "Button", "Slot Machine", "Card Flip Game"};
diff --git a/pokemod/MapEffect.h b/pokemod/MapEffect.h
index 5517a212..72235627 100644
--- a/pokemod/MapEffect.h
+++ b/pokemod/MapEffect.h
@@ -24,14 +24,15 @@
 #define __POKEMOD_MAPEFFECT__
 
 #include <QString>
-#include "Object.h"
 #include "../general/Exception.h"
 #include "../general/Flag.h"
 #include "../general/Point.h"
-#include "Dialog.h"
+#include "Object.h"
 
 namespace PokeMod
 {
+    class Pokemod;
+    
     class MapEffect : public Object
     {
         public:
diff --git a/pokemod/MapTrainer.cpp b/pokemod/MapTrainer.cpp
index ad287393..b9846b33 100644
--- a/pokemod/MapTrainer.cpp
+++ b/pokemod/MapTrainer.cpp
@@ -20,6 +20,14 @@
 //    with this program.  If not, see <http://www.gnu.org/licenses/>.
 /////////////////////////////////////////////////////////////////////////////
 
+#include <QDir>
+#include <QListIterator>
+#include <QMap>
+#include <QMapIterator>
+#include <QStringList>
+#include <QStringListIterator>
+#include "Pokemod.h"
+#include "Dialog.h"
 #include "MapTrainer.h"
 
 PokeMod::MapTrainer::MapTrainer(const Pokemod& par, const unsigned _id) :
diff --git a/pokemod/MapTrainer.h b/pokemod/MapTrainer.h
index 784facf7..8ee93b56 100644
--- a/pokemod/MapTrainer.h
+++ b/pokemod/MapTrainer.h
@@ -23,23 +23,18 @@
 #ifndef __POKEMOD_MAPTRAINER__
 #define __POKEMOD_MAPTRAINER__
 
-#include <QDir>
 #include <QList>
-#include <QListIterator>
-#include <QMap>
-#include <QMapIterator>
 #include <QString>
-#include <QStringList>
-#include <QStringListIterator>
 #include "../general/Exception.h"
 #include "../general/Flag.h"
 #include "../general/Point.h"
 #include "Object.h"
-#include "Dialog.h"
 #include "MapTrainerTeamMember.h"
 
 namespace PokeMod
 {
+    class Pokemod;
+    
     class MapTrainer : public Object
     {
         public:
diff --git a/pokemod/MapTrainerTeamMember.cpp b/pokemod/MapTrainerTeamMember.cpp
index eb7fa0d1..89097ef6 100644
--- a/pokemod/MapTrainerTeamMember.cpp
+++ b/pokemod/MapTrainerTeamMember.cpp
@@ -20,6 +20,11 @@
 //    with this program.  If not, see <http://www.gnu.org/licenses/>.
 /////////////////////////////////////////////////////////////////////////////
 
+#include <QListIterator>
+#include <QString>
+#include "Pokemod.h"
+#include "Item.h"
+#include "Species.h"
 #include "MapTrainerTeamMember.h"
 
 PokeMod::MapTrainerTeamMember::MapTrainerTeamMember(const Pokemod& par, const unsigned _id) :
diff --git a/pokemod/MapTrainerTeamMember.h b/pokemod/MapTrainerTeamMember.h
index 37dc7c5d..2da483ff 100644
--- a/pokemod/MapTrainerTeamMember.h
+++ b/pokemod/MapTrainerTeamMember.h
@@ -24,16 +24,13 @@
 #define __POKEMOD_MAPTRAINERTEAMMEMBER__
 
 #include <QList>
-#include <QListIterator>
-#include <QString>
 #include "../general/Exception.h"
 #include "Object.h"
-#include "Pokemod.h"
-#include "Item.h"
-#include "Species.h"
 
 namespace PokeMod
 {
+    class Pokemod;
+    
     class MapTrainerTeamMember : public Object
     {
         public:
diff --git a/pokemod/MapWarp.cpp b/pokemod/MapWarp.cpp
index 0a29d16f..db48dae8 100644
--- a/pokemod/MapWarp.cpp
+++ b/pokemod/MapWarp.cpp
@@ -20,6 +20,9 @@
 //    with this program.  If not, see <http://www.gnu.org/licenses/>.
 /////////////////////////////////////////////////////////////////////////////
 
+#include "Pokemod.h"
+#include "Dialog.h"
+#include "Map.h"
 #include "MapWarp.h"
 
 const char* PokeMod::MapWarp::TypeStr[PokeMod::MapWarp::End] = {"Door/Stair", "Warp Pad", "Hole", "Boundary"};
diff --git a/pokemod/MapWarp.h b/pokemod/MapWarp.h
index 7430ed97..71969422 100644
--- a/pokemod/MapWarp.h
+++ b/pokemod/MapWarp.h
@@ -28,11 +28,11 @@
 #include "../general/Flag.h"
 #include "../general/Point.h"
 #include "Object.h"
-#include "Dialog.h"
-#include "Map.h"
 
 namespace PokeMod
 {
+    class Pokemod;
+    
     class MapWarp : public Object
     {
         public:
diff --git a/pokemod/MapWildList.cpp b/pokemod/MapWildList.cpp
index 79fd2fbc..e64a92b4 100644
--- a/pokemod/MapWildList.cpp
+++ b/pokemod/MapWildList.cpp
@@ -20,6 +20,16 @@
 //    with this program.  If not, see <http://www.gnu.org/licenses/>.
 /////////////////////////////////////////////////////////////////////////////
 
+#include <QDir>
+#include <QListIterator>
+#include <QMap>
+#include <QMapIterator>
+#include <QMutableListIterator>
+#include <QStringList>
+#include <QStringListIterator>
+#include "Pokemod.h"
+#include "Item.h"
+#include "ItemEffect.h"
 #include "MapWildList.h"
 
 const char* PokeMod::MapWildList::ControlStr[PokeMod::MapWildList::End] = {"Grass", "Surfing", "Fishing", "Dive", "Headbutt", "Rock Smash"};
diff --git a/pokemod/MapWildList.h b/pokemod/MapWildList.h
index 5c722726..f66453ea 100644
--- a/pokemod/MapWildList.h
+++ b/pokemod/MapWildList.h
@@ -23,24 +23,16 @@
 #ifndef __POKEMOD_MAPWILDLIST__
 #define __POKEMOD_MAPWILDLIST__
 
-#include <QDir>
 #include <QList>
-#include <QListIterator>
-#include <QMap>
-#include <QMapIterator>
-#include <QMutableListIterator>
 #include <QString>
-#include <QStringList>
-#include <QStringListIterator>
 #include "../general/Exception.h"
 #include "Object.h"
-#include "Pokemod.h"
-#include "Item.h"
-#include "ItemEffect.h"
 #include "MapWildListEncounter.h"
 
 namespace PokeMod
 {
+    class Pokemod;
+    
     class MapWildList : public Object
     {
         public:
diff --git a/pokemod/MapWildListEncounter.cpp b/pokemod/MapWildListEncounter.cpp
index 329a2768..8cdc72b0 100644
--- a/pokemod/MapWildListEncounter.cpp
+++ b/pokemod/MapWildListEncounter.cpp
@@ -20,6 +20,8 @@
 //    with this program.  If not, see <http://www.gnu.org/licenses/>.
 /////////////////////////////////////////////////////////////////////////////
 
+#include "Pokemod.h"
+#include "Species.h"
 #include "MapWildListEncounter.h"
 
 PokeMod::MapWildListEncounter::MapWildListEncounter(const Pokemod& par, const unsigned _id) :
diff --git a/pokemod/MapWildListEncounter.h b/pokemod/MapWildListEncounter.h
index 04ec43d0..1029808e 100644
--- a/pokemod/MapWildListEncounter.h
+++ b/pokemod/MapWildListEncounter.h
@@ -26,11 +26,11 @@
 #include <QString>
 #include "../general/Exception.h"
 #include "Object.h"
-#include "Pokemod.h"
-#include "Species.h"
 
 namespace PokeMod
 {
+    class Pokemod;
+    
     class MapWildListEncounter: public Object
     {
         public:
diff --git a/pokemod/Move.cpp b/pokemod/Move.cpp
index b29ca946..de1e4958 100644
--- a/pokemod/Move.cpp
+++ b/pokemod/Move.cpp
@@ -20,6 +20,13 @@
 //    with this program.  If not, see <http://www.gnu.org/licenses/>.
 /////////////////////////////////////////////////////////////////////////////
 
+#include <QDir>
+#include <QListIterator>
+#include <QMap>
+#include <QMapIterator>
+#include <QStringList>
+#include <QStringListIterator>
+#include "Pokemod.h"
 #include "Move.h"
 
 const char* PokeMod::Move::TargetStr[PokeMod::Move::T_End] = {"Player", "Enemy", "Both", "Random"};
diff --git a/pokemod/Move.h b/pokemod/Move.h
index 5f643401..6d4aabb4 100644
--- a/pokemod/Move.h
+++ b/pokemod/Move.h
@@ -23,20 +23,16 @@
 #ifndef __POKEMOD_MOVE__
 #define __POKEMOD_MOVE__
 
-#include <QDir>
 #include <QList>
-#include <QListIterator>
-#include <QMap>
-#include <QMapIterator>
 #include <QString>
-#include <QStringList>
-#include <QStringListIterator>
 #include "../general/Exception.h"
 #include "Object.h"
 #include "MoveEffect.h"
 
 namespace PokeMod
 {
+    class Pokemod;
+    
     class Move : public Object
     {
         public:
diff --git a/pokemod/MoveEffect.cpp b/pokemod/MoveEffect.cpp
index 8e5724fd..3eefdc88 100644
--- a/pokemod/MoveEffect.cpp
+++ b/pokemod/MoveEffect.cpp
@@ -20,6 +20,8 @@
 //    with this program.  If not, see <http://www.gnu.org/licenses/>.
 /////////////////////////////////////////////////////////////////////////////
 
+#include "../general/Ref.h"
+#include "Pokemod.h"
 #include "MoveEffect.h"
 
 const char* PokeMod::MoveEffect::EffectStr[PokeMod::MoveEffect::E_End_Overworld] = {"Damage", "Status", "Confuse", "Stat", "StealHP", "Counter", "Selfdestruct", "Need Status", "Mirror", "GetMoney", "Never Miss", "Steal Types", "Clear Effects", "Wait And Return", "Self Confuse", "Force Switch", "Hit Multiple", "Hit Multiple Turns", "Flinch", "One Hit K.O.", "Recoil", "Recover", "Rest", "Sheild", "Substitute", "Recharge", "Rage", "Mimic", "Random Move", "Seed", "Disable", "Cut HM", "Fly HM", "Surf HM", "Strength HM", "Flash HM", "Rock Smash HM", "Rock Climb HM", "Whirlpool HM", "Waterfall HM", "Share HP HM ", "Escape HM"};
diff --git a/pokemod/MoveEffect.h b/pokemod/MoveEffect.h
index 8532dd7f..d9f1f678 100644
--- a/pokemod/MoveEffect.h
+++ b/pokemod/MoveEffect.h
@@ -26,12 +26,12 @@
 #include <QString>
 #include "../general/Exception.h"
 #include "../general/Frac.h"
-#include "../general/Ref.h"
 #include "Object.h"
-#include "Pokemod.h"
 
 namespace PokeMod
 {
+    class Pokemod;
+    
     class MoveEffect : public Object
     {
         public:
diff --git a/pokemod/Nature.cpp b/pokemod/Nature.cpp
index aa27543d..02b434ad 100644
--- a/pokemod/Nature.cpp
+++ b/pokemod/Nature.cpp
@@ -20,6 +20,8 @@
 //    with this program.  If not, see <http://www.gnu.org/licenses/>.
 /////////////////////////////////////////////////////////////////////////////
 
+#include "../general/Ref.h"
+#include "Pokemod.h"
 #include "Nature.h"
 
 PokeMod::Nature::Nature(const Pokemod& par, const unsigned _id) :
diff --git a/pokemod/Nature.h b/pokemod/Nature.h
index dd62a4fd..33f5ecd8 100644
--- a/pokemod/Nature.h
+++ b/pokemod/Nature.h
@@ -26,12 +26,12 @@
 #include <QString>
 #include "../general/Exception.h"
 #include "../general/Frac.h"
-#include "../general/Ref.h"
 #include "Object.h"
-#include "Pokemod.h"
 
 namespace PokeMod
 {
+    class Pokemod;
+    
     class Nature : public Object
     {
         public:
diff --git a/pokemod/Object.h b/pokemod/Object.h
index b936179a..53908a45 100644
--- a/pokemod/Object.h
+++ b/pokemod/Object.h
@@ -23,8 +23,7 @@
 #ifndef __POKEMOD_OBJECT__
 #define __POKEMOD_OBJECT__
 
-#include <QFile>
-#include "../general/Ini.h"
+#include "../general/Exception.h"
 
 namespace PokeMod
 {
diff --git a/pokemod/Pokemod.cpp b/pokemod/Pokemod.cpp
index 74b8b7c4..b59fefe4 100644
--- a/pokemod/Pokemod.cpp
+++ b/pokemod/Pokemod.cpp
@@ -20,6 +20,13 @@
 //    with this program.  If not, see <http://www.gnu.org/licenses/>.
 /////////////////////////////////////////////////////////////////////////////
 
+#include <QDir>
+#include <QListIterator>
+#include <QMap>
+#include <QMapIterator>
+#include <QStringList>
+#include <QStringListIterator>
+#include "../general/Ref.h"
 #include "Pokemod.h"
 
 PokeMod::Pokemod::Pokemod(const QString& fname) :
diff --git a/pokemod/Pokemod.h b/pokemod/Pokemod.h
index 8f2453b7..4576d7e3 100644
--- a/pokemod/Pokemod.h
+++ b/pokemod/Pokemod.h
@@ -23,20 +23,12 @@
 #ifndef __POKEMOD_POKEMOD__
 #define __POKEMOD_POKEMOD__
 
-#include <QDir>
 #include <QIODevice>
 #include <QList>
-#include <QListIterator>
-#include <QMap>
-#include <QMapIterator>
 #include <QString>
-#include <QStringList>
-#include <QStringListIterator>
 #include "../general/Exception.h"
 #include "../general/FracMatrix.h"
 #include "../general/Point.h"
-#include "../general/Ref.h"
-#include "pokemod_inc.h"
 #include "Object.h"
 #include "Ability.h"
 #include "Author.h"
diff --git a/pokemod/Rules.cpp b/pokemod/Rules.cpp
index 92461eca..37c605d1 100644
--- a/pokemod/Rules.cpp
+++ b/pokemod/Rules.cpp
@@ -20,6 +20,7 @@
 //    with this program.  If not, see <http://www.gnu.org/licenses/>.
 /////////////////////////////////////////////////////////////////////////////
 
+#include "Pokemod.h"
 #include "Rules.h"
 
 PokeMod::Rules::Rules(const Pokemod& par) :
diff --git a/pokemod/Rules.h b/pokemod/Rules.h
index db0289b7..229ca9ba 100644
--- a/pokemod/Rules.h
+++ b/pokemod/Rules.h
@@ -128,6 +128,4 @@ namespace PokeMod
     };
 }
 
-#include "Pokemod.h"
-
 #endif
diff --git a/pokemod/Species.cpp b/pokemod/Species.cpp
index b0c5593b..cb50d9f1 100644
--- a/pokemod/Species.cpp
+++ b/pokemod/Species.cpp
@@ -20,6 +20,13 @@
 //    with this program.  If not, see <http://www.gnu.org/licenses/>.
 /////////////////////////////////////////////////////////////////////////////
 
+#include <QDir>
+#include <QListIterator>
+#include <QMap>
+#include <QMapIterator>
+#include <QStringList>
+#include <QStringListIterator>
+#include "Pokemod.h"
 #include "Species.h"
 
 const char* PokeMod::Species::StyleStr[PokeMod::Species::End] = {"Fluctuating", "Fading", "Slow", "Normal", "Fast", "Erratic"};
diff --git a/pokemod/Species.h b/pokemod/Species.h
index 2da580a7..440e3e35 100644
--- a/pokemod/Species.h
+++ b/pokemod/Species.h
@@ -23,18 +23,12 @@
 #ifndef __POKEMOD_SPECIES__
 #define __POKEMOD_SPECIES__
 
-#include <QDir>
 #include <QList>
-#include <QListIterator>
-#include <QMap>
-#include <QMapIterator>
 #include <QString>
-#include <QStringList>
-#include <QStringListIterator>
 #include "../general/Exception.h"
 #include "../general/Frac.h"
+#include "../general/Ref.h"
 #include "Object.h"
-#include "Pokemod.h"
 #include "SpeciesAbility.h"
 #include "SpeciesEvolution.h"
 #include "SpeciesItem.h"
@@ -42,6 +36,8 @@
 
 namespace PokeMod
 {
+    class Pokemod;
+    
     class Species : public Object
     {
         public:
diff --git a/pokemod/SpeciesAbility.cpp b/pokemod/SpeciesAbility.cpp
index 6728c1b0..6da854bc 100644
--- a/pokemod/SpeciesAbility.cpp
+++ b/pokemod/SpeciesAbility.cpp
@@ -20,6 +20,7 @@
 //    with this program.  If not, see <http://www.gnu.org/licenses/>.
 /////////////////////////////////////////////////////////////////////////////
 
+#include "Pokemod.h"
 #include "SpeciesAbility.h"
 
 PokeMod::SpeciesAbility::SpeciesAbility(const Pokemod& par, const unsigned _id) :
diff --git a/pokemod/SpeciesAbility.h b/pokemod/SpeciesAbility.h
index 6fbfcbb9..d7065ed0 100644
--- a/pokemod/SpeciesAbility.h
+++ b/pokemod/SpeciesAbility.h
@@ -26,10 +26,11 @@
 #include <QString>
 #include "../general/Exception.h"
 #include "Object.h"
-#include "Pokemod.h"
 
 namespace PokeMod
 {
+    class Pokemod;
+    
     class SpeciesAbility : public Object
     {
         public:
diff --git a/pokemod/SpeciesEvolution.cpp b/pokemod/SpeciesEvolution.cpp
index 36e81686..858d9e2d 100644
--- a/pokemod/SpeciesEvolution.cpp
+++ b/pokemod/SpeciesEvolution.cpp
@@ -20,6 +20,10 @@
 //    with this program.  If not, see <http://www.gnu.org/licenses/>.
 /////////////////////////////////////////////////////////////////////////////
 
+#include "../general/Ref.h"
+#include "Pokemod.h"
+#include "Item.h"
+#include "ItemEffect.h"
 #include "SpeciesEvolution.h"
 
 const char* PokeMod::SpeciesEvolution::StyleStr[PokeMod::SpeciesEvolution::S_End] = {"Level", "Happiness", "Stat", "Item", "Trade", "TradeItem", "Personality", "Spare Slot"};
diff --git a/pokemod/SpeciesEvolution.h b/pokemod/SpeciesEvolution.h
index 49218001..984948b8 100644
--- a/pokemod/SpeciesEvolution.h
+++ b/pokemod/SpeciesEvolution.h
@@ -26,10 +26,11 @@
 #include <QString>
 #include "../general/Exception.h"
 #include "Object.h"
-#include "Pokemod.h"
 
 namespace PokeMod
 {
+    class Pokemod;
+    
     class SpeciesEvolution : public Object
     {
         public:
diff --git a/pokemod/SpeciesItem.cpp b/pokemod/SpeciesItem.cpp
index ebd20187..be42911b 100644
--- a/pokemod/SpeciesItem.cpp
+++ b/pokemod/SpeciesItem.cpp
@@ -20,6 +20,7 @@
 //    with this program.  If not, see <http://www.gnu.org/licenses/>.
 /////////////////////////////////////////////////////////////////////////////
 
+#include "Pokemod.h"
 #include "SpeciesItem.h"
 
 PokeMod::SpeciesItem::SpeciesItem(const Pokemod& par, const unsigned _id) :
diff --git a/pokemod/SpeciesItem.h b/pokemod/SpeciesItem.h
index 532e4730..5cbaa83c 100644
--- a/pokemod/SpeciesItem.h
+++ b/pokemod/SpeciesItem.h
@@ -26,10 +26,11 @@
 #include <QString>
 #include "../general/Exception.h"
 #include "Object.h"
-#include "Pokemod.h"
 
 namespace PokeMod
 {
+    class Pokemod;
+    
     class SpeciesItem : public Object
     {
         public:
diff --git a/pokemod/SpeciesMove.cpp b/pokemod/SpeciesMove.cpp
index d7e0ad2e..da6d7dd9 100644
--- a/pokemod/SpeciesMove.cpp
+++ b/pokemod/SpeciesMove.cpp
@@ -20,6 +20,7 @@
 //    with this program.  If not, see <http://www.gnu.org/licenses/>.
 /////////////////////////////////////////////////////////////////////////////
 
+#include "Pokemod.h"
 #include "SpeciesMove.h"
 
 PokeMod::SpeciesMove::SpeciesMove(const Pokemod& par, const unsigned _id) :
diff --git a/pokemod/SpeciesMove.h b/pokemod/SpeciesMove.h
index 3d5e60e3..2453a55a 100644
--- a/pokemod/SpeciesMove.h
+++ b/pokemod/SpeciesMove.h
@@ -26,10 +26,11 @@
 #include <QString>
 #include "../general/Exception.h"
 #include "Object.h"
-#include "Pokemod.h"
 
 namespace PokeMod
 {
+    class Pokemod;
+    
     class SpeciesMove : public Object
     {
         public:
diff --git a/pokemod/Store.cpp b/pokemod/Store.cpp
index ab20947b..5ab49b73 100644
--- a/pokemod/Store.cpp
+++ b/pokemod/Store.cpp
@@ -20,6 +20,10 @@
 //    with this program.  If not, see <http://www.gnu.org/licenses/>.
 /////////////////////////////////////////////////////////////////////////////
 
+#include <QListIterator>
+#include <QMap>
+#include <QMapIterator>
+#include "Pokemod.h"
 #include "Store.h"
 
 PokeMod::Store::Store(const Pokemod& par, const unsigned _id) :
diff --git a/pokemod/Store.h b/pokemod/Store.h
index c81a6571..9b4f8aaf 100644
--- a/pokemod/Store.h
+++ b/pokemod/Store.h
@@ -24,16 +24,14 @@
 #define __POKEMOD_STORE__
 
 #include <QList>
-#include <QListIterator>
-#include <QMap>
-#include <QMapIterator>
 #include <QString>
 #include "../general/Exception.h"
 #include "Object.h"
-#include "Pokemod.h"
 
 namespace PokeMod
 {
+    class Pokemod;
+    
     class Store : public Object
     {
         public:
diff --git a/pokemod/Tile.cpp b/pokemod/Tile.cpp
index 7d941bf6..025782d4 100644
--- a/pokemod/Tile.cpp
+++ b/pokemod/Tile.cpp
@@ -20,6 +20,8 @@
 //    with this program.  If not, see <http://www.gnu.org/licenses/>.
 /////////////////////////////////////////////////////////////////////////////
 
+#include "../general/Ref.h"
+#include "Pokemod.h"
 #include "Tile.h"
 
 const char* PokeMod::Tile::HMTypeStr[PokeMod::Tile::H_End] = 
diff --git a/pokemod/Tile.h b/pokemod/Tile.h
index 315514f7..9f0b8668 100644
--- a/pokemod/Tile.h
+++ b/pokemod/Tile.h
@@ -26,10 +26,11 @@
 #include <QString>
 #include "../general/Exception.h"
 #include "Object.h"
-#include "Pokemod.h"
 
 namespace PokeMod
 {
+    class Pokemod;
+    
     class Tile : public Object
     {
         public:
diff --git a/pokemod/Time.cpp b/pokemod/Time.cpp
index f9f0e174..c33d0381 100644
--- a/pokemod/Time.cpp
+++ b/pokemod/Time.cpp
@@ -20,6 +20,7 @@
 //    with this program.  If not, see <http://www.gnu.org/licenses/>.
 /////////////////////////////////////////////////////////////////////////////
 
+#include "Pokemod.h"
 #include "Time.h"
 
 PokeMod::Time::Time(const Pokemod& par, const unsigned _id) :
diff --git a/pokemod/Time.h b/pokemod/Time.h
index 9f7b296d..8a1b0198 100644
--- a/pokemod/Time.h
+++ b/pokemod/Time.h
@@ -26,10 +26,11 @@
 #include <QString>
 #include "../general/Exception.h"
 #include "Object.h"
-#include "Pokemod.h"
 
 namespace PokeMod
 {
+    class Pokemod;
+    
     class Time : public Object
     {
         public:
diff --git a/pokemod/Type.cpp b/pokemod/Type.cpp
index 43c8013b..9c7137e0 100644
--- a/pokemod/Type.cpp
+++ b/pokemod/Type.cpp
@@ -20,6 +20,7 @@
 //    with this program.  If not, see <http://www.gnu.org/licenses/>.
 /////////////////////////////////////////////////////////////////////////////
 
+#include "Pokemod.h"
 #include "Type.h"
 
 PokeMod::Type::Type(const Pokemod& par, const unsigned _id) :
diff --git a/pokemod/Type.h b/pokemod/Type.h
index 6195c80a..51370fd3 100644
--- a/pokemod/Type.h
+++ b/pokemod/Type.h
@@ -27,10 +27,11 @@
 #include "../general/Exception.h"
 #include "../general/Frac.h"
 #include "Object.h"
-#include "Pokemod.h"
 
 namespace PokeMod
 {
+    class Pokemod;
+    
     class Type : public Object
     {
         public:
diff --git a/pokemodr/PokeModr.h b/pokemodr/PokeModr.h
index cf66baa7..0a63235f 100644
--- a/pokemodr/PokeModr.h
+++ b/pokemodr/PokeModr.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        pokegen/PokeModr.h
+// Name:        pokemodr/PokeModr.h
 // Purpose:     Main window for PokéModr
 // Author:      Ben Boeckel
 // Modified by: Ben Boeckel