diff --git a/projects/mtg/include/AllAbilities.h b/projects/mtg/include/AllAbilities.h
index 9096936b6..1604386ac 100644
--- a/projects/mtg/include/AllAbilities.h
+++ b/projects/mtg/include/AllAbilities.h
@@ -9,7 +9,6 @@
 #include "CardDisplay.h"
 #include "Subtypes.h"
 #include "CardGui.h"
-#include "GameOptions.h"
 #include "Token.h"
 #include "Counters.h"
 #include "WEvent.h"
diff --git a/projects/mtg/include/Credits.h b/projects/mtg/include/Credits.h
index 8d2353f15..ba3e08d8e 100644
--- a/projects/mtg/include/Credits.h
+++ b/projects/mtg/include/Credits.h
@@ -9,6 +9,7 @@
 #include "Player.h"
 
 class GameApp;
+class DeckStats;
 
 using namespace std;
 
diff --git a/projects/mtg/include/GameApp.h b/projects/mtg/include/GameApp.h
index bc349d257..05f001b1f 100644
--- a/projects/mtg/include/GameApp.h
+++ b/projects/mtg/include/GameApp.h
@@ -15,7 +15,6 @@
 #include "WResourceManager.h"
 
 #include "GameState.h"
-#include "GameOptions.h"
 
 #include "MTGDeck.h"
 #include "MTGCard.h"
diff --git a/projects/mtg/include/GameStateDeckViewer.h b/projects/mtg/include/GameStateDeckViewer.h
index 17cd9fc30..f815ecb72 100644
--- a/projects/mtg/include/GameStateDeckViewer.h
+++ b/projects/mtg/include/GameStateDeckViewer.h
@@ -11,7 +11,6 @@
 #include "SimpleMenu.h"
 #include "WResourceManager.h"
 #include "CardGui.h"
-#include "GameOptions.h"
 #include "PriceList.h"
 #include "PlayerData.h"
 #include "DeckDataWrapper.h"
diff --git a/projects/mtg/include/OptionItem.h b/projects/mtg/include/OptionItem.h
index c15d95868..7664e82d8 100644
--- a/projects/mtg/include/OptionItem.h
+++ b/projects/mtg/include/OptionItem.h
@@ -9,7 +9,6 @@
 #include <string>
 #include "GameApp.h"
 #include "GameStateOptions.h"
-#include "GameOptions.h"
 #include "WFilter.h"
 #include "WDataSrc.h"
 #include "WGui.h"
diff --git a/projects/mtg/include/PrecompiledHeader.h b/projects/mtg/include/PrecompiledHeader.h
index 0db782ad9..a9359bcdf 100644
--- a/projects/mtg/include/PrecompiledHeader.h
+++ b/projects/mtg/include/PrecompiledHeader.h
@@ -19,6 +19,8 @@
 #include "JFileSystem.h"
 #include "JLogger.h"
 
+#include "GameOptions.h"
+
 #include <boost/shared_ptr.hpp>
 
 #endif //PRECOMPILEDHEADER_H
diff --git a/projects/mtg/src/ActionStack.cpp b/projects/mtg/src/ActionStack.cpp
index a8c4021c5..7b7f90132 100644
--- a/projects/mtg/src/ActionStack.cpp
+++ b/projects/mtg/src/ActionStack.cpp
@@ -8,7 +8,6 @@ The Action Stack contains all information for Game Events that can be interrupte
 #include "CardSelectorSingleton.h"
 #include "Damage.h"
 #include "GameObserver.h"
-#include "GameOptions.h"
 #include "ManaCost.h"
 #include "MTGAbility.h"
 #include "Subtypes.h"
diff --git a/projects/mtg/src/Credits.cpp b/projects/mtg/src/Credits.cpp
index 24d7f4341..a07e5f6c8 100644
--- a/projects/mtg/src/Credits.cpp
+++ b/projects/mtg/src/Credits.cpp
@@ -2,7 +2,6 @@
 
 #include "Credits.h"
 #include "GameApp.h"
-#include "GameOptions.h"
 #include "PlayerData.h"
 #include "DeckStats.h"
 #include "Translate.h"
diff --git a/projects/mtg/src/GameObserver.cpp b/projects/mtg/src/GameObserver.cpp
index d2487719e..cbc94f9f7 100644
--- a/projects/mtg/src/GameObserver.cpp
+++ b/projects/mtg/src/GameObserver.cpp
@@ -1,7 +1,6 @@
 #include "PrecompiledHeader.h"
 
 #include "GameObserver.h"
-#include "GameOptions.h"
 #include "CardGui.h"
 #include "Damage.h"
 #include "Rules.h"
diff --git a/projects/mtg/src/GameStateAwards.cpp b/projects/mtg/src/GameStateAwards.cpp
index 9b501b210..4ed0153fb 100644
--- a/projects/mtg/src/GameStateAwards.cpp
+++ b/projects/mtg/src/GameStateAwards.cpp
@@ -9,7 +9,6 @@
 #include "MTGDeck.h"
 #include "Translate.h"
 #include "OptionItem.h"
-#include "GameOptions.h"
 #include "DeckDataWrapper.h"
 
 enum ENUM_AWARDS_STATE
diff --git a/projects/mtg/src/GameStateDuel.cpp b/projects/mtg/src/GameStateDuel.cpp
index 259faf640..a1b3a86ab 100644
--- a/projects/mtg/src/GameStateDuel.cpp
+++ b/projects/mtg/src/GameStateDuel.cpp
@@ -2,7 +2,6 @@
 
 #include "DeckMenu.h"
 #include "GameStateDuel.h"
-#include "GameOptions.h"
 #include "utils.h"
 #include "AIPlayer.h"
 #include "AIMomirPlayer.h"
diff --git a/projects/mtg/src/GameStateMenu.cpp b/projects/mtg/src/GameStateMenu.cpp
index ffc9923cf..3b16b10e4 100644
--- a/projects/mtg/src/GameStateMenu.cpp
+++ b/projects/mtg/src/GameStateMenu.cpp
@@ -10,7 +10,6 @@
 #include "GameStateMenu.h"
 #include "DeckManager.h"
 #include "MenuItem.h"
-#include "GameOptions.h"
 #include "GameApp.h"
 #include "MTGCard.h"
 #include "Translate.h"
diff --git a/projects/mtg/src/GameStateOptions.cpp b/projects/mtg/src/GameStateOptions.cpp
index b75311f5e..448130462 100644
--- a/projects/mtg/src/GameStateOptions.cpp
+++ b/projects/mtg/src/GameStateOptions.cpp
@@ -5,7 +5,6 @@
 #include "OptionItem.h"
 #include "SimpleMenu.h"
 #include "SimplePad.h"
-#include "GameOptions.h"
 #include "Translate.h"
 
 namespace
diff --git a/projects/mtg/src/GameStateShop.cpp b/projects/mtg/src/GameStateShop.cpp
index ef242602f..de85a7ba8 100644
--- a/projects/mtg/src/GameStateShop.cpp
+++ b/projects/mtg/src/GameStateShop.cpp
@@ -9,7 +9,6 @@
 #include "MTGDeck.h"
 #include "MTGPack.h"
 #include "Translate.h"
-#include "GameOptions.h"
 #include "TestSuiteAI.h"
 
 #include <hge/hgedistort.h>
diff --git a/projects/mtg/src/GameStateTransitions.cpp b/projects/mtg/src/GameStateTransitions.cpp
index f867629ff..95c9a47fe 100644
--- a/projects/mtg/src/GameStateTransitions.cpp
+++ b/projects/mtg/src/GameStateTransitions.cpp
@@ -7,7 +7,6 @@
 #include "MTGDeck.h"
 #include "Translate.h"
 #include "OptionItem.h"
-#include "GameOptions.h"
 
 TransitionBase::TransitionBase(GameApp* parent, GameState* _from, GameState* _to, float duration) :
     GameState(parent)
diff --git a/projects/mtg/src/MTGGameZones.cpp b/projects/mtg/src/MTGGameZones.cpp
index e97d6b2a9..230eb4756 100644
--- a/projects/mtg/src/MTGGameZones.cpp
+++ b/projects/mtg/src/MTGGameZones.cpp
@@ -2,7 +2,6 @@
 
 #include "MTGGameZones.h"
 #include "Player.h"
-#include "GameOptions.h"
 #include "WEvent.h"
 #include "MTGDeck.h"
 #include "Subtypes.h"
diff --git a/projects/mtg/src/MTGRules.cpp b/projects/mtg/src/MTGRules.cpp
index bf2cb2310..770481a96 100644
--- a/projects/mtg/src/MTGRules.cpp
+++ b/projects/mtg/src/MTGRules.cpp
@@ -4,7 +4,6 @@
 #include "MTGRules.h"
 #include "Translate.h"
 #include "Subtypes.h"
-#include "GameOptions.h"
 #include "Credits.h"
 
 MTGEventBonus::MTGEventBonus(int _id) :
diff --git a/projects/mtg/src/MenuItem.cpp b/projects/mtg/src/MenuItem.cpp
index 4b2691487..b1f9a6539 100644
--- a/projects/mtg/src/MenuItem.cpp
+++ b/projects/mtg/src/MenuItem.cpp
@@ -1,7 +1,6 @@
 #include "PrecompiledHeader.h"
 
 #include "MenuItem.h"
-#include "GameOptions.h"
 #include "Translate.h"
 
 MenuItem::MenuItem(int id, WFont *font, string text, float x, float y, JQuad * _off, JQuad * _on, const char * particle,
diff --git a/projects/mtg/src/PlayerData.cpp b/projects/mtg/src/PlayerData.cpp
index 3733132a3..61384cf3f 100644
--- a/projects/mtg/src/PlayerData.cpp
+++ b/projects/mtg/src/PlayerData.cpp
@@ -1,6 +1,5 @@
 #include "PrecompiledHeader.h"
 
-#include "GameOptions.h"
 #include "PlayerData.h"
 
 #include <stdio.h>
diff --git a/projects/mtg/src/PriceList.cpp b/projects/mtg/src/PriceList.cpp
index eab8011c8..cd2d132f0 100644
--- a/projects/mtg/src/PriceList.cpp
+++ b/projects/mtg/src/PriceList.cpp
@@ -1,6 +1,8 @@
 #include "PrecompiledHeader.h"
 
 #include "PriceList.h"
+#include "utils.h"
+#include "MTGCard.h"
 
 int PriceList::randomKey = 0;
 
diff --git a/projects/mtg/src/Translate.cpp b/projects/mtg/src/Translate.cpp
index 04fe7ea96..643cf6f40 100644
--- a/projects/mtg/src/Translate.cpp
+++ b/projects/mtg/src/Translate.cpp
@@ -1,7 +1,6 @@
 #include "PrecompiledHeader.h"
 
 #include "Translate.h"
-#include "GameOptions.h"
 
 Translator * Translator::mInstance = NULL;
 
diff --git a/projects/mtg/src/WCachedResource.cpp b/projects/mtg/src/WCachedResource.cpp
index ce9944539..edcd560ee 100644
--- a/projects/mtg/src/WCachedResource.cpp
+++ b/projects/mtg/src/WCachedResource.cpp
@@ -2,7 +2,6 @@
 
 #include "utils.h"
 #include <JFileSystem.h>
-#include "GameOptions.h"
 #include "WResourceManager.h"
 #include "WCachedResource.h"
 #include <hge/hgeparticle.h>
diff --git a/projects/mtg/src/WResourceManager.cpp b/projects/mtg/src/WResourceManager.cpp
index b595a2e25..ecd82119a 100644
--- a/projects/mtg/src/WResourceManager.cpp
+++ b/projects/mtg/src/WResourceManager.cpp
@@ -1,6 +1,5 @@
 #include "PrecompiledHeader.h"
 
-#include "GameOptions.h"
 #include "WResourceManagerImpl.h"
 #include "StyleManager.h"