# HG changeset patch
# User Grumpy7
# Date 1370969562 -7200
# Node ID fac7751b2dc9feb3c2ffafe901ee99ce61ffb66d
# Parent  fa6b8e8393551ef2d80d8ba6a491aa371884cb99
included header cleanup

diff -r fa6b8e839355 -r fac7751b2dc9 Actor.cpp
--- a/Actor.cpp	Tue Jun 11 15:26:53 2013 +0200
+++ b/Actor.cpp	Tue Jun 11 18:52:42 2013 +0200
@@ -5,7 +5,7 @@
 #include <assert.h>
 
 
-#include "VideoPlayer.h"
+#include "mm7_data.h"
 #include "DecalBuilder.h"
 
 #include "Sprites.h"
diff -r fa6b8e839355 -r fac7751b2dc9 Mouse.cpp
--- a/Mouse.cpp	Tue Jun 11 15:26:53 2013 +0200
+++ b/Mouse.cpp	Tue Jun 11 18:52:42 2013 +0200
@@ -5,7 +5,7 @@
 #include "OSAPI.h"
 
 #include "VideoPlayer.h"
-#include "Vis.h"
+#include "Render.h"
 #include "Mouse.h"
 #include "Items.h"
 #include "Party.h"
diff -r fa6b8e839355 -r fac7751b2dc9 UIHouses.cpp
--- a/UIHouses.cpp	Tue Jun 11 15:26:53 2013 +0200
+++ b/UIHouses.cpp	Tue Jun 11 18:52:42 2013 +0200
@@ -4,7 +4,6 @@
 
 #include "UIHouses.h"
 #include "Party.h"
-#include "Player.h"
 #include "texts.h"
 #include "Events.h"
 #include "Arcomage.h"
@@ -14,20 +13,15 @@
 #include "GUIFont.h"
 #include "Events2D.h"
 #include "Overlays.h"
-#include "Render.h"
-#include "Indoor.h"
 #include "Outdoor.h"
 #include "AudioPlayer.h"
 #include "VideoPlayer.h"
 #include "Monsters.h"
 #include "Viewport.h"
 #include "Keyboard.h"
-#include "NPC.h"
 #include "IndoorCamera.h"
 #include "MapInfo.h"
 #include "Log.h"
-#include "MM7.h"
-#include "mm7_data.h"
 #include "Game.h"
 
 #include "stru159.h"
diff -r fa6b8e839355 -r fac7751b2dc9 UIMainMenu.cpp
--- a/UIMainMenu.cpp	Tue Jun 11 15:26:53 2013 +0200
+++ b/UIMainMenu.cpp	Tue Jun 11 18:52:42 2013 +0200
@@ -4,48 +4,18 @@
 
 #include <assert.h>
 
-#include "MM7.h"
 
 #include "Mouse.h"
 #include "Keyboard.h"
 
-#include "MapInfo.h"
-#include "Game.h"
 #include "GUIWindow.h"
 #include "GUIFont.h"
-#include "GUIProgressBar.h"
-#include "Party.h"
 #include "AudioPlayer.h"
 #include "Outdoor.h"
-#include "IndoorCamera.h"
-#include "Overlays.h"
-#include "Monsters.h"
-#include "Arcomage.h"
 #include "LOD.h"
-#include "Actor.h"
 #include "Allocator.h"
-#include "Events.h"
-#include "Viewport.h"
-#include "FrameTableInc.h"
-#include "Math.h"
-#include "SpriteObject.h"
-#include "ObjectList.h"
-#include "Chest.h"
 #include "PaletteManager.h"
-#include "DecorationList.h"
-#include "SaveLoad.h"
-#include "stru123.h"
-#include "Time.h"
 #include "IconFrameTable.h"
-#include "Awards.h"
-#include "Autonotes.h"
-#include "stru160.h"
-#include "TurnEngine.h"
-#include "CastSpellInfo.h"
-#include "Weather.h"
-#include "stru298.h"
-#include "StorylineTextTable.h"
-#include "Events2D.h"
 #include "texts.h"
 
 #include "mm7_data.h"
diff -r fa6b8e839355 -r fac7751b2dc9 UIOptions.cpp
--- a/UIOptions.cpp	Tue Jun 11 15:26:53 2013 +0200
+++ b/UIOptions.cpp	Tue Jun 11 18:52:42 2013 +0200
@@ -9,43 +9,11 @@
 #include "stru6.h"
 #include "stru9.h"
 
-#include "MapInfo.h"
 #include "Game.h"
 #include "GUIWindow.h"
 #include "GUIFont.h"
-#include "GUIProgressBar.h"
-#include "Party.h"
 #include "AudioPlayer.h"
-#include "Outdoor.h"
-#include "IndoorCamera.h"
-#include "Overlays.h"
-#include "Monsters.h"
-#include "Arcomage.h"
 #include "LOD.h"
-#include "Actor.h"
-#include "Allocator.h"
-#include "Events.h"
-#include "Viewport.h"
-#include "FrameTableInc.h"
-#include "Math.h"
-#include "SpriteObject.h"
-#include "ObjectList.h"
-#include "Chest.h"
-#include "PaletteManager.h"
-#include "DecorationList.h"
-#include "SaveLoad.h"
-#include "stru123.h"
-#include "Time.h"
-#include "IconFrameTable.h"
-#include "Awards.h"
-#include "Autonotes.h"
-#include "stru160.h"
-#include "TurnEngine.h"
-#include "CastSpellInfo.h"
-#include "Weather.h"
-#include "stru298.h"
-#include "StorylineTextTable.h"
-#include "Events2D.h"
 #include "texts.h"
 
 #include "mm7_data.h"
diff -r fa6b8e839355 -r fac7751b2dc9 UIPartyCreation.cpp
--- a/UIPartyCreation.cpp	Tue Jun 11 15:26:53 2013 +0200
+++ b/UIPartyCreation.cpp	Tue Jun 11 18:52:42 2013 +0200
@@ -4,59 +4,20 @@
 
 #include <assert.h>
 
-#include "MM7.h"
 
-#include "LightmapBuilder.h"
-#include "DecalBuilder.h"
-#include "ParticleEngine.h"
 #include "Mouse.h"
 #include "Keyboard.h"
-#include "IndoorCameraD3D.h"
-#include "CShow.h"
-#include "GammaControl.h"
-#include "stru6.h"
-#include "stru9.h"
-#include "stru10.h"
-#include "stru11.h"
-#include "stru12.h"
 
-#include "MapInfo.h"
 #include "Game.h"
 #include "GUIWindow.h"
 #include "GUIFont.h"
-#include "GUIProgressBar.h"
 #include "Party.h"
 #include "AudioPlayer.h"
 #include "Outdoor.h"
-#include "IndoorCamera.h"
-#include "Overlays.h"
-#include "Monsters.h"
-#include "Arcomage.h"
 #include "LOD.h"
-#include "Actor.h"
 #include "Allocator.h"
-#include "Events.h"
-#include "Viewport.h"
-#include "FrameTableInc.h"
-#include "Math.h"
-#include "SpriteObject.h"
-#include "ObjectList.h"
-#include "Chest.h"
-#include "PaletteManager.h"
-#include "DecorationList.h"
-#include "SaveLoad.h"
-#include "stru123.h"
 #include "Time.h"
 #include "IconFrameTable.h"
-#include "Awards.h"
-#include "Autonotes.h"
-#include "stru160.h"
-#include "TurnEngine.h"
-#include "CastSpellInfo.h"
-#include "Weather.h"
-#include "stru298.h"
-#include "StorylineTextTable.h"
-#include "Events2D.h"
 #include "texts.h"
 
 #include "mm7_data.h"
diff -r fa6b8e839355 -r fac7751b2dc9 UIPopup.cpp
--- a/UIPopup.cpp	Tue Jun 11 15:26:53 2013 +0200
+++ b/UIPopup.cpp	Tue Jun 11 18:52:42 2013 +0200
@@ -10,43 +10,19 @@
 
 #include "Sprites.h"
 #include "Vis.h"
-#include "MapInfo.h"
 #include "Game.h"
 #include "GUIWindow.h"
 #include "GUIFont.h"
-#include "GUIProgressBar.h"
 #include "Party.h"
 #include "AudioPlayer.h"
-#include "Outdoor.h"
-#include "IndoorCamera.h"
-#include "Overlays.h"
-#include "Monsters.h"
-#include "Arcomage.h"
 #include "LOD.h"
 #include "Actor.h"
-#include "Allocator.h"
-#include "Events.h"
 #include "Viewport.h"
-#include "FrameTableInc.h"
-#include "Math.h"
 #include "SpriteObject.h"
 #include "ObjectList.h"
 #include "Chest.h"
 #include "PaletteManager.h"
-#include "DecorationList.h"
-#include "SaveLoad.h"
-#include "stru123.h"
 #include "Time.h"
-#include "IconFrameTable.h"
-#include "Awards.h"
-#include "Autonotes.h"
-#include "stru160.h"
-#include "TurnEngine.h"
-#include "CastSpellInfo.h"
-#include "Weather.h"
-#include "stru298.h"
-#include "StorylineTextTable.h"
-#include "Events2D.h"
 #include "texts.h"
 
 #include "mm7_data.h"
diff -r fa6b8e839355 -r fac7751b2dc9 UIRest.cpp
--- a/UIRest.cpp	Tue Jun 11 15:26:53 2013 +0200
+++ b/UIRest.cpp	Tue Jun 11 18:52:42 2013 +0200
@@ -4,46 +4,15 @@
 
 #include <assert.h>
 
-#include "MM7.h"
 
-#include "MapInfo.h"
-#include "Game.h"
-#include "Player.h"
 #include "GUIWindow.h"
 #include "GUIFont.h"
-#include "GUIProgressBar.h"
 #include "Party.h"
 #include "AudioPlayer.h"
 #include "Outdoor.h"
-#include "IndoorCamera.h"
-#include "Overlays.h"
-#include "Monsters.h"
-#include "Arcomage.h"
 #include "LOD.h"
-#include "Actor.h"
-#include "Allocator.h"
-#include "Events.h"
 #include "Viewport.h"
-#include "FrameTableInc.h"
-#include "Math.h"
-#include "SpriteObject.h"
-#include "ObjectList.h"
-#include "Chest.h"
-#include "PaletteManager.h"
-#include "DecorationList.h"
-#include "SaveLoad.h"
-#include "stru123.h"
 #include "Time.h"
-#include "IconFrameTable.h"
-#include "Awards.h"
-#include "Autonotes.h"
-#include "stru160.h"
-#include "TurnEngine.h"
-#include "CastSpellInfo.h"
-#include "Weather.h"
-#include "stru298.h"
-#include "StorylineTextTable.h"
-#include "Events2D.h"
 #include "texts.h"
 
 #include "mm7_data.h"
diff -r fa6b8e839355 -r fac7751b2dc9 UISaveLoad.cpp
--- a/UISaveLoad.cpp	Tue Jun 11 15:26:53 2013 +0200
+++ b/UISaveLoad.cpp	Tue Jun 11 18:52:42 2013 +0200
@@ -6,46 +6,16 @@
 #include <io.h>
 #include "MM7.h"
 
-#include "Mouse.h"
 #include "Keyboard.h"
 
 #include "MapInfo.h"
-#include "Game.h"
 #include "GUIWindow.h"
 #include "GUIFont.h"
-#include "GUIProgressBar.h"
-#include "Party.h"
-#include "AudioPlayer.h"
 #include "Outdoor.h"
 #include "IndoorCamera.h"
-#include "Overlays.h"
-#include "Monsters.h"
-#include "Arcomage.h"
 #include "LOD.h"
-#include "Actor.h"
 #include "Allocator.h"
-#include "Events.h"
-#include "Viewport.h"
-#include "FrameTableInc.h"
-#include "Math.h"
-#include "SpriteObject.h"
-#include "ObjectList.h"
-#include "Chest.h"
-#include "PaletteManager.h"
-#include "DecorationList.h"
 #include "SaveLoad.h"
-#include "stru123.h"
-#include "Time.h"
-#include "IconFrameTable.h"
-#include "Awards.h"
-#include "Autonotes.h"
-#include "stru160.h"
-#include "TurnEngine.h"
-#include "CastSpellInfo.h"
-#include "Weather.h"
-#include "stru298.h"
-#include "StorylineTextTable.h"
-#include "Events2D.h"
 #include "texts.h"
 
 #include "mm7_data.h"
diff -r fa6b8e839355 -r fac7751b2dc9 UITransition.cpp
--- a/UITransition.cpp	Tue Jun 11 15:26:53 2013 +0200
+++ b/UITransition.cpp	Tue Jun 11 18:52:42 2013 +0200
@@ -5,52 +5,21 @@
 #include <assert.h>
 #include <io.h>
 
-#include "Mouse.h"
-#include "Keyboard.h"
 #include "VideoPlayer.h"
 #include "MapInfo.h"
-#include "Game.h"
 #include "GUIWindow.h"
 #include "GUIFont.h"
 #include "GUIProgressBar.h"
 #include "Party.h"
 #include "AudioPlayer.h"
 #include "Outdoor.h"
-#include "IndoorCamera.h"
-#include "Overlays.h"
-#include "Monsters.h"
-#include "Arcomage.h"
 #include "LOD.h"
-#include "Actor.h"
-#include "Allocator.h"
-#include "Events.h"
-#include "Viewport.h"
-#include "FrameTableInc.h"
-#include "Math.h"
-#include "SpriteObject.h"
-#include "ObjectList.h"
-#include "Chest.h"
-#include "PaletteManager.h"
-#include "DecorationList.h"
-#include "SaveLoad.h"
-#include "stru123.h"
 #include "Time.h"
-#include "IconFrameTable.h"
-#include "Awards.h"
-#include "Autonotes.h"
 #include "stru159.h"
-#include "stru160.h"
-#include "TurnEngine.h"
-#include "CastSpellInfo.h"
-#include "Weather.h"
-#include "stru298.h"
-#include "StorylineTextTable.h"
 #include "Events2D.h"
 #include "texts.h"
 #include "UIHouses.h"
 
-#include "mm7_data.h"
-
 
 
 
diff -r fa6b8e839355 -r fac7751b2dc9 UiGame.cpp
--- a/UiGame.cpp	Tue Jun 11 15:26:53 2013 +0200
+++ b/UiGame.cpp	Tue Jun 11 18:52:42 2013 +0200
@@ -6,64 +6,32 @@
 
 #include "MM7.h"
 
-#include "BSPModel.h"
-#include "LightmapBuilder.h"
-#include "DecalBuilder.h"
-#include "ParticleEngine.h"
 #include "Mouse.h"
 #include "Keyboard.h"
-#include "IndoorCameraD3D.h"
-#include "CShow.h"
-#include "GammaControl.h"
-#include "stru6.h"
-#include "stru9.h"
-#include "stru10.h"
 #include "stru11.h"
-#include "stru12.h"
 
 #include "Vis.h"
 #include "MapInfo.h"
 #include "Game.h"
 #include "GUIWindow.h"
 #include "GUIFont.h"
-#include "GUIProgressBar.h"
 #include "Party.h"
 #include "AudioPlayer.h"
 #include "Outdoor.h"
-#include "IndoorCamera.h"
-#include "Overlays.h"
-#include "Monsters.h"
-#include "Arcomage.h"
 #include "LOD.h"
 #include "Actor.h"
-#include "Allocator.h"
-#include "Events.h"
 #include "Viewport.h"
-#include "FrameTableInc.h"
-#include "Math.h"
 #include "SpriteObject.h"
 #include "ObjectList.h"
-#include "Chest.h"
-#include "PaletteManager.h"
 #include "DecorationList.h"
 #include "PlayerFrameTable.h"
-#include "SaveLoad.h"
 #include "stru123.h"
 #include "Time.h"
 #include "IconFrameTable.h"
-#include "Awards.h"
-#include "Autonotes.h"
-#include "stru160.h"
 #include "TurnEngine.h"
-#include "CastSpellInfo.h"
-#include "Weather.h"
-#include "stru298.h"
-#include "StorylineTextTable.h"
-#include "Events2D.h"
 #include "texts.h"
 #include "UIHouses.h"
 
-#include "mm7_data.h"
 
 
 
diff -r fa6b8e839355 -r fac7751b2dc9 VideoPlayer.cpp
--- a/VideoPlayer.cpp	Tue Jun 11 15:26:53 2013 +0200
+++ b/VideoPlayer.cpp	Tue Jun 11 18:52:42 2013 +0200
@@ -19,10 +19,8 @@
 #include "Allocator.h"
 #include "Time.h"
 #include "Log.h"
+#include "texts.h"
 #include "UIHouses.h"
-#include "texts.h"
-#include "MM7.h"
-#include "mm7_data.h"
 
 
 VideoPlayer *pVideoPlayer = nullptr;
diff -r fa6b8e839355 -r fac7751b2dc9 VideoPlayer.h
--- a/VideoPlayer.h	Tue Jun 11 15:26:53 2013 +0200
+++ b/VideoPlayer.h	Tue Jun 11 18:52:42 2013 +0200
@@ -1,7 +1,6 @@
 #pragma once
 #include "OSAPI.h"
 
-#include "Texture.h"
 #include "mm7_data.h"
 
 
diff -r fa6b8e839355 -r fac7751b2dc9 Viewport.cpp
--- a/Viewport.cpp	Tue Jun 11 15:26:53 2013 +0200
+++ b/Viewport.cpp	Tue Jun 11 18:52:42 2013 +0200
@@ -1,9 +1,7 @@
 #include "Viewport.h"
 
 #include "Party.h"
-#include "VectorTypes.h"
 #include "Indoor.h"
-#include "Render.h"
 #include "Math.h"
 #include "mm7_data.h"
 
diff -r fa6b8e839355 -r fac7751b2dc9 Vis.cpp
--- a/Vis.cpp	Tue Jun 11 15:26:53 2013 +0200
+++ b/Vis.cpp	Tue Jun 11 18:52:42 2013 +0200
@@ -1,6 +1,5 @@
 #include <assert.h>
 
-#include "BSPModel.h"
 #include "Vis.h"
 #include "Outdoor.h"
 #include "Game.h"