significantly cleaned up includes (by IoP)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6056 3b4a5df2-a311-0410-b5c6-a8a6f20db521

Tactical/AStarPathfinder.cpp

@@ -1,7 +1,6 @@
 
 //#include "stdafx.h"
 #include "profiler.h"
-#include "BinaryHeap.hpp"
 
 using namespace std;
 

Tactical/Air Raid.cpp

@@ -6,7 +6,6 @@
 	#include "air raid.h"
 	#include "game event hook.h"
 	#include "game clock.h"
-	#include "auto bandage.h"
 	#include "strategicmap.h"
 	#include "PreBattle Interface.h"
 	#include "screenids.h"
@@ -20,7 +19,6 @@
 	#include "message.h"
 	#include "isometric utils.h"
 	#include "soldier macros.h"
-	#include "worldman.h"
 	#include "los.h"
 	#include "math.h"
 	#include "explosion control.h"

Tactical/Animation Cache.cpp

@@ -11,7 +11,6 @@
 	#include "Animation Cache.h"
 	#include "Animation Data.h"
 	#include "Animation Control.h"
-	#include "sys globals.h"
 	#include "Debug Control.h"
 #endif
 

Tactical/Animation Control.cpp

@@ -4,7 +4,6 @@
 #include "builddefines.h"
 #include <stdio.h>
 #include <string.h>
-#include "wcheck.h"
 #include "stdlib.h"
 #include "debug.h"
 #include "Animation Control.h"
@@ -16,7 +15,6 @@
 #include "worlddef.h"
 #include "worldman.h"
 #include "rotting corpses.h"
-#include "points.h"
 #include "Debug Control.h"
 #include "Random.h"
 #include "Soldier Control.h"

Tactical/Animation Data.cpp

@@ -16,7 +16,6 @@
 	#include "Debug Control.h"
 	#include "utilities.h"
 	#include "worlddef.h"
-	#include "worldman.h"
 	#include "Fileman.h"
 #endif
 

Tactical/Auto Bandage.cpp

@@ -16,7 +16,6 @@
 	#include "renderworld.h"
 	#include "strategic turns.h"
 	#include "Event Pump.h"
-	#include "music control.h"
 	#include "dialogue control.h"
 	#include "ai.h"
 	#include "interface control.h"

Tactical/Campaign.cpp

@@ -5,7 +5,6 @@
 	#include <wchar.h>
 	#include <stdio.h>
 	#include <string.h>
-	#include "wcheck.h"
 	#include "stdlib.h"
 	#include "debug.h"
 	#include "MemMan.h"

Tactical/Dialogue Control.cpp

@@ -39,7 +39,6 @@
 	#include "Map Screen Interface.h"
 	#include "text.h"
 	#include "Merc Contract.h"
-	#include "history.h"
 	#include "Town Militia.h"
 	#include "meanwhile.h"
 	#include "SkillCheck.h"

Tactical/End Game.cpp

@@ -5,18 +5,14 @@
 #else
 
 	#include "Overhead.h"
-	#include "Boxing.h"
 	#include "Render Fun.h"
 	#include "Random.h"
 	#include "Worldman.h"
 	#include "Soldier Profile.h"
 	#include "NPC.h"
-	#include "Opplist.h"
 	#include "ai.h"
 	#include "Dialogue Control.h"
 	#include "Handle UI.h"
-	#include "Points.h"
-	#include "interface.h"
 	#include "end game.h"
 	#include "Intro.h"
 	#include "Exit Grids.h"

Tactical/Enemy Soldier Save.cpp

@@ -20,11 +20,9 @@
 	#include "Random.h"
 	#include "items.h"
 
-	#include "cursors.h"
 
 	#include "Map Information.h"
 	#include "soldier profile.h"
-	#include "Sys Globals.h"
 	#include "EditorMercs.h"
 	#include "Animation Data.h"
 	#include "message.h"

Tactical/Food.cpp

@@ -17,7 +17,6 @@
 	#include "Sound Control.h"
 	#include "Assignments.h"
 	#include "Overhead.h"
-	#include "worldman.h"
 	#include "Isometric Utils.h"
 	#include "Campaign Types.h"
 	#include "Drugs And Alcohol.h"

Tactical/GAP.cpp

@@ -8,7 +8,6 @@
 	#include "gap.h"
 	#include "Sound Control.h"
 	#include "soundman.h"
-	#include "Timer Control.h"
 	#include <stdio.h>
 	#include "FileMan.h"
 #endif

Tactical/Handle Doors.cpp

@@ -4,7 +4,6 @@
 #else
 	#include "builddefines.h"
 	#include <stdio.h>
-	#include <stdarg.h>
 	#include <time.h>
 	#include "sgp.h"
 	#include "worlddef.h"
@@ -14,7 +13,6 @@
 	#include "Animation Control.h"
 	#include "points.h"
 	#include "overhead.h"
-	#include "structure wrap.h"
 	#include "tile animation.h"
 	#include "Interactive Tiles.h"
 	#include "handle doors.h"

Tactical/Handle Items.cpp

@@ -55,14 +55,12 @@
 	#include "Opplist.h"
 	#include "qarray.h"
 	#include "render fun.h"
-	#include "environment.h"
 	#include "Map Information.h"
 	#include "GameSettings.h"
 	#include "end game.h"
 	#include "interface control.h"
 	#include "Map Screen Interface Map Inventory.h"
 	// added by SANDRO
-	#include "Game Clock.h" 
 	#include "Morale.h"
 	// added by Flugente
 	#include "drugs and alcohol.h"

Tactical/Handle UI.cpp

@@ -7,7 +7,6 @@
 #include "builddefines.h"
 #include <stdio.h>
 #include <string.h>
-#include "wcheck.h"
 #include "stdlib.h"
 #include "debug.h"
 #include "math.h"
@@ -34,7 +33,6 @@
 #include "opplist.h"
 #include "worldman.h"
 #include "weapons.h"
-#include "Sound Control.h"
 #include "renderworld.h"
 #include "structure.h"
 #include "interface panels.h"
@@ -71,7 +69,6 @@
 #include "text.h"
 #include "dialogue control.h"
 #include "line.h"
-#include "render dirty.h"
 #include "GameSettings.h"
 #include "los.h"
 #include "Campaign Types.h"
@@ -7068,4 +7065,4 @@ BOOLEAN IsValidJumpLocation( SOLDIERTYPE *pSoldier, INT32 sGridNo, BOOLEAN fChec
 	}
 
 	return( FALSE );
-}
+}

Tactical/Interface Control.cpp

@@ -2,7 +2,6 @@
 	#include "Tactical All.h"
 #else
 	#include <stdio.h>
-	#include <stdarg.h>
 	#include <time.h>
 	#include "sgp.h"
 	#include "gameloop.h"
@@ -14,13 +13,11 @@
 	#include "Button System.h"
 	#include "interface.h"
 	#include "vsurface.h"
-	#include "wcheck.h"
 	#include "input.h"
 	#include "Handle UI.h"
 	#include "Animation Control.h"
 	#include "Animation Data.h"
 	#include "renderworld.h"
-	#include "sys globals.h"
 	#include "cursors.h"
 	#include "radar screen.h"
 	#include "worldman.h"
@@ -28,7 +25,6 @@
 	#include "render dirty.h"
 	#include "utilities.h"
 	#include "interface cursors.h"
-	#include "Sound Control.h"
 	#include "lighting.h"
 	#include "Interface Panels.h"
 	#include "pathai.h"

Tactical/Interface Cursors.cpp

@@ -2,18 +2,15 @@
 	#include "Tactical All.h"
 #else
 	#include <stdio.h>
-	#include <stdarg.h>
 	#include <time.h>
 	#include "sgp.h"
 	#include "mousesystem.h"
 	#include "vsurface.h"
-	#include "wcheck.h"
 	#include "input.h"
 	#include "Handle UI.h"
 	#include "cursors.h"
 	#include "worlddef.h"
 	#include "worldman.h"
-	#include "render dirty.h"
 	#include "Interface Cursors.h"
 	#include "interface.h"
 	#include "Isometric utils.h"

Tactical/Interface Dialogue.cpp

@@ -10,7 +10,6 @@
 	#include "Encrypted File.h"
 	#include "faces.h"
 	#include "wcheck.h"
-	#include "render dirty.h"
 	#include "soldier profile.h"
 	#include "wordwrap.h"
 	#include "sysutil.h"
@@ -61,7 +60,6 @@
 	// including this for Strategic AI.h
 	#include "Strategic Movement.h"
 	#include "Strategic AI.h"
-	#include "Handle Doors.h"
 	#include "Soldier create.h"
 	#include "SkillCheck.h"
 	#include "Sound Control.h"

Tactical/Interface Enhanced.cpp

@@ -4,7 +4,6 @@
 #else
 	#include "builddefines.h"
 	#include <stdio.h>
-	#include <stdarg.h>
 	#include <time.h>
 	#include "sgp.h"
 	#include "gameloop.h"
@@ -20,18 +19,11 @@
 	#include "input.h"
 	#include "Handle UI.h"
 	#include "renderworld.h"
-	#include "sys globals.h"
-	#include "cursors.h"
-	#include "radar screen.h"
-	#include "worldman.h"
 	#include "Font Control.h"
-	#include "render dirty.h"
 	#include "utilities.h"
-	#include "Sound Control.h"
 	#include "Interface Panels.h"
 	#include "Animation Control.h"
 	#include "Soldier Control.h"
-	#include "pathai.h"
 	#include "weapons.h"
 	#include "lighting.h"
 	#include "faces.h"
@@ -41,28 +33,20 @@
 	#include "Interface Items.h"
 	#include "Font Control.h"
 	#include "Cursor Control.h"
-	#include "interface cursors.h"
 	#include "interface utils.h"
 	#include "interface items.h"
 	#include "wordwrap.h"
-	#include "interface control.h"
 	#include "vobject_blitters.h"
 	#include "world items.h"
 	#include "points.h"
 	#include "physics.h"
-	#include "finances.h"
-	#include "ui cursors.h"
 	#include "handle ui.h"
 	#include "ShopKeeper Interface.h"
-	#include "dialogue control.h"
 	#include "english.h"
 	#include "keys.h"
 	#include "Strategicmap.h"
-	#include "Arms Dealer Init.h"
 	#include "soldier macros.h"
-	#include "game clock.h"
 	#include "squads.h"
-	#include "LaptopSave.h"
 	#include "MessageBoxScreen.h"
 	#include "Language Defines.h"
 	#include "GameSettings.h"
@@ -70,7 +54,6 @@
 	#include "Quests.h"
 	#include "Map Screen Interface.h"
 	#include "Campaign Types.h"
-	#include "opplist.h"
 	#include "los.h"
 	#include "Map Screen Interface Map.h"
 	#include "Food.h"	// added by Flugente

Tactical/Interface Items.cpp

@@ -24,11 +24,9 @@
 	#include "sys globals.h"
 	#include "cursors.h"
 	#include "radar screen.h"
-	#include "worldman.h"
 	#include "Font Control.h"
 	#include "render dirty.h"
 	#include "utilities.h"
-	#include "Sound Control.h"
 	#include "Interface Panels.h"
 	#include "Animation Control.h"
 	#include "Soldier Control.h"
@@ -59,11 +57,9 @@
 	#include "english.h"
 	#include "keys.h"
 	#include "Strategicmap.h"
-	#include "Arms Dealer Init.h"
 	#include "soldier macros.h"
 	#include "game clock.h"
 	#include "squads.h"
-	#include "LaptopSave.h"
 	#include "MessageBoxScreen.h"
 	#include "Language Defines.h"
 	#include "GameSettings.h"

Tactical/Interface Panels.cpp

@@ -3,7 +3,6 @@
 #else
 	#include "builddefines.h"
 	#include <stdio.h>
-	#include <stdarg.h>
 	#include <time.h>
 	#include "sgp.h"
 	#include "gameloop.h"
@@ -19,10 +18,8 @@
 	#include "input.h"
 	#include "Handle UI.h"
 	#include "renderworld.h"
-	#include "sys globals.h"
 	#include "cursors.h"
 	#include "radar screen.h"
-	#include "worldman.h"
 	#include "Font Control.h"
 	#include "render dirty.h"
 	#include "utilities.h"

Tactical/Interface Utils.cpp

@@ -3,14 +3,12 @@
 #else
 	#include "builddefines.h"
 	#include <stdio.h>
-	#include <stdarg.h>
 	#include "sgp.h"
 	#include "himage.h"
 	#include "vobject.h"
 	#include "interface utils.h"
 	#include "render dirty.h"
 	#include "interface.h"
-	#include "interface control.h"
 	#include "sysutil.h"
 	#include "faces.h"
 	#include "render dirty.h"

Tactical/Items.cpp

@@ -4,17 +4,14 @@
 	#include "items.h"
 	#include "Action Items.h"
 	#include "weapons.h"
-	#include "Interface Cursors.h"
 	#include "Soldier Control.h"
 	#include "overhead.h"
 	#include "Handle UI.h"
 	#include "Animation Control.h"
 	#include "points.h"
 	#include "Sound Control.h"
-	#include "Sys globals.h"
 	#include "Isometric Utils.h"
 	#include "Animation Data.h"
-	#include "worldman.h"
 	#include "Random.h"
 	#include "Campaign.h"
 	#include "interface.h"
@@ -33,17 +30,14 @@
 	#include "fov.h"
 	#include "MessageBoxScreen.h"
 
-	#include "PathAIDebug.h"
 	#include "Interface Control.h"
 	#include "ShopKeeper Interface.h"
-	#include "Cursors.h"
 
 	#include "GameSettings.h"
 	#include "environment.h"
 	#include "Auto Resolve.h"
 	#include "Interface Items.h"
 	#include "Campaign Types.h"
-	#include "history.h"
 	#include "Game Clock.h"
 	#include "strategicmap.h"
 	#include "Inventory Choosing.h"

Tactical/Ja25_Tactical.cpp

@@ -2,48 +2,32 @@
 	#include "Tactical All.h"
 #else
 	#include "items.h"
-	#include "Action Items.h"
 	#include "weapons.h"
-	#include "Interface Cursors.h"
 	#include "Soldier Control.h"
 	#include "overhead.h"
 	#include "Handle UI.h"
 	#include "Animation Control.h"
-	#include "points.h"
-	#include "Sound Control.h"
-	#include "Sys globals.h"
 	#include "Isometric Utils.h"
 	#include "Animation Data.h"
-	#include "worldman.h"
 	#include "Random.h"
 	#include "Campaign.h"
 	#include "interface.h"
-	#include "interface panels.h"
-	#include "explosion control.h"
 	#include "Keys.h"
 
-	#include "wcheck.h"
 	#include "soldier profile.h"
 	#include "SkillCheck.h"
 	#include "los.h"
 	#include "message.h"
 	#include "text.h"
 
-	#include "fov.h"
 	#include "MessageBoxScreen.h"
 
-	#include "PathAIDebug.h"
-	#include "Interface Control.h"
 	#include "ShopKeeper Interface.h"
-	#include "Cursors.h"
 
 	#include "GameSettings.h"
-	#include "environment.h"
 	#include "Auto Resolve.h"
 	#include "Interface Items.h"
 	#include "Campaign Types.h"
-	#include "history.h"
-	#include "Game Clock.h"
 	#include "strategicmap.h"
 	#include "Inventory Choosing.h"
 	#include "Soldier macros.h"
@@ -55,7 +39,9 @@
 #endif
 
 #ifdef JA2UB
-
+#include "worldman.h"
+#include "Game Clock.h"
+#include "Sound Control.h"
 #include "Ja25 Strategic Ai.h"
 #include "MapScreen Quotes.h"
 #include "Ja25_Tactical.h"
@@ -1962,4 +1948,4 @@ void HandleOpenControlPanelToRevealSwitchInMorrisArea()
 		}
 	}
 }
-#endif
+#endif

Tactical/Map Information.cpp

@@ -9,15 +9,12 @@
 	#include "Soldier Init List.h"
 	#include "Random.h"
 	#include "worlddef.h"
-	#include "worldman.h"
 	#include "renderworld.h"
 	#include "EditorMercs.h"
 	#include "Exit Grids.h"
 	#include "Isometric Utils.h"
-	#include "ja2.h"
 	#include "Animation Data.h"
 	#include "Road Smoothing.h"
-	#include "sys globals.h"
 	#include "message.h"
 	#include "weapons.h"
 	#include "environment.h"

Tactical/Merc Entering.cpp

@@ -4,7 +4,6 @@
 	#include "builddefines.h"
 	#include <stdio.h>
 	#include <string.h>
-	#include "wcheck.h"
 	#include "stdlib.h"
 	#include "debug.h"
 	//#include "soldier control.h"
@@ -13,7 +12,6 @@
 	#include "weapons.h"
 	#include "handle items.h"
 	#include "worlddef.h"
-	#include "worldman.h"
 	#include "rotting corpses.h"
 	#include "tile cache.h"
 	#include "isometric utils.h"
@@ -30,7 +28,6 @@
 	#include "Handle UI.h"
 	#include "squads.h"
 	#include "english.h"
-	#include "cursors.h"
 	#include "cursor control.h"
 	#include "Merc Hiring.h"
 	#include "Font Control.h"

Tactical/Merc Hiring.cpp

@@ -5,12 +5,10 @@
 	#include "builddefines.h"
 	#include <stdio.h>
 	#include <string.h>
-	#include "wcheck.h"
 	#include "stdlib.h"
 	#include "debug.h"
 	#include "math.h"
 	#include "worlddef.h"
-	#include "worldman.h"
 	#include "renderworld.h"
 	#include "Assignments.h"
 
@@ -18,18 +16,13 @@
 	#include "Animation Data.h"
 	#include "Isometric Utils.h"
 	#include "Event Pump.h"
-	#include "Timer Control.h"
 	#include "Render Fun.h"
-	#include "Render Dirty.h"
-	#include "mousesystem.h"
 	#include "interface.h"
 	#include "sysutil.h"
 	#include "FileMan.h"
-	#include "points.h"
 	#include "Random.h"
 	#include "ai.h"
 	#include "Interactive Tiles.h"
-	#include "soldier ani.h"
 	#include "english.h"
 	#include "overhead.h"
 	#include "Soldier Profile.h"

Tactical/Overhead.cpp

@@ -39,7 +39,6 @@
 #include "lighting.h"
 #include "pathai.h"
 #include "screenids.h"
-#include "interface cursors.h"
 #include "weapons.h"
 #include "rotting corpses.h"
 #include "lighting.h"
@@ -51,7 +50,6 @@
 #include "Soldier Profile.h"
 #include "fov.h"
 #include "Soldier macros.h"
-#include "EditorMercs.h"
 #include "soldier tile.h"
 #ifdef  NETWORKED
 #include "Networking.h"
@@ -94,8 +92,6 @@
 #include "Map Screen Helicopter.h"
 #include "interface control.h"
 #include "exit grids.h"
-#include "fade screen.h"
-#include "Game Init.h"
 #include "jascreens.h"
 #include "strategic.h"
 #include "arms dealer init.h"

Tactical/PATHAI.cpp

@@ -13,7 +13,6 @@
 #else
 	#include <stdio.h>
 	#include <string.h>
-	#include "wcheck.h"
 	#include "stdlib.h"
 	#include "debug.h"
 	#include "MemMan.h"
@@ -32,7 +31,6 @@
 	#include "worldman.h"
 //	#include "renderworld.h"
 	#include "pathai.h"
-	#include "PathAIDebug.h"
 	#include "Points.h"
 	#include "ai.h"
 	#include "Random.h"
@@ -44,7 +42,6 @@
 	#include "soldier profile.h" // added by SANDRO
 #endif
 #include "connect.h"
-#include "PathAIDebug.h"
 
 #include "LOS.h"  //ddd
 

Tactical/Rain.cpp

@@ -5,13 +5,10 @@
 	//#include "soldier control.h"
 	#include "overhead.h"
 	#include "animation control.h"
-	#include "points.h"
-	#include "opplist.h"
 	#include "timer.h"
 	#include "event pump.h"
 //	#include "Sound Control.h"
 	#include "interface.h"
-	#include "Isometric Utils.h"
 	#include "Font Control.H"
 	#include "ai.h"
 	#include "interface.h"
@@ -19,22 +16,14 @@
 	#include "text.h"
 	#include "TeamTurns.h"
 	#include "Smell.h"
-	#include "game clock.h"
 	#include "Soldier Functions.h"
 	#include "cursors.h"
 	#include "Queen Command.h"
-	#include "Pathai.h"
-	#include "Music Control.h"
-	#include "Strategic Turns.h"
 	#include "lighting.h"
 	#include "environment.h"
-	#include "Explosion Control.h"
 	#include "dialogue control.h"
 	#include "Soldier Profile Type.h"
-	#include "SmokeEffects.h"
-	#include "lighteffects.h"
 	#include "air raid.h"
-	#include "meanwhile.h"
 	#include "SkillCheck.h"
 	#include "AIInternals.h"
 	#include "AIList.h"

Tactical/Real Time Input.cpp

@@ -3,7 +3,6 @@
 #else
 #include <stdio.h>
 #include <string.h>
-#include "wcheck.h"
 #include "stdlib.h"
 #include "debug.h"
 #include "math.h"
@@ -14,7 +13,6 @@
 #include "Animation Data.h"
 #include "Event Pump.h"
 #include "Timer Control.h"
-#include "cursors.h"
 #include "Handle UI.h"
 #include "Isometric Utils.h"
 #include "input.h"
@@ -23,20 +21,12 @@
 #include "screenids.h"
 #include "interface.h"
 #include "cursor control.h"
-#include "points.h"
 #include "Interactive Tiles.h"
-#include "interface cursors.h"
-#include "Sound Control.h"
-#include "environment.h"
-#include "opplist.h"
 #include "spread burst.h"
-#include "overhead map.h"
 #include "world items.h"
-#include "Game Clock.h"
 #include "interface items.h"
 #include "physics.h"
 #include "ui cursors.h"
-#include "worldman.h"
 #include "strategicmap.h"
 #include "soldier profile.h"
 #include "soldier create.h"
@@ -46,10 +36,7 @@
 #include "interactive tiles.h"
 #include "messageboxscreen.h"
 #include "gameloop.h"
-#include "gamescreen.h"
 #include "spread burst.h"
-#include "tile animation.h"
-#include "merc entering.h"
 #include "explosion control.h"
 #include "message.h"
 #include "Strategic Exit GUI.h"
@@ -1962,4 +1949,4 @@ void QueryRTX2Button( UINT32 *puiNewEvent  )
 		}
 		
 	}
-}
+}

Tactical/ShopKeeper Interface.cpp

@@ -6,7 +6,6 @@
 	#include "Utilities.h"
 	#include "Game Clock.h"
 	#include "Render Dirty.h"
-	#include "wCheck.h"
 	#include "Font Control.h"
 	#include "WordWrap.h"
 	#include "Text Input.h"
@@ -54,7 +53,6 @@
 	#include "PATHAI.h"
 	#include "Points.h"
 	#include "InterfaceItemImages.h"
-	#include "Interface Enhanced.h"
 #endif
 
 #ifdef JA2UB

Tactical/Soldier Ani.cpp

@@ -3,7 +3,6 @@
 #else
 #include <stdio.h>
 #include <string.h>
-#include "wcheck.h"
 #include "stdlib.h"
 #include "debug.h"
 #include "MemMan.h"

Tactical/Soldier Control.cpp

@@ -21,12 +21,9 @@
 #include "Random.h"
 #include "worldman.h"
 #include "Isometric Utils.h"
-#include "Render Dirty.h"
 #include "renderworld.h"
-#include "sys globals.h"
 #include "video.h"
 #include "points.h"
-#include "Win util.h"
 #include "Sound Control.h"
 #include "weapons.h"
 #include "vobject_blitters.h"
@@ -40,7 +37,6 @@
 #include "faces.h"
 #include "Soldier Profile.h"
 #include "gap.h"
-#include "interface panels.h"
 #include "campaign.h"
 #include "soldier macros.h"
 #include "english.h"
@@ -62,7 +58,6 @@
 #include "soldier functions.h"
 #include "rt time defines.h"
 #include "Exit Grids.h"
-#include "gamescreen.h"
 #include "Quests.h"
 #include "message.h"
 #include "NPC.h"
@@ -73,7 +68,6 @@
 #include	"GameSettings.h"
 #include "tile animation.h"
 #include "ShopKeeper Interface.h"
-#include "Arms Dealer Init.h"
 #include "vehicles.h"
 #include "rotting corpses.h"
 #include "Interface Control.h"

Tactical/Soldier Create.cpp

@@ -14,14 +14,12 @@
 	#include "overhead types.h"
 	#include "faces.h"
 	#include "isometric utils.h"
-	#include "worldman.h"
 	#include "items.h"
 	#include "weapons.h"
 	#include "opplist.h"
 	#include "random.h"
 	#include "Assignments.h"
 	#include "Soldier Init List.h"
-	#include "EditorMercs.h"
 	#include "Smell.h"
 	#include "Squads.h"
 	#include "Interface Panels.h"

Tactical/Soldier Find.cpp

@@ -3,7 +3,6 @@
 #else
 	#include <stdio.h>
 	#include <string.h>
-	#include "wcheck.h"
 	#include "stdlib.h"
 	#include "debug.h"
 	#include "math.h"
@@ -16,38 +15,29 @@
 	#include "Animation Data.h"
 	#include "Isometric Utils.h"
 	#include "Event Pump.h"
-	#include "Timer Control.h"
 	#include "Render Fun.h"
-	#include "Render Dirty.h"
 	#include "mousesystem.h"
 	#include "interface.h"
 	#include "sysutil.h"
 	#include "FileMan.h"
-	#include "points.h"
 	#include "Random.h"
 	#include "ai.h"
 	#include "Interactive Tiles.h"
-	#include "soldier ani.h"
 	#include "english.h"
 	#include "overhead.h"
-	#include "opplist.h"
 	//#include "Sound Control.h"
-	#include "Font Control.h"
 	#include "lighting.h"
 	#include "pathai.h"
 	#include "screenids.h"
-	#include "interface cursors.h"
 	#include "weapons.h"
 	#include "lighting.h"
 	#include "Handle UI Plan.h"
 	#include "structure.h"
-	#include "interface panels.h"
 	#include "message.h"
 	#include "items.h"
 	#include "Soldier Profile.h"
 	#include "fov.h"
 	#include "Soldier macros.h"
-	#include "EditorMercs.h"
 	#include "soldier tile.h"
 	#include "soldier find.h"
 	#include "Vehicles.h"

Tactical/Soldier Init List.cpp

@@ -19,7 +19,6 @@
 #include "items.h"
 #include "GameSettings.h"
 
-#include "cursors.h"
 
 #include "Map Information.h"
 #include "soldier profile.h"
@@ -2853,4 +2852,4 @@ void SectorAddPrisonersofWar( INT16 sMapX, INT16 sMapY, INT16 sMapZ )
 		else
 			break;
 	}
-}
+}

Tactical/Soldier Profile.cpp

@@ -3,12 +3,10 @@
 #else
 	#include <stdio.h>
 	#include <string.h>
-	#include "wcheck.h"
 	#include "stdlib.h"
 	#include "debug.h"
 	#include "math.h"
 	#include "worlddef.h"
-	#include "worldman.h"
 	#include "renderworld.h"
 
 
@@ -16,14 +14,10 @@
 	#include "Animation Data.h"
 	#include "Isometric Utils.h"
 	#include "Event Pump.h"
-	#include "Timer Control.h"
 	#include "Render Fun.h"
-	#include "Render Dirty.h"
-	#include "mousesystem.h"
 	#include "interface.h"
 	#include "sysutil.h"
 	#include "FileMan.h"
-	#include "points.h"
 	#include "Random.h"
 	#include "ai.h"
 	#include "Interactive Tiles.h"
@@ -2718,4 +2712,4 @@ INT8 ProfileHasSkillTrait( INT32 ubProfileID, INT8 bSkillTrait )
 		else
 			return ( bNumTraits );
 	}
-}
+}

Tactical/Soldier Tile.cpp

@@ -4,7 +4,6 @@
 	#include <wchar.h>
 	#include <stdio.h>
 	#include <string.h>
-	#include "wcheck.h"
 	#include "Render Fun.h"
 	#include "stdlib.h"
 	#include "debug.h"
@@ -15,23 +14,18 @@
 	#include "Animation Data.h"
 	#include "Animation Control.h"
 	#include "container.h"
-	#include <math.h>
 	#include "pathai.h"
 	#include "Random.h"
 	#include "worldman.h"
 	#include "Isometric Utils.h"
-	#include "Render Dirty.h"
 	#include "renderworld.h"
-	#include "sys globals.h"
 	#include "video.h"
 	#include "points.h"
-	#include "Win util.h"
 //	#include "Sound Control.h"
 	#include "lighting.h"
 	#include "weapons.h"
 	#include "vobject_blitters.h"
 	#include "Handle UI.h"
-	#include "soldier ani.h"
 	#include "Event pump.h"
 	#include "opplist.h"
 	#include "ai.h"
@@ -39,16 +33,12 @@
 	#include "lighting.h"
 	#include "faces.h"
 	#include "Soldier Profile.h"
-	#include "gap.h"
-	#include "interface panels.h"
-	#include "campaign.h"
 
 	#ifdef NETWORKED
 	#include "Networking.h"
 	#include "NetworkEvent.h"
 	#endif
 
-	#include "structure wrap.h"
 	#include "items.h"
 	#include "Soundman.h"
 	#include "soldier tile.h"

Tactical/Spread Burst.cpp

@@ -3,13 +3,11 @@
 #else
 	#include <stdio.h>
 	#include <string.h>
-	#include "wcheck.h"
 	#include "stdlib.h"
 	#include "debug.h"
 	//#include "soldier control.h"
 	#include "weapons.h"
 	#include "cursor control.h"
-	#include "cursors.h"
 	#include "soldier find.h"
 	#include "isometric utils.h"
 	#include "renderworld.h"

Tactical/Squads.cpp

@@ -9,7 +9,6 @@
 	#include "Strategic Movement.h"
 	#include "Assignments.h"
 	#include "OverHead.h"
-	#include "RenderWorld.h"
 	#include "Interface.h"
 	#include "Vehicles.h"
 	#include "Map Screen Helicopter.h"

Tactical/Strategic Exit GUI.cpp

@@ -11,7 +11,6 @@
 	#include "gamescreen.h"
 	#include "strategicmap.h"
 	#include "Game Clock.h"
-	#include "Music Control.h"
 	#include "sysutil.h"
 	#include "Font Control.h"
 	#include "text.h"

Tactical/Structure Wrap.cpp

@@ -3,7 +3,6 @@
 #else
 	#include <stdio.h>
 	#include "debug.h"
-	#include "wcheck.h"
 	#include "worlddef.h"
 	#include "worldman.h"
 	#include "structure wrap.h"
@@ -664,4 +663,4 @@ BOOLEAN SetOpenableStructureToClosed( INT32 sGridNo, UINT8 ubLevel )
 	}
 	// else leave it as is!
 	return( TRUE );
-}
+}

Tactical/Tactical Turns.cpp

@@ -4,22 +4,18 @@
 	#include "sgp.h"
 	#include "Game Clock.h"
 	#include "Font Control.h"
-	#include "render dirty.h"
 	#include "Timer Control.h"
 	#include "overhead.h"
-	#include "environment.h"
 	#include "Game Clock.h"
 	#include "message.h"
 	#include "worlddef.h"
 	#include "rotting corpses.h"
 	#include "soldier create.h"
 	#include "soldier add.h"
-	#include "strategic turns.h"
 	#include "isometric utils.h"
 	#include "animation data.h"
 	#include "animation control.h"
 	#include "Tactical Turns.h"
-	#include "points.h"
 	#include "smell.h"
 	#include "opplist.h"
 	#include "Queen Command.h"

Tactical/TeamTurns.cpp

@@ -23,8 +23,6 @@
 	#include "cursors.h"
 	#include "Queen Command.h"
 	#include "Pathai.h"
-	#include "Music Control.h"
-	#include "Strategic Turns.h"
 	#include "lighting.h"
 	#include "environment.h"
 	#include "Explosion Control.h"

Tactical/Turn Based Input.cpp

@@ -10,7 +10,6 @@
 #include "builddefines.h"
 #include <stdio.h>
 #include <string.h>
-#include "wcheck.h"
 #include "stdlib.h"
 #include "debug.h"
 #include "math.h"
@@ -21,7 +20,6 @@
 #include "Animation Data.h"
 #include "Event Pump.h"
 #include "Timer Control.h"
-#include "cursors.h"
 #include "Handle UI.h"
 #include "Isometric Utils.h"
 #include "input.h"
@@ -65,16 +63,13 @@
 #include "interactive tiles.h"
 #include "messageboxscreen.h"
 #include "gameloop.h"
-#include "gamescreen.h"
+
 #include "spread burst.h"
-#include "tile animation.h"
-#include "merc entering.h"
 #include "explosion control.h"
 #include "QuestDebug.h"
 #include "assignments.h"
 #include "EditScreen.h"
 #include "SaveLoadGame.h"
-#include "Structure Wrap.h"
 #include "los.h"
 #include "Exit Grids.h"
 #include "Strategic Exit GUI.h"
@@ -96,7 +91,6 @@
 #include "ShopKeeper Interface.h"
 #include "GameSettings.h"
 #include "vehicles.h"
-#include "GameVersion.h"
 #include "SaveLoadScreen.h"
 #include "Air raid.h"
 #include "meanwhile.h"

Tactical/Vehicles.cpp

@@ -17,7 +17,6 @@
 	#include "interface panels.h"
 	#include "strategic.h"
 	#include "worlddef.h"
-	#include "tile animation.h"
 	#include "Isometric Utils.h"
 	#include "Mapscreen.h"
 	#include "message.h"

Tactical/Weapons.cpp

@@ -9,7 +9,6 @@
 	#include "Event Pump.h"
 	#include "weapons.h"
 	#include "Animation Control.h"
-	#include "sys globals.h"
 	#include "Handle UI.h"
 	#include "Isometric Utils.h"
 	#include "worldman.h"

Tactical/World Items.cpp

@@ -5,15 +5,12 @@
 	#include "handle Items.h"
 	#include "overhead.h"
 	#include "weapons.h"
-	#include "points.h"
 	#include "tiledef.h"
 	#include "worlddef.h"
-	#include "worldman.h"
 	#include "interface.h"
 	#include "renderworld.h"
 	#include "Animation Control.h"
 	#include "font control.h"
-	#include "render dirty.h"
 	#include "World items.h"
 	#include "debug.h"
 	#include "Isometric utils.h"

Tactical/XML_BurstSounds.cpp

@@ -9,23 +9,18 @@
 	#include "Event Pump.h"
 	#include "weapons.h"
 	#include "Animation Control.h"
-	#include "sys globals.h"
 	#include "Handle UI.h"
 	#include "Isometric Utils.h"
-	#include "worldman.h"
 	#include "math.h"
-	#include "points.h"
 	#include "ai.h"
 	#include "los.h"
 	#include "renderworld.h"
-	#include "opplist.h"
 	#include "interface.h"
 	#include "message.h"
 	#include "campaign.h"
 	#include "items.h"
 	#include "text.h"
 	#include "Soldier Profile.h"
-	#include "tile animation.h"
 	#include "Dialogue Control.h"
 	#include "SkillCheck.h"
 	#include "explosion control.h"
@@ -35,7 +30,6 @@
 	#include "Vehicles.h"
 	#include "bullets.h"
 	#include "morale.h"
-	#include "meanwhile.h"
 	#include "SkillCheck.h"
 	#include "gamesettings.h"
 	#include "SaveLoadMap.h"

Tactical/XML_CivGroupNames.cpp

@@ -6,7 +6,6 @@
 	#include "expat.h"
 	#include "XML.h"
 	#include "Interface.h"
-	#include "EditorMercs.h"
 #endif
 
 struct
@@ -203,4 +202,4 @@ BOOLEAN ReadInCivGroupNamesStats( STR fileName, BOOLEAN localizedVersion)
 
 
 	return( TRUE );
-}
+}

Tactical/XML_EnemyWeaponDrops.cpp

@@ -7,33 +7,26 @@
 	#include "Event Pump.h"
 	#include "weapons.h"
 	#include "Animation Control.h"
-	#include "sys globals.h"
 	#include "Handle UI.h"
 	#include "Isometric Utils.h"
-	#include "worldman.h"
 	#include "math.h"
-	#include "points.h"
 	#include "ai.h"
 	#include "los.h"
 	#include "renderworld.h"
-	#include "opplist.h"
 	#include "interface.h"
 	#include "message.h"
 	#include "campaign.h"
 	#include "items.h"
 	#include "text.h"
 	#include "Soldier Profile.h"
-	#include "tile animation.h"
 	#include "Dialogue Control.h"
 	#include "SkillCheck.h"
-	#include "explosion control.h"
 	#include "Quests.h"
 	#include "Physics.h"
 	#include "Random.h"
 	#include "Vehicles.h"
 	#include "bullets.h"
 	#include "morale.h"
-	#include "meanwhile.h"
 	#include "SkillCheck.h"
 	#include "gamesettings.h"
 	#include "SaveLoadMap.h"

Tactical/XML_SpreadPatterns.cpp

@@ -4,22 +4,17 @@
 #else
 	#include "sgp.h"
 	#include "overhead types.h"
-	#include "Sound Control.h"
 	#include "Soldier Control.h"
 	#include "overhead.h"
 	#include "Event Pump.h"
 	#include "weapons.h"
 	#include "Animation Control.h"
-	#include "sys globals.h"
 	#include "Handle UI.h"
 	#include "Isometric Utils.h"
-	#include "worldman.h"
 	#include "math.h"
-	#include "points.h"
 	#include "ai.h"
 	#include "los.h"
 	#include "renderworld.h"
-	#include "opplist.h"
 	#include "interface.h"
 	#include "message.h"
 	#include "campaign.h"
@@ -27,17 +22,14 @@
 	#include "weapons.h"
 	#include "text.h"
 	#include "Soldier Profile.h"
-	#include "tile animation.h"
 	#include "Dialogue Control.h"
 	#include "SkillCheck.h"
-	#include "explosion control.h"
 	#include "Quests.h"
 	#include "Physics.h"
 	#include "Random.h"
 	#include "Vehicles.h"
 	#include "bullets.h"
 	#include "morale.h"
-	#include "meanwhile.h"
 	#include "SkillCheck.h"
 	#include "gamesettings.h"
 	#include "SaveLoadMap.h"

Tactical/bullets.cpp

@@ -9,7 +9,6 @@
 	#include "worlddef.h"
 	#include "renderworld.h"
 	#include "vsurface.h"
-	#include "Render Dirty.h"
 	#include "sysutil.h"
 	#include "container.h"
 	#include "wcheck.h"
@@ -18,7 +17,6 @@
 	#include "faces.h"
 	#include "utilities.h"
 	#include "overhead.h"
-	#include "gap.h"
 	#include "Soldier Profile.h"
 	#include "Bullets.h"
 	#include "los.h"

Tactical/opplist.cpp

@@ -12,14 +12,12 @@
 	#include "opplist.h"
 	#include "ai.h"
 	#include "font control.h"
-	#include "sys globals.h"
 	#include "Animation COntrol.h"
 	#include "los.h"
 	#include "fov.h"
 	#include "dialogue control.h"
 	#include "lighting.h"
 	#include "environment.h"
-	#include "Points.h"
 	#include "interface dialogue.h"
 	#include "message.h"
 	#include "soldier profile.h"