diff --git a/Ja2/SaveLoadGame.cpp b/Ja2/SaveLoadGame.cpp
index 41b2bb16..b486e84e 100644
--- a/Ja2/SaveLoadGame.cpp
+++ b/Ja2/SaveLoadGame.cpp
@@ -108,6 +108,7 @@
 #include "connect.h"
 #include "Map Screen Interface Map Inventory.h"//dnl ch51 081009
 #include "Ambient Control.h"		// added by Flugente for HandleNewSectorAmbience(...)
+#include "WorldDat.h"
 /////////////////////////////////////////////////////
 //
 // Local Defines
diff --git a/Multiplayer/fresh_header.h b/Multiplayer/fresh_header.h
index 913bb035..a7f117c8 100644
--- a/Multiplayer/fresh_header.h
+++ b/Multiplayer/fresh_header.h
@@ -1,5 +1,5 @@
 #pragma once
-
+#include "Event Pump.h"
 //time for a new header :)
 extern int readyteamreg[10];
 
diff --git a/Tactical/Air Raid.cpp b/Tactical/Air Raid.cpp
index 6aa45bbf..0723d144 100644
--- a/Tactical/Air Raid.cpp	
+++ b/Tactical/Air Raid.cpp	
@@ -20,11 +20,9 @@
 	#include "Explosion Control.h"
 	#include "Interface.h"
 	#include "Music Control.h"
-	#include "Campaign Types.h"
 	#include "GameSettings.h"
 	#include "Text.h"
 	#include "Morale.h"
-	#include "Map Screen Helicopter.h"
 	#include "Structure Wrap.h"
 	#include "Meanwhile.h"
 
diff --git a/Tactical/Animation Cache.cpp b/Tactical/Animation Cache.cpp
index 97ca7a87..149b3cf9 100644
--- a/Tactical/Animation Cache.cpp	
+++ b/Tactical/Animation Cache.cpp	
@@ -1,9 +1,5 @@
-	#include <stdio.h>
-	#include <string.h>
-
 	#include "types.h"
 	#include "WCheck.h"
-	#include "stdlib.h"
 	#include "DEBUG.H"
 	#include "Animation Cache.h"
 	#include "Animation Data.h"
diff --git a/Tactical/Animation Data.cpp b/Tactical/Animation Data.cpp
index 8ea653ad..cdd205f9 100644
--- a/Tactical/Animation Data.cpp	
+++ b/Tactical/Animation Data.cpp	
@@ -2,12 +2,9 @@
 	#include <stdio.h>
 	#include <string.h>
 	#include "WCheck.h"
-	#include "stdlib.h"
 	#include "DEBUG.H"
 	#include "Animation Data.h"
 	#include "Animation Control.h"
-
-	#include "jascreens.h"
 	#include "tiledef.h"
 	#include "Sys Globals.h"
 	#include "Debug Control.h"
diff --git a/Tactical/Arms Dealer Init.cpp b/Tactical/Arms Dealer Init.cpp
index 7d763729..4793cfe8 100644
--- a/Tactical/Arms Dealer Init.cpp	
+++ b/Tactical/Arms Dealer Init.cpp	
@@ -15,12 +15,8 @@
 	#include "LuaInitNPCs.h"	// added by Flugente
 
 #ifdef JA2UB
-#include "Explosion Control.h"
 #include "Ja25_Tactical.h"
 #include "Ja25 Strategic Ai.h"
-#include "MapScreen Quotes.h"
-#include "email.h"
-#include "interface Dialogue.h"
 #include "ub_config.h"
 #endif
 
diff --git a/Tactical/ArmsDealerInvInit.cpp b/Tactical/ArmsDealerInvInit.cpp
index debb1b57..c679326c 100644
--- a/Tactical/ArmsDealerInvInit.cpp
+++ b/Tactical/ArmsDealerInvInit.cpp
@@ -1,6 +1,5 @@
 	#include "types.h"
 	#include "ArmsDealerInvInit.h"
-	//#include "Item Types.h"
 	#include "Arms Dealer Init.h"
 	#include "DEBUG.H"
 	#include "Weapons.h"
diff --git a/Tactical/Campaign.cpp b/Tactical/Campaign.cpp
index 2a8fd9bb..4c71810f 100644
--- a/Tactical/Campaign.cpp
+++ b/Tactical/Campaign.cpp
@@ -1,6 +1,5 @@
 	#include "builddefines.h"
 	#include <stdio.h>
-	#include "stdlib.h"
 	#include "DEBUG.H"
 	#include "Overhead Types.h"
 
@@ -31,22 +30,16 @@
 	#include "Strategic AI.h"
 	#include "interface Dialogue.h"
 	#include "DynamicDialogue.h"
+#include "email.h"
+#include "mercs.h"
 
 #ifdef JA2UB
-#include "Explosion Control.h"
-#include "Ja25_Tactical.h"
 #include "Ja25 Strategic Ai.h"
-#include "MapScreen Quotes.h"
-#include "email.h"
-#include "interface Dialogue.h"
-#include "mercs.h"
 #include "ub_config.h"
 #endif
 
 #include "GameInitOptionsScreen.h"
 
-#include "email.h"
-#include "mercs.h"
 
 
 //forward declarations of common classes to eliminate includes
diff --git a/Tactical/Civ Quotes.cpp b/Tactical/Civ Quotes.cpp
index bd36f7fe..7ae3609d 100644
--- a/Tactical/Civ Quotes.cpp	
+++ b/Tactical/Civ Quotes.cpp	
@@ -8,13 +8,11 @@
 #include "FileMan.h"
 #include "Encrypted File.h"
 #include "MessageBoxScreen.h"
-#include "Queen Command.h"
 #include "Overhead.h"
 #include "Render Dirty.h"
 #include "MercTextBox.h"
 #include "ai.h"
 #include "Text.h"
-#include "screenids.h"
 #include "Animation Data.h"
 #include "video.h"
 #include "Font Control.h"
diff --git a/Tactical/Dialogue Control.cpp b/Tactical/Dialogue Control.cpp
index 43ff683f..e88ccdbb 100644
--- a/Tactical/Dialogue Control.cpp	
+++ b/Tactical/Dialogue Control.cpp	
@@ -34,8 +34,6 @@
 	#include "Map Screen Interface.h"
 	#include "Text.h"
 	#include "Merc Contract.h"
-	#include "Town Militia.h"
-	#include "Meanwhile.h"
 	#include "SkillCheck.h"
 	#include "Interface Control.h"
 	#include "Civ Quotes.h"
@@ -52,9 +50,15 @@
 #include <queue>
 
 #include "connect.h"
+
+#ifndef JA2UB
+#include "Town Militia.h"
+#include "Meanwhile.h"
+#endif // !JA2UB
+
+
 #ifdef JA2UB
 #include "Intro.h"
-#include "MapScreen Quotes.h"
 #include "Ja25 Strategic Ai.h"
 #include "Ja25_Tactical.h"
 #include "Animation Control.h"
diff --git a/Tactical/Disease.cpp b/Tactical/Disease.cpp
index aca2c382..ece056f7 100644
--- a/Tactical/Disease.cpp
+++ b/Tactical/Disease.cpp
@@ -8,7 +8,8 @@
 #include "Overhead.h"
 #include "random.h"
 #include "Assignments.h"
-#include "Soldier Profile.h"
+#include <mapscreen.h>
+#include "soldier profile type.h"
 #include "Queen Command.h"
 #include "Quests.h"
 #include "finances.h"
diff --git a/Tactical/Drugs And Alcohol.cpp b/Tactical/Drugs And Alcohol.cpp
index 4da1742b..8209556e 100644
--- a/Tactical/Drugs And Alcohol.cpp	
+++ b/Tactical/Drugs And Alcohol.cpp	
@@ -3,16 +3,13 @@
 	#include "Soldier Profile.h"
 	#include "Drugs And Alcohol.h"
 	#include "Items.h"
-	#include "Morale.h"
 	#include "Points.h"
 	#include "message.h"
 	#include "GameSettings.h" // SANDRO - had to add this, dammit!
 	#include "random.h"
 	#include "Text.h"
 	#include "Interface.h"
-	#include "Food.h"			// added by Flugente
-	#include "Animation Data.h"	// added by Flugente for SoldierBodyTypes
-	#include "CampaignStats.h"	// added by Flugente
+	#include "Overhead.h"
 	#include "DynamicDialogue.h"// added by Flugente
 
 //forward declarations of common classes to eliminate includes
diff --git a/Tactical/DynamicDialogue.cpp b/Tactical/DynamicDialogue.cpp
index 62af182d..3120959d 100644
--- a/Tactical/DynamicDialogue.cpp
+++ b/Tactical/DynamicDialogue.cpp
@@ -10,8 +10,6 @@
 #include "SaveLoadGame.h"
 #include "GameVersion.h"
 #include "Text.h"
-#include "MercTextBox.h"
-#include "Meanwhile.h"
 #include "soldier profile type.h"
 #include "Soldier Profile.h"
 #include "Interface.h"
@@ -30,6 +28,11 @@
 #include "Campaign.h"
 #include "Points.h"
 
+#ifndef JA2UB
+#include "Meanwhile.h"
+#endif // !JA2UB
+
+
 // event id counter
 // has to be saved/loaded/reset
 UINT32 gDynamicDialogueEventCounter = 0;
diff --git a/Tactical/End Game.cpp b/Tactical/End Game.cpp
index 6ce84bd7..ad509af7 100644
--- a/Tactical/End Game.cpp	
+++ b/Tactical/End Game.cpp	
@@ -2,7 +2,6 @@
 	#include "Overhead.h"
 	#include "worldman.h"
 	#include "Soldier Profile.h"
-	#include "NPC.h"
 	#include "Dialogue Control.h"
 	#include "End Game.h"
 	#include "Intro.h"
@@ -13,23 +12,26 @@
 	#include "Sound Control.h"
 	#include "renderworld.h"
 	#include "Isometric Utils.h"
-	#include "Music Control.h"
 	#include "Soldier macros.h"
-	#include "qarray.h"
-	#include "LOS.h"
-	#include "Strategic AI.h"
-	#include "Squads.h"
-	#include "PreBattle Interface.h"
 	#include "Strategic Movement.h"
-	#include "strategic.h"
-	#include "Morale.h"
-	#include "Queen Command.h"
-	#include "Strategic Town Loyalty.h"
-	#include "Player Command.h"
-	#include "Campaign Types.h"
-	#include "Tactical Save.h"
 	#include "screenids.h"
 
+#ifndef JA2UB
+#include "NPC.h"
+#include "Music Control.h"
+#include "qarray.h"
+#include "LOS.h"
+#include "Strategic AI.h"
+#include "Squads.h"
+#include "PreBattle Interface.h"
+#include "strategic.h"
+#include "Queen Command.h"
+#include "Strategic Town Loyalty.h"
+#include "Player Command.h"
+#include "Tactical Save.h"
+#endif // !JA2UB
+
+
 #ifdef JA2UB
 #include "email.h"
 #include "Game Clock.h"
diff --git a/Tactical/Enemy Soldier Save.cpp b/Tactical/Enemy Soldier Save.cpp
index e6fd9cc2..351223d3 100644
--- a/Tactical/Enemy Soldier Save.cpp	
+++ b/Tactical/Enemy Soldier Save.cpp	
@@ -1,36 +1,21 @@
 	#include "builddefines.h"
     #include "GameSettings.h"
 	#include <stdio.h>
-	#include <memory.h>
-
 	#include "types.h"
-
 	#include "strategicmap.h"
 	#include "Overhead.h"
-	#include "Isometric Utils.h"
-
-	#include "Soldier Add.h"
 	#include "Soldier Create.h"
 	#include "Soldier Init List.h"
 	#include "DEBUG.H"
 	#include "random.h"
 	#include "Items.h"
-
-
-	#include "Map Information.h"
-	#include "Soldier Profile.h"
-	#include "EditorMercs.h"
-	#include "Animation Data.h"
-	#include "message.h"
-	#include "Font Control.h"
 	#include "Campaign Types.h"
 	#include "Tactical Save.h"
 	#include "Game Clock.h"
 	#include "Queen Command.h"
-	#include "Scheduling.h"
 	#include "Soldier macros.h"		// added by Flugente
-
 #include "GameVersion.h"
+
 //ADB When a savegame is loaded, the enemy and civ stuff needs to be loaded and updated, but this can only happen
 //when the temp file is loaded which can happen much later, it cannot load convert and save when updating the savegame
 //therefore store a flag to load and convert later
diff --git a/Tactical/EnemyItemDrops.cpp b/Tactical/EnemyItemDrops.cpp
index fdda9f4a..170bd177 100644
--- a/Tactical/EnemyItemDrops.cpp
+++ b/Tactical/EnemyItemDrops.cpp
@@ -1,5 +1,3 @@
-	#include "types.h"
-	#include "DEBUG.H"
 	#include "EnemyItemDrops.h"
 
 WEAPON_DROPS gEnemyWeaponDrops[MAX_DROP_ITEMS];
diff --git a/Tactical/EnemyItemDrops.h b/Tactical/EnemyItemDrops.h
index 7b531cb4..bb57f96c 100644
--- a/Tactical/EnemyItemDrops.h
+++ b/Tactical/EnemyItemDrops.h
@@ -1,6 +1,8 @@
 #ifndef _ENEMY_ITEM_DROPS__H_
 #define	_ENEMY_ITEM_DROPS__H_
 
+#include "types.h"
+
 #define MAX_DROP_ITEMS		100
 
 typedef struct
diff --git a/Tactical/Faces.cpp b/Tactical/Faces.cpp
index 38495593..242a4dee 100644
--- a/Tactical/Faces.cpp
+++ b/Tactical/Faces.cpp
@@ -1,10 +1,7 @@
 	#include "builddefines.h"
-	#include "math.h"
 	#include <stdio.h>
-	#include <errno.h>
-
+	
 	#include "worlddef.h"
-	#include "renderworld.h"
 	#include "vsurface.h"
 	#include "Render Dirty.h"
 	#include "sysutil.h"
@@ -12,7 +9,6 @@
 	#include "video.h"
 	#include "vobject_blitters.h"
 	#include "faces.h"
-	#include "Utilities.h"
 	#include "Overhead.h"
 	#include "GAP.H"
 	#include "Soldier Profile.h"
@@ -27,21 +23,19 @@
 	#include	"GameSettings.h"
 	#include "Squads.h"
 	#include "Interface.h"
-	#include "Quests.h"
-	#include "Animation Control.h"
+	#include <strategicmap.h>
 	#include "Drugs And Alcohol.h"
 	#include "Interface Items.h"
-	#include "Meanwhile.h"
-	#include "Map Screen Interface.h"
-	// HEADROCK HAM 3.2: Added two includes so that a function can read values of the Gun Range/hospital location
 	#include "Campaign Types.h"
-	#include "Strategic Event Handler.h"
 	#include "Food.h"	// added by Flugente
 	#include "Queen Command.h"		// added by Flugente for FindUnderGroundSector(...)
 	#include "strategic.h"			// added by Flugente
 
 #ifdef JA2UB
 #include "Ja25_Tactical.h"
+#else
+#include "Meanwhile.h"
+#include "Map Screen Interface.h"
 #endif
 
 // Defines
diff --git a/Tactical/Food.cpp b/Tactical/Food.cpp
index acf9f92a..5feeb57d 100644
--- a/Tactical/Food.cpp
+++ b/Tactical/Food.cpp
@@ -1,4 +1,3 @@
-	#include <math.h>
 	#include "sgp.h"
 	#include "Soldier Profile.h"
 	#include "Food.h"
@@ -14,11 +13,9 @@
 	#include "Sound Control.h"
 	#include "Assignments.h"
 	#include "Overhead.h"
-	#include "Isometric Utils.h"
 	#include "Campaign Types.h"
 	#include "Drugs And Alcohol.h"
 	#include "environment.h"
-	#include "WorldDat.h"
 	#include "Facilities.h"
 	#include "Soldier macros.h"
 	#include "strategicmap.h"
diff --git a/Tactical/GAP.cpp b/Tactical/GAP.cpp
index efb7271e..5702b677 100644
--- a/Tactical/GAP.cpp
+++ b/Tactical/GAP.cpp
@@ -1,11 +1,9 @@
-	#include "builddefines.h"
+	#include <string.h>
 	#include "DEBUG.H"
 	#include "types.h"
-	//#include "mssw.h"
 	#include "GAP.H"
 	#include "Sound Control.h"
 	#include "soundman.h"
-	#include <stdio.h>
 	#include "FileMan.h"
 
 SUBSEQUENTSOUNDS subsequentsounds;
diff --git a/Tactical/Handle Doors.cpp b/Tactical/Handle Doors.cpp
index 5a419b07..663500ba 100644
--- a/Tactical/Handle Doors.cpp	
+++ b/Tactical/Handle Doors.cpp	
@@ -1,6 +1,4 @@
-	#include "builddefines.h"
-	#include <stdio.h>
-	#include <time.h>
+	#include <wchar.h>
 	#include "sgp.h"
 	#include "worlddef.h"
 	#include "worldman.h"
@@ -29,21 +27,14 @@
 	#include "Isometric Utils.h"
 	#include "ai.h"
 	#include "Soldier macros.h"
-	#include "Event Pump.h"
 	#include "GameSettings.h"
 #include "fresh_header.h"
 #include "connect.h"
 #include <language.hpp>
 
 #ifdef JA2UB
-#include "Explosion Control.h"
 #include "Ja25_Tactical.h"
 #include "Ja25 Strategic Ai.h"
-#include "MapScreen Quotes.h"
-#include "email.h"
-#include "interface Dialogue.h"
-#include "mercs.h"
-#include "ub_config.h"
 #endif
 
 BOOLEAN gfSetPerceivedDoorState = FALSE;
diff --git a/Tactical/Handle Items.cpp b/Tactical/Handle Items.cpp
index 91ccf48e..3b841822 100644
--- a/Tactical/Handle Items.cpp	
+++ b/Tactical/Handle Items.cpp	
@@ -18,7 +18,6 @@
 	#include "Timer Control.h"
 	#include "WCheck.h"
 	#include "Interface Items.h"
-	#include "physics.h"
 	#include "Soldier Profile.h"
 	#include "interface Dialogue.h"
 	#include "Quests.h"
@@ -29,9 +28,7 @@
 	#include "ai.h"
 	#include "Soldier macros.h"
 	#include "Interface Panels.h"
-	#include "Strategic Town Loyalty.h"
 	#include "Soldier Functions.h"
-	#include "Map Screen Helicopter.h"
 	#include "PATHAI.H"
 	#include "fov.h"
 	#include "MessageBoxScreen.h"
@@ -57,9 +54,7 @@
 	#include "End Game.h"
 	#include "Interface Control.h"
 	#include "Map Screen Interface Map Inventory.h"
-	// added by SANDRO
 	#include "Morale.h"
-	// added by Flugente
 	#include "Drugs And Alcohol.h"
 	#include "Food.h"
 	// added by sevenfm - this is needed for _keydown(SHIFT) to work
@@ -75,13 +70,12 @@
 	#include "Game Clock.h"			// added by Flugente
 	#include <vfs/Core/vfs_file_raii.h>		// added by Flugente for vfs-stuff
 	#include "DynamicDialogue.h" // added by Flugente for SoldierRelation()
-	#include "MessageBoxScreen.h"	// added by Flugente
 	#include "Map Screen Interface.h"		// added by Flugente
 	#include "Map Screen Interface Map.h"	// added by Flugente
+#include "WorldDat.h"
 
 #ifdef JA2UB
 #include "Ja25_Tactical.h"
-#include "Ja25 Strategic Ai.h"
 #endif
 
 #define					NUM_ITEMS_LISTED			8
diff --git a/Tactical/Handle UI Plan.cpp b/Tactical/Handle UI Plan.cpp
index 9ee7d680..b008df3b 100644
--- a/Tactical/Handle UI Plan.cpp	
+++ b/Tactical/Handle UI Plan.cpp	
@@ -4,7 +4,6 @@
 	#include "PATHAI.H"
 	#include "Handle UI.h"
 	#include "Points.h"
-	#include "Weapons.h"
 	#include "renderworld.h"
 	#include "Animation Control.h"
 	#include "message.h"
diff --git a/Tactical/Handle UI.cpp b/Tactical/Handle UI.cpp
index 62a71e75..d073d637 100644
--- a/Tactical/Handle UI.cpp	
+++ b/Tactical/Handle UI.cpp	
@@ -1,16 +1,14 @@
 #include "connect.h"
-#include "builddefines.h"
-#include <stdio.h>
-#include <string.h>
-#include "stdlib.h"
+#include <wchar.h>
+#include <cmath>
+#include <cstdio>
+#include <vector>
 #include "DEBUG.H"
-#include "math.h"
 #include "jascreens.h"
 #include "PATHAI.H"
 #include "Soldier Control.h"
 #include "Animation Control.h"
 #include "Animation Data.h"
-#include "Event Pump.h"
 #include "Timer Control.h"
 #include "mousesystem.h"
 #include "Cursors.h"
@@ -31,39 +29,31 @@
 #include "renderworld.h"
 #include "structure.h"
 #include "Interface Panels.h"
-#include "Weapons.h"
 #include "Handle items.h"
 #include "UI Cursors.h"
 #include "Handle UI Plan.h"
 #include "message.h"
 #include "Render Fun.h"
 #include "Interface Items.h"
-#include "physics.h"
 #include "Soldier Profile.h"
 #include "strategicmap.h"
-#include "Soldier Profile.h"
 #include "Soldier Create.h"
 #include "Soldier Add.h"
-#include "interface Dialogue.h"
+#include <NPC.h>
 #include "Soldier macros.h"
 #include "Soldier Functions.h"
 #include "Assignments.h"
 #include "Squads.h"
-#include "Strategic Pathing.h"
 #include "Strategic Movement.h"
 #include "strategic.h"
 #include "Exit Grids.h"
 #include "Structure Wrap.h"
-#include "Soldier Add.h"
-#include "random.h"
-#include "english.h"
 #include "random.h"
 #include "english.h"
 #include "Vehicles.h"
 #include "MessageBoxScreen.h"
 #include "Text.h"
 #include "Dialogue Control.h"
-#include "line.h"
 #include "GameSettings.h"
 #include "LOS.h"
 #include "Campaign Types.h"
@@ -78,13 +68,9 @@
 #include "qarray.h"
 #include "environment.h"
 #include "Map Information.h"
-#include "Soldier Control.h"
 #include "DisplayCover.h"
-#include "english.h"		// sevenfm: this is needed for _keydown(SHIFT) to work
 
 #include "TeamTurns.h"
-#include "Options Screen.h"
-#include "SaveLoadScreen.h"
 #include "Map Screen Interface.h"	// added by Flugente for SquadNames
 #include "Keys.h"	// added by silversurfer for door handling from the side
 
diff --git a/Tactical/Interface Control.cpp b/Tactical/Interface Control.cpp
index 6987ac0a..b53ac1d7 100644
--- a/Tactical/Interface Control.cpp	
+++ b/Tactical/Interface Control.cpp	
@@ -1,8 +1,6 @@
 	#include <stdio.h>
-	#include <time.h>
 	#include <math.h>
 	#include "sgp.h"
-	#include "gameloop.h"
 	#include "himage.h"
 	#include "vobject.h"
 	#include "sysutil.h"
@@ -13,7 +11,6 @@
 	#include "vsurface.h"
 	#include "input.h"
 	#include "Handle UI.h"
-	#include "Animation Control.h"
 	#include "Animation Data.h"
 	#include "renderworld.h"
 	#include "Cursors.h"
@@ -25,7 +22,6 @@
 	#include "Interface Cursors.h"
 	#include "lighting.h"
 	#include "Interface Panels.h"
-	#include "PATHAI.H"
 	#include "vobject_blitters.h"
 	#include "faces.h"
 	#include "Handle UI Plan.h"
@@ -46,7 +42,6 @@
 	#include "GameSettings.h"
 	#include "Explosion Control.h"		// added by Flugente
 
-#include "connect.h"
 #include "Text.h"
 
 #ifdef JA2UB
diff --git a/Tactical/Interface Cursors.cpp b/Tactical/Interface Cursors.cpp
index 6ebd89fc..5ed6e282 100644
--- a/Tactical/Interface Cursors.cpp	
+++ b/Tactical/Interface Cursors.cpp	
@@ -1,9 +1,5 @@
-	#include <stdio.h>
-	#include <time.h>
 	#include "sgp.h"
 	#include "mousesystem.h"
-	#include "vsurface.h"
-	#include "input.h"
 	#include "Handle UI.h"
 	#include "Cursors.h"
 	#include "worlddef.h"
@@ -11,7 +7,6 @@
 	#include "Interface Cursors.h"
 	#include "Interface.h"
 	#include "Isometric Utils.h"
-	#include "Cursors.h"
 	#include "Sys Globals.h"
 	#include "Overhead.h"
 	#include "Interface Items.h"
diff --git a/Tactical/Interface Dialogue.cpp b/Tactical/Interface Dialogue.cpp
index 13ac1149..a30386d2 100644
--- a/Tactical/Interface Dialogue.cpp	
+++ b/Tactical/Interface Dialogue.cpp	
@@ -1,7 +1,6 @@
 	#include "builddefines.h"
 	#include <stdio.h>
 	#include "sgp.h"
-	#include "Encrypted File.h"
 	#include "faces.h"
 	#include "WCheck.h"
 	#include "Soldier Profile.h"
@@ -13,7 +12,6 @@
 	#include "Dialogue Control.h"
 	#include "renderworld.h"
 	#include "NPC.h"
-	#include "interface Dialogue.h"
 	#include "MercTextBox.h"
 	#include "message.h"
 	#include "Items.h"
@@ -26,7 +24,6 @@
 	#include "ai.h"
 	#include "AIInternals.h"
 	#include "Interactive Tiles.h"
-	#include "Soldier Profile.h"
 	#include "Interface Panels.h"
 	#include "Quests.h"
 	#include "Squads.h"
@@ -47,12 +44,9 @@
 	#include "GameSettings.h"
 	#include "Strategic Mines.h"
 	#include "Boxing.h"
-	#include "Items.h"
 	#include "worldman.h"
 	#include "Render Fun.h"
-	// including this for Strategic AI.h
 	#include "Strategic Movement.h"
-	#include "Strategic AI.h"
 	#include "Soldier Create.h"
 	#include "SkillCheck.h"
 	#include "Sound Control.h"
@@ -63,17 +57,12 @@
 	#include "Morale.h"
 	#include "personnel.h"
 	#include "Map Screen Interface.h"
-	#include "Queen Command.h"
 	#include "Campaign.h"
 	#include "BobbyRMailOrder.h"
 	#include "End Game.h"
 	#include "Map Screen Helicopter.h"
-	#include "Cheats.h"
-	#include "Overhead.h"
 	#include "Soldier Control.h"
-
 #include "LuaInitNPCs.h"
-#include "Text.h"
 #include "Luaglobal.h"
 
 
@@ -81,20 +70,15 @@
 #include "Explosion Control.h"
 #include "Ja25_Tactical.h"
 #include "Ja25 Strategic Ai.h"
-#include "MapScreen Quotes.h"
-#include "email.h"
 #include "Soldier macros.h"
 #include "LOS.h"
-#include "Soldier Control.h"
 #include "Ja25Update.h"
 #include "ub_config.h"
-#endif
-
-#ifdef JA2UB
 #else
-	// anv: for playable Speck
-	#include "Speck Quotes.h"
-	#include "mercs.h"
+// anv: for playable Speck
+#include "Speck Quotes.h"
+#include "mercs.h"
+#include "Cheats.h"
 #endif
 
 //forward declarations of common classes to eliminate includes
diff --git a/Tactical/Interface Enhanced.cpp b/Tactical/Interface Enhanced.cpp
index 22cfe29e..7a7cbfdc 100644
--- a/Tactical/Interface Enhanced.cpp	
+++ b/Tactical/Interface Enhanced.cpp	
@@ -1,59 +1,28 @@
 	#include "builddefines.h"
 	#include <stdio.h>
-	#include <time.h>
 	#include "sgp.h"
-	#include "gameloop.h"
-	#include "himage.h"
 	#include "vobject.h"
 	#include "sysutil.h"
-	#include "Overhead.h"
 	#include "mousesystem.h"
-	#include "Button System.h"
-	#include "Interface.h"
-	#include "vsurface.h"
 	#include "WCheck.h"
 	#include "input.h"
-	#include "Handle UI.h"
-	#include "renderworld.h"
 	#include "Font Control.h"
-	#include "Utilities.h"
 	#include "Interface Panels.h"
 	#include "Animation Control.h"
 	#include "Soldier Control.h"
 	#include "Weapons.h"
-	#include "lighting.h"
-	#include "faces.h"
-	#include "mapscreen.h"
-	#include "message.h"
+	#include "soldier profile type.h"
+	#include <Font.h>
 	#include "Text.h"
 	#include "Interface Items.h"
-	#include "Font Control.h"
-	#include "Cursor Control.h"
-	#include "Interface Utils.h"
-	#include "Interface Items.h"
-	#include "WordWrap.h"
-	#include "vobject_blitters.h"
 	#include "world items.h"
 	#include "Points.h"
-	#include "physics.h"
-	#include "Handle UI.h"
-	#include "ShopKeeper Interface.h"
 	#include "english.h"
-	#include "Keys.h"
-	#include "strategicmap.h"
-	#include "Soldier macros.h"
-	#include "Squads.h"
-	#include "MessageBoxScreen.h"
 	#include "GameSettings.h"
 	#include "Map Screen Interface Map Inventory.h"
-	#include "Quests.h"
-	#include "Map Screen Interface.h"
-	#include "Campaign Types.h"
 	#include "LOS.h"
-	#include "Map Screen Interface Map.h"
 	#include "Food.h"	// added by Flugente
 
-#include "Multi Language Graphic Utils.h"
 #include <language.hpp>
 
 //forward declarations of common classes to eliminate includes
diff --git a/Tactical/Interface Items.cpp b/Tactical/Interface Items.cpp
index 841d15c3..532c288a 100644
--- a/Tactical/Interface Items.cpp	
+++ b/Tactical/Interface Items.cpp	
@@ -1,10 +1,7 @@
 	#include "builddefines.h"
 	#include "mapscreen.h"
 	#include <stdio.h>
-	#include <stdarg.h>
-	#include <time.h>
 	#include "sgp.h"
-	#include "gameloop.h"
 	#include "himage.h"
 	#include "vobject.h"
 	#include "sysutil.h"
@@ -19,7 +16,6 @@
 	#include "renderworld.h"
 	#include "Sys Globals.h"
 	#include "Cursors.h"
-	#include "Radar Screen.h"
 	#include "Font Control.h"
 	#include "Render Dirty.h"
 	#include "Utilities.h"
@@ -30,15 +26,12 @@
 	#include "Weapons.h"
 	#include "lighting.h"
 	#include "faces.h"
-	#include "mapscreen.h"
 	#include "message.h"
 	#include "Text.h"
 	#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"
@@ -47,7 +40,6 @@
 	#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"
@@ -67,7 +59,6 @@
 	#include "Map Screen Interface Map.h"
 	#include "Interface Enhanced.h"
 	#include "InterfaceItemImages.h"
-	#include "Auto Resolve.h"
 	#include "popup_callback.h"
 	// BOB : quick attachment popup
 	#include "popup_class.h"
@@ -75,19 +66,10 @@
 	#include "SkillCheck.h"				// added by Flugente
 	#include "random.h"					// added by Flugente
 	#include "Explosion Control.h"		// added by Flugente
-	#include "Food.h"					// added by Flugente
-	#include "Encyclopedia_new.h"	//Moa: enc. item visibility
-	// sevenfm:
-	#include "Soldier Control.h"
 	#include "Sound Control.h"
 
-#include "Multi Language Graphic Utils.h"
 #include <language.hpp>
 
-#ifdef JA2UB
-#include "Ja25_Tactical.h"
-#endif
-
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////
 // SANDRO - all "APBPConstants[AP_PICKUP_ITEM]" were replaced by GetBasicAPsToPickupItem()
diff --git a/Tactical/Interface Panels.cpp b/Tactical/Interface Panels.cpp
index ce0f11cf..e1714d91 100644
--- a/Tactical/Interface Panels.cpp	
+++ b/Tactical/Interface Panels.cpp	
@@ -1,8 +1,6 @@
 	#include "builddefines.h"
 	#include <stdio.h>
-	#include <time.h>
 	#include "sgp.h"
-	#include "gameloop.h"
 	#include "himage.h"
 	#include "vobject.h"
 	#include "sysutil.h"
@@ -26,7 +24,6 @@
 	#include "Soldier Control.h"
 	#include "PATHAI.H"
 	#include "Weapons.h"
-	#include "lighting.h"
 	#include "faces.h"
 	#include "mapscreen.h"
 	#include "message.h"
@@ -35,7 +32,6 @@
 	#include "Interface Control.h"
 	#include "Interface Utils.h"
 	#include "Game Clock.h"
-	#include "mapscreen.h"
 	#include "Soldier macros.h"
 	#include "strategicmap.h"
 	#include "Soldier Functions.h"
@@ -51,7 +47,6 @@
 	#include "ShopKeeper Interface.h"
 	#include "english.h"
 	#include "Keys.h"
-	#include "Soldier Add.h"
 	#include "Vehicles.h"
 	#include "GameSettings.h"
 	#include "Dialogue Control.h"
@@ -62,7 +57,6 @@
 	#include "vobject_blitters.h"
 	#include "finances.h"
 	#include "LaptopSave.h"
-	#include "Cursor Control.h"
 	#include "MessageBoxScreen.h"
 	#include "WordWrap.h"
 	#include "Boxing.h"
@@ -70,9 +64,6 @@
 	// HEADROCK HAM 3.6: This is required for Stat Progress Bars
 	#include "Campaign.h"
 	#include "Food.h"	// added by Flugente
-
-//legion by Jazz
-#include "Interface Utils.h"
 #include <language.hpp>
 
 //forward declarations of common classes to eliminate includes
diff --git a/Tactical/Interface Utils.cpp b/Tactical/Interface Utils.cpp
index 4337622f..e5d6920a 100644
--- a/Tactical/Interface Utils.cpp	
+++ b/Tactical/Interface Utils.cpp	
@@ -1,5 +1,4 @@
-	#include "builddefines.h"
-	#include <stdio.h>
+	#include <string.h>
 	#include "sgp.h"
 	#include "himage.h"
 	#include "vobject.h"
@@ -8,7 +7,6 @@
 	#include "Interface.h"
 	#include "sysutil.h"
 	#include "faces.h"
-	#include "Render Dirty.h"
 	#include "Weapons.h"
 	#include "Overhead.h"
 	#include "Soldier macros.h"
diff --git a/Tactical/Interface.cpp b/Tactical/Interface.cpp
index 8684daf6..2d6c8ee8 100644
--- a/Tactical/Interface.cpp
+++ b/Tactical/Interface.cpp
@@ -1,9 +1,7 @@
 	#include "builddefines.h"
 	#include <stdio.h>
 	#include <stdarg.h>
-	#include <time.h>
 	#include "sgp.h"
-	#include "gameloop.h"
 	#include "himage.h"
 	#include "vobject.h"
 	#include "sysutil.h"
@@ -30,9 +28,8 @@
 	#include "lighting.h"
 	#include "Interface Panels.h"
 	#include "PATHAI.H"
-	#include "vobject_blitters.h"
+	#include <shading.h>
 	#include "faces.h"
-	#include "Handle UI Plan.h"
 	#include "Interface Control.h"
 	#include "Interface Items.h"
 	#include "Soldier Profile.h"
@@ -46,15 +43,11 @@
 	#include "Soldier macros.h"
 	#include "Game Clock.h"
 	#include "physics.h"
-	#include "Map Screen Interface Map.h"
 	#include "line.h"
 	#include "Vehicles.h"
-	#include "MessageBoxScreen.h"
 	#include "GameSettings.h"
 	#include "Squads.h"
 	#include "message.h"
-    #include "strategicmap.h"
-	#include "Queen Command.h"
 	// HEADROCK HAM 4: Included for new CTH indicator
 	#include "Weapons.h"
 	#include "Map Screen Interface.h"	// added by Flugente for SquadNames
@@ -65,14 +58,7 @@
 
 #include "InterfaceItemImages.h"
 #ifdef JA2UB
-#include "Explosion Control.h"
 #include "Ja25_Tactical.h"
-#include "Ja25 Strategic Ai.h"
-#include "MapScreen Quotes.h"
-#include "email.h"
-#include "interface Dialogue.h"
-#include "mercs.h"
-#include "ub_config.h"
 #endif
 
 #include "connect.h"
diff --git a/Tactical/Inventory Choosing.cpp b/Tactical/Inventory Choosing.cpp
index 5630b81e..59de8b8b 100644
--- a/Tactical/Inventory Choosing.cpp	
+++ b/Tactical/Inventory Choosing.cpp	
@@ -1,4 +1,3 @@
-	#include <memory.h>
 	#include "Inventory Choosing.h"
 	#include "Animation Data.h"
 	#include "Items.h"
@@ -15,7 +14,6 @@
 	#include "strategic.h"
 	#include "Game Clock.h"
 	#include "message.h"
-	#include "Tactical Save.h"	// added by Flugente
 	#include "Soldier macros.h"		// added by Flugente
 	#include "Rebel Command.h"
 extern WorldItems gAllWorldItems;
diff --git a/Tactical/Items.cpp b/Tactical/Items.cpp
index 2f8a3ab6..c8e802e8 100644
--- a/Tactical/Items.cpp
+++ b/Tactical/Items.cpp
@@ -3,7 +3,6 @@
 	#include "Weapons.h"
 	#include "Soldier Control.h"
 	#include "Overhead.h"
-	#include "Handle UI.h"
 	#include "Animation Control.h"
 	#include "Points.h"
 	#include "Sound Control.h"
@@ -15,21 +14,17 @@
 	#include "Interface Panels.h"
 	#include "Explosion Control.h"
 	#include "Keys.h"
-	#include "faces.h"
-
+	#include <mapscreen.h>
+#include "soldier profile type.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 "Interface Control.h"
 	#include "ShopKeeper Interface.h"
-
 	#include "GameSettings.h"
 	#include "environment.h"
 	#include "Auto Resolve.h"
@@ -42,26 +37,17 @@
 	#include "Smell.h"
 	#include "lighting.h"
 	#include "Utilities.h"
-	#include "english.h"
 	#include "Debug Control.h"
-
-	#include "math.h"
 	// THE_BOB : added for pocket popup definitions
 	#include <map>
 	#include "popup_definition.h"
-
 	#include "Drugs And Alcohol.h"
 	#include "Food.h"
-	#include "opplist.h"
-	#include "Sys Globals.h"//dnl ch74 201013
 	#include "CampaignStats.h"		// added by Flugente
-	#include "DisplayCover.h"		// added by Flugente
-	#include "Map Information.h"
 	#include "ai.h"					// added by Flugente
 
 #ifdef JA2UB
 #include "Ja25_Tactical.h"
-#include "Ja25 Strategic Ai.h"
 #endif
 
 //forward declarations of common classes to eliminate includes
diff --git a/Tactical/Ja25_Tactical.cpp b/Tactical/Ja25_Tactical.cpp
index e3acfde5..1247d107 100644
--- a/Tactical/Ja25_Tactical.cpp
+++ b/Tactical/Ja25_Tactical.cpp
@@ -1,45 +1,23 @@
-	#include "Items.h"
-	#include "Weapons.h"
+#ifdef JA2UB
+#include "Items.h"
 	#include "Soldier Control.h"
 	#include "Overhead.h"
 	#include "Handle UI.h"
 	#include "Animation Control.h"
 	#include "Isometric Utils.h"
-	#include "Animation Data.h"
 	#include "random.h"
-	#include "Campaign.h"
 	#include "Interface.h"
-	#include "Keys.h"
-
 	#include "Soldier Profile.h"
-	#include "SkillCheck.h"
-	#include "LOS.h"
-	#include "message.h"
 	#include "Text.h"
-
-	#include "MessageBoxScreen.h"
-
-	#include "ShopKeeper Interface.h"
-
 	#include "GameSettings.h"
-	#include "Auto Resolve.h"
-	#include "Interface Items.h"
 	#include "Campaign Types.h"
 	#include "strategicmap.h"
-	#include "Inventory Choosing.h"
+	#include "Soldier Create.h"
 	#include "Soldier macros.h"
-	#include "Smell.h"
-	#include "lighting.h"
-	#include "Utilities.h"
-	#include "english.h"
-	#include "Debug Control.h"
-
-#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"
 #include "Dialogue Control.h"
 #include "interface Dialogue.h"
@@ -48,10 +26,8 @@
 #include "renderworld.h"
 #include "qarray.h"
 #include "Soldier Init List.h"
-#include "Soldier Control.h"
 #include "End Game.h"
 #include "structure.h"
-#include "Explosion Control.h"
 #include "ub_config.h"
 #include "GameInitOptionsScreen.h"
 
diff --git a/Tactical/Keys.cpp b/Tactical/Keys.cpp
index 439b6dcf..cb8d5ab9 100644
--- a/Tactical/Keys.cpp
+++ b/Tactical/Keys.cpp
@@ -1,12 +1,7 @@
 	#include "builddefines.h"
-	#include <stdio.h>
-	#include <memory.h>
-
 	#include "types.h"
-
 	#include "Keys.h"
 	#include "DEBUG.H"
-	#include "Smoothing Utils.h"
 	#include "SkillCheck.h"
 	#include "opplist.h"
 	#include "Items.h"
@@ -20,7 +15,6 @@
 	#include "Tactical Save.h"
 	#include "Campaign Types.h"
 	#include "LOS.h"
-	#include "opplist.h"
 	#include "TileDat.h"
 	#include "Overhead.h"
 	#include "structure.h"
diff --git a/Tactical/LOS.cpp b/Tactical/LOS.cpp
index 71ca0148..3c18abc5 100644
--- a/Tactical/LOS.cpp
+++ b/Tactical/LOS.cpp
@@ -1,8 +1,6 @@
 #include "connect.h"
 #include "builddefines.h"
 #include <stdio.h>
-
-#include <memory.h>
 #include <math.h>
 #include "WCheck.h"
 #include "Isometric Utils.h"
@@ -10,14 +8,11 @@
 #include "LOS.h"
 #include "Animation Control.h"
 #include "random.h"
-//#include "Soldier Control.h"
 #include "Event Pump.h"
 #include "Overhead.h"
 #include "Weapons.h"
-
 #include "opplist.h"
 #include "Bullets.h"
-
 #include "lighting.h"
 #include "phys math.h"
 #include "Items.h"
@@ -37,15 +32,11 @@
 #include "Points.h"
 #include "Smell.h"
 #include "Text.h"
-#include "Quests.h"
-#include "Items.h"
 #include "Item Types.h"
 #include "Vehicles.h"
 #include "fresh_header.h"
-#include "WorldDat.h"
 // HEADROCK HAM 3.6: This must be included, for testing whether Bloodcats and Enemies can see one another.
 #include "Campaign Types.h"
-#include "soldier tile.h"		// added by Flugente
 #include "Sound Control.h"		// added by Flugente
 #include "Soldier Functions.h"	// added by Flugente for DoesSoldierWearGasMask(...)
 #include "CampaignStats.h"		// added by Flugente
diff --git a/Tactical/LOS.h b/Tactical/LOS.h
index 69e03f0e..6d2b195a 100644
--- a/Tactical/LOS.h
+++ b/Tactical/LOS.h
@@ -1,8 +1,7 @@
 #ifndef LOS_H
 #define LOS_H
 
-//#define LOS_DEBUG
-#include "WorldDat.h" // needed for MAX_TILESETS
+#include "Soldier Control.h"
 
 // fixed-point arithmetic definitions start here
 
diff --git a/Tactical/Map Information.cpp b/Tactical/Map Information.cpp
index c1457d70..f7dc9cc8 100644
--- a/Tactical/Map Information.cpp	
+++ b/Tactical/Map Information.cpp	
@@ -1,18 +1,11 @@
-	#include <stdio.h>
 	#include "FileMan.h"
 	#include "types.h"
 	#include "Map Information.h"
 	#include "Soldier Init List.h"
-	#include "random.h"
 	#include "worlddef.h"
 	#include "renderworld.h"
-	#include "EditorMercs.h"
-	#include "Exit Grids.h"
 	#include "Isometric Utils.h"
-	#include "Animation Data.h"
-	#include "Road Smoothing.h"
 	#include "message.h"
-	#include "Weapons.h"
 	#include "environment.h"
 	#include "lighting.h"
 	#include "Animated ProgressBar.h"
diff --git a/Tactical/Merc Entering.cpp b/Tactical/Merc Entering.cpp
index 630a9d45..e7a246a1 100644
--- a/Tactical/Merc Entering.cpp	
+++ b/Tactical/Merc Entering.cpp	
@@ -1,19 +1,17 @@
-	#include "builddefines.h"
-	#include <stdio.h>
+	#include <cstdlib>
+#include <vector>
 	#include <string.h>
-	#include "stdlib.h"
-	#include "DEBUG.H"
-	//#include "Soldier Control.h"
-	// HEADROCK HAM 3.5: Strange that this wasn't included.
+	#include <types.h>
 	#include "GameSettings.h"
-	#include "Weapons.h"
-	#include "handle items.h"
+	#include <soundman.h>
+#include <Campaign Types.h>
+#include "Overhead Types.h"
+#include "Soldier Control.h"
+#include <Timer Control.h>
 	#include "worlddef.h"
 	#include "Rotting Corpses.h"
-	#include "Tile Cache.h"
 	#include "Isometric Utils.h"
 	#include "Animation Control.h"
-	#include "Utilities.h"
 	#include "Game Clock.h"
 	#include "Soldier Create.h"
 	#include "renderworld.h"
@@ -25,7 +23,6 @@
 	#include "Handle UI.h"
 	#include "Squads.h"
 	#include "english.h"
-	#include "Cursor Control.h"
 	#include "Merc Hiring.h"
 	#include "Font Control.h"
 	#include "message.h"
@@ -43,7 +40,6 @@
 #include "ub_config.h"
 #endif
 
-#include "Music Control.h"
 
 //forward declarations of common classes to eliminate includes
 class OBJECTTYPE;
diff --git a/Tactical/Merc Hiring.cpp b/Tactical/Merc Hiring.cpp
index 202ec1fb..e185bc8b 100644
--- a/Tactical/Merc Hiring.cpp	
+++ b/Tactical/Merc Hiring.cpp	
@@ -1,25 +1,14 @@
 	#include "builddefines.h"
 	#include <stdio.h>
-	#include <string.h>
-	#include "stdlib.h"
 	#include "DEBUG.H"
 	#include "math.h"
 	#include "worlddef.h"
-	#include "renderworld.h"
 	#include "Assignments.h"
 	#include "merc entering.h"
 	#include "Animation Control.h"
-	#include "Animation Data.h"
-	#include "Isometric Utils.h"
-	#include "Event Pump.h"
-	#include "Render Fun.h"
-	#include "Interface.h"
-	#include "sysutil.h"
-	#include "FileMan.h"
+	#include "Handle UI.h"
+	#include <Font Control.h>
 	#include "random.h"
-	#include "ai.h"
-	#include "Interactive Tiles.h"
-	#include "english.h"
 	#include "Overhead.h"
 	#include "Soldier Profile.h"
 	#include "Game Clock.h"
@@ -30,7 +19,6 @@
 	#include "strategicmap.h"
 	#include "strategic.h"
 	#include "Items.h"
-	#include "Soldier Add.h"
 	#include "history.h"
 	#include "Squads.h"
 	#include "Strategic Merc Handler.h"
@@ -43,12 +31,10 @@
 	#include "Merc Contract.h"
 	#include "LaptopSave.h"
 	#include "personnel.h"
-	#include "Auto Resolve.h"
 	#include "Map Screen Interface Bottom.h"
 	#include "Quests.h"
 	#include "GameSettings.h"
 	#include "DynamicDialogue.h"// added by Flugente
-	#include "Dialogue Control.h"	// added by Flugente
 #include "connect.h"
 #include "Map Information.h"
 
@@ -61,9 +47,6 @@
 #include "opplist.h"
 #include "Ja25Update.h"
 #include "ub_config.h"
-#endif
-
-#ifdef JA2UB
 #else
 	// anv: for Kulba's odyssey
 	#include "email.h"
diff --git a/Tactical/Militia Control.cpp b/Tactical/Militia Control.cpp
index 1960bb4d..2dcea0c9 100644
--- a/Tactical/Militia Control.cpp	
+++ b/Tactical/Militia Control.cpp	
@@ -5,7 +5,6 @@
 	#include "Campaign Types.h"
 	#include "Overhead.h"
 	#include "strategicmap.h"
-	#include "PreBattle Interface.h"
 	#include "Map Screen Interface.h"
 	#include "Queen Command.h"
 	#include "strategic.h"
@@ -28,7 +27,6 @@
 	#include "Isometric Utils.h"
 	#include "MilitiaSquads.h"
 	#include "MilitiaIndividual.h"	// added by Flugente
-	#include "CampaignStats.h"		// added by Flugente
 
 //forward declarations of common classes to eliminate includes
 class OBJECTTYPE;
diff --git a/Tactical/Minigame.cpp b/Tactical/Minigame.cpp
index fc2282ee..a1a1ca5c 100644
--- a/Tactical/Minigame.cpp
+++ b/Tactical/Minigame.cpp
@@ -5,49 +5,22 @@
 
 #include "builddefines.h"
 #include <stdio.h>
-#include <time.h>
 #include "sgp.h"
 #include "gameloop.h"
 #include "MiniGame.h"
-#include "WCheck.h"
-#include "Utilities.h"
+#include "Overhead Types.h"
 #include "WordWrap.h"
-#include "Cursors.h"
-#include "line.h"
-#include "Insurance Text.h"
-#include "Encrypted File.h"
-#include "Text.h"
-#include "Multi Language Graphic Utils.h"
 #include "random.h"
-#include "Interface.h"
-#include "DropDown.h"
-#include "finances.h"
-#include "Game Clock.h"
-#include "GameVersion.h"
-#include "GameSettings.h"
-#include "message.h"
-#include "Game Event Hook.h"
+#include "Handle UI.h"
 #include "Overhead.h"
 #include "Sound Control.h"
 #include "himage.h"
 #include "vobject.h"
-#include "vobject_blitters.h"
-#include "WCheck.h"
 #include "input.h"
 #include "Font.h"
-#include "timer.h"
-#include "mousesystem.h"
-#include <wchar.h>
-#include <tchar.h>
 #include "Timer Control.h"
-#include "Sys Globals.h"
-#include "Interface.h"
-#include "Utilities.h"
-#include "Render Dirty.h"
 #include "Cursor Control.h"
-#include "Utilities.h"
 #include "english.h"
-#include "WordWrap.h"
 #include "gamescreen.h"
 #include "Isometric Utils.h"
 #include "math.h"
diff --git a/Tactical/Morale.cpp b/Tactical/Morale.cpp
index bf8404cb..88f1baf2 100644
--- a/Tactical/Morale.cpp
+++ b/Tactical/Morale.cpp
@@ -1,9 +1,8 @@
-	#include <stdlib.h>
+	#include <cstdlib>
 	#include "Morale.h"
 	#include "Overhead.h"
 	#include "Soldier Profile.h"
 	#include "Dialogue Control.h"
-	#include "Map Screen Interface.h"
 	#include "message.h"
 	#include "Assignments.h"
 	#include "Strategic Movement.h"
@@ -17,24 +16,14 @@
 	#include "Campaign.h"
 	#include "mapscreen.h"
 	#include "Soldier macros.h"
-	#include "Event Pump.h"
-	// HEADROCK HAM 3.5: Added for facility effect on morale
 	#include "Facilities.h"
-	// addedd by SANDRO
 	#include "GameSettings.h"
 	#include "Isometric Utils.h"
 	#include "Food.h"
-	#include "Interface.h"			// added by Flugente
-	#include "finances.h"			// added by Flugente for EXTENDED_CONTRACT_BY_1_DAY
-	#include "Soldier Add.h"		// added by Flugente for MERC_TYPE__AIM_MERC
-	#include "CampaignStats.h"		// added by Flugente for gCurrentIncident
 	#include "DynamicDialogue.h"	// added by Flugente
-
 #include "connect.h"
 #include "fresh_header.h"
-
 #include "random.h"
-
 #include "Merc Contract.h"
 
 //#define MORALE_MOD_MAX 50		// morale *mod* range is -50 to 50, if you change this, check the decay formulas!
diff --git a/Tactical/Overhead.cpp b/Tactical/Overhead.cpp
index 3a484437..24f97740 100644
--- a/Tactical/Overhead.cpp
+++ b/Tactical/Overhead.cpp
@@ -1,15 +1,14 @@
-#include <stdio.h>
+#include <cstdio>
 #include <string.h>
 #include <random>
 #include <array>
 #include "WCheck.h"
-#include "stdlib.h"
+#include <cstdlib>
 #include "DEBUG.H"
 #include "worlddef.h"
 #include "worldman.h"
 #include "renderworld.h"
 #include "Assignments.h"
-//#include "Soldier Control.h"
 #include "Animation Control.h"
 #include "Animation Data.h"
 #include "Isometric Utils.h"
@@ -80,8 +79,6 @@
 #include "Keys.h"
 #include "Boxing.h"
 #include "Town Militia.h"
-#include "Meanwhile.h"
-#include "Map Screen Helicopter.h"
 #include "Interface Control.h"
 #include "Exit Grids.h"
 #include "jascreens.h"
@@ -93,9 +90,6 @@
 #include "Drugs And Alcohol.h"
 #include "history.h"
 #include "LOS.h"
-#include "interface Dialogue.h"
-#include "Strategic AI.h"
-#include "End Game.h"
 #include "Strategic Status.h"
 #include "PreBattle Interface.h"
 #include "Militia Control.h"
@@ -110,25 +104,28 @@
 #include "Rebel Command.h"
 #include "MilitiaSquads.h"
 #include "connect.h"
-
 #include "Luaglobal.h"
 #include "LuaInitNPCs.h"
 #include "Vehicles.h"
+#include "XML.h"
+#include "GameInitOptionsScreen.h"
+
+
 #ifdef JA2UB
 #include "Ja25 Strategic Ai.h"
 #include "Ja25_Tactical.h"
 #include "Soldier Control.h"
 #include "ub_config.h"
-#endif
-
-#ifdef JA2UB
 #else
-	// anv: for playable Speck
+#include "interface Dialogue.h"
+#include "Meanwhile.h"
+#include "Strategic AI.h"
+#include "Map Screen Helicopter.h"
+#include "End Game.h"
+// anv: for playable Speck
 	#include "mercs.h"
 #endif
 
-#include "XML.h"
-#include "GameInitOptionsScreen.h"
 
 // OJW - 20090419
 UINT16   giMAXIMUM_NUMBER_OF_PLAYER_MERCS = CODE_MAXIMUM_NUMBER_OF_PLAYER_MERCS;
diff --git a/Tactical/PATHAI.cpp b/Tactical/PATHAI.cpp
index c150178e..cb86642e 100644
--- a/Tactical/PATHAI.cpp
+++ b/Tactical/PATHAI.cpp
@@ -7,25 +7,18 @@
 	Author			:		Chris Camfield
 	Date			:		1997-NOV
 */
-
 	#include <stdio.h>
-	#include <string.h>
 	#include "stdlib.h"
 	#include "DEBUG.H"
 	#include "MemMan.h"
 	#include "Overhead Types.h"
-
-	#include "Animation Cache.h"
 	#include "Animation Data.h"
 	#include "Animation Control.h"
 	#include "Interface.h"
-	#include <math.h>
-
 	#include "input.h"
 	#include "english.h"
 	#include "worlddef.h"
 	#include "worldman.h"
-//	#include "renderworld.h"
 	#include "PATHAI.H"
 	#include "Points.h"
 	#include "ai.h"
@@ -35,22 +28,19 @@
 	#include "Keys.h"
 	#include "GameSettings.h"
 	#include "Buildings.h"
-	#include "Soldier Profile.h" // added by SANDRO
 	#include "Soldier macros.h"
 	#include "AIInternals.h"
 	#include "Rotting Corpses.h"
-	#include "Meanwhile.h"
-#include "connect.h"
-
+	#include "connect.h"
 #include "LOS.h"  //ddd
+#include "BinaryHeap.hpp"
+#include "opplist.h"
+#include "Weapons.h"
 
 //forward declarations of common classes to eliminate includes
 class OBJECTTYPE;
 class SOLDIERTYPE;
 
-#include "BinaryHeap.hpp"
-#include "opplist.h"
-#include "Weapons.h"
 extern BOOLEAN gubWorldTileInLight[MAX_ALLOWED_WORLD_MAX];
 extern BOOLEAN gubIsCorpseThere[MAX_ALLOWED_WORLD_MAX];
 extern INT32 gubMerkCanSeeThisTile[MAX_ALLOWED_WORLD_MAX];
diff --git a/Tactical/Points.cpp b/Tactical/Points.cpp
index 136d5b08..4c0ac1fc 100644
--- a/Tactical/Points.cpp
+++ b/Tactical/Points.cpp
@@ -6,15 +6,12 @@
 	#include "Interface.h"
 	#include "Isometric Utils.h"
 	#include "PATHAI.H"
-	#include "Interface.h"
 	#include "message.h"
 	#include "Animation Control.h"
 	#include "Weapons.h"
-
 	#include "Structure Wrap.h"
 	#include "Dialogue Control.h"
 	#include "Items.h"
-	#include "rt time defines.h"
 	#include "ai.h"
 	#include "Handle UI.h"
 	#include "Text.h"
@@ -4418,4 +4415,4 @@ INT16 GetBackbackAPPenaltyFromBackpack(SOLDIERTYPE *pSoldier)
 
 	}
 	return usBPPenalty;
-}
\ No newline at end of file
+}
diff --git a/Tactical/QARRAY.cpp b/Tactical/QARRAY.cpp
index b2b17853..313ff72c 100644
--- a/Tactical/QARRAY.cpp
+++ b/Tactical/QARRAY.cpp
@@ -1,4 +1,4 @@
-	#include "sgp.h"
+	#include <types.h>
 	#include "qarray.h"
 
 QARRAY_VALUES QuoteExp[NUM_PROFILES];
diff --git a/Tactical/Rain.cpp b/Tactical/Rain.cpp
index ad18bc12..b8dbfb4f 100644
--- a/Tactical/Rain.cpp
+++ b/Tactical/Rain.cpp
@@ -1,31 +1,9 @@
 	#include "types.h"
-	//#include "Soldier Control.h"
 	#include "Overhead.h"
-	#include "Animation Control.h"
-	#include "timer.h"
-	#include "Event Pump.h"
-//	#include "Sound Control.h"
-	#include "Interface.h"
-	#include "Font Control.h"
-	#include "ai.h"
-	#include "Interface.h"
-	#include "message.h"
-	#include "Text.h"
-	#include "TeamTurns.h"
-	#include "Smell.h"
-	#include "Soldier Functions.h"
-	#include "Cursors.h"
-	#include "Queen Command.h"
-	#include "lighting.h"
 	#include "environment.h"
-	#include "Dialogue Control.h"
-	#include "soldier profile type.h"
-	#include "Air Raid.h"
-	#include "SkillCheck.h"
 	#include "AIInternals.h"
-	#include "AIList.h"
 	#ifdef DEBUG_INTERRUPTS
-		#include "DEBUG.H"
+	#include "DEBUG.H"
 	#endif
 	#include "Render Dirty.h"
 	#include "GameSettings.h"
diff --git a/Tactical/RandomMerc.cpp b/Tactical/RandomMerc.cpp
index 4c1448c2..ec8560f4 100644
--- a/Tactical/RandomMerc.cpp
+++ b/Tactical/RandomMerc.cpp
@@ -1,15 +1,8 @@
-	#include <stdio.h>
-	#include <string.h>
-	#include "stdlib.h"
-	#include "DEBUG.H"
-	#include "math.h"
-	#include "worlddef.h"
-	#include "renderworld.h"
-
-	#include "random.h"
-	#include "Campaign.h"
-
-#include "XML.h"
+#include "DEBUG.H"
+#include "worlddef.h"
+#include "random.h"
+#include "Campaign.h"
+#include <Store Inventory.h>
 
 //Jenilee: full randomization of mercs, including traits, gear kits and all statistics.
 //to use, set MERCS_RANDOM_STATS to 4 in JA2_Options.ini.
diff --git a/Tactical/Real Time Input.cpp b/Tactical/Real Time Input.cpp
index 6f00baf7..087008e0 100644
--- a/Tactical/Real Time Input.cpp	
+++ b/Tactical/Real Time Input.cpp	
@@ -1,40 +1,20 @@
-#include <stdio.h>
-#include <string.h>
-#include "stdlib.h"
-#include "DEBUG.H"
-#include "math.h"
-#include "jascreens.h"
-#include "PATHAI.H"
-//#include "Soldier Control.h"
+#include <Button System.h>
 #include "Animation Control.h"
-#include "Animation Data.h"
-#include "Event Pump.h"
+#include "Soldier Find.h"
 #include "Timer Control.h"
 #include "Handle UI.h"
 #include "Isometric Utils.h"
 #include "input.h"
 #include "Overhead.h"
 #include "Sys Globals.h"
-#include "screenids.h"
 #include "Interface.h"
-#include "Cursor Control.h"
 #include "Interactive Tiles.h"
 #include "Spread burst.h"
-#include "world items.h"
 #include "Interface Items.h"
-#include "physics.h"
 #include "UI Cursors.h"
-#include "strategicmap.h"
-#include "Soldier Profile.h"
-#include "Soldier Create.h"
-#include "Soldier Add.h"
 #include "Dialogue Control.h"
 #include "interface Dialogue.h"
-#include "Interactive Tiles.h"
-#include "MessageBoxScreen.h"
-#include "gameloop.h"
-#include "Spread burst.h"
-#include "Explosion Control.h"
+#include <mousesystem.h>
 #include "message.h"
 #include "Strategic Exit GUI.h"
 #include "Assignments.h"
@@ -46,21 +26,19 @@
 #include "Soldier macros.h"
 #include "Render Dirty.h"
 #include "Militia Control.h"
-#include "Render Dirty.h"
-#include "Militia Control.h"
-///***dddd
 #include "Squads.h"
 #include "Interface Panels.h"
 #include "Soldier Functions.h"
-#include "SaveLoadMap.h"
-#include "WorldDat.h" //for gtileset
-#include "Debug Control.h" //for livelog
-
 #include "SkillMenu.h"			// sevenfm: need this for TraitsMenu
 #include "DisplayCover.h"		// added by Sevenfm
-
 #include "Vehicles.h"	// anv: for switching from soldier to vehicle
-#include "VehicleMenu.h"
+#include <types.h>
+#include "Item Types.h"
+#include "Items.h"
+#include "Overhead Types.h"
+#include "Soldier Control.h"
+#include "Weapons.h"
+#include <Font Control.h>
 
 
 
diff --git a/Tactical/Rotting Corpses.cpp b/Tactical/Rotting Corpses.cpp
index 39a30941..692078d6 100644
--- a/Tactical/Rotting Corpses.cpp	
+++ b/Tactical/Rotting Corpses.cpp	
@@ -4,7 +4,6 @@
 	#include "WCheck.h"
 	#include "stdlib.h"
 	#include "DEBUG.H"
-	//#include "Soldier Control.h"
 	#include "Weapons.h"
 	#include "handle items.h"
 	#include "worlddef.h"
@@ -47,9 +46,6 @@
 	#include "ai.h"			// added by Flugente
 	#include "PreBattle Interface.h"	// added by Flugente
 	#include "Strategic Town Loyalty.h"	// added by Flugente
-
-#include "Animation Control.h"
-
 #include "GameInitOptionsScreen.h"
 
 //forward declarations of common classes to eliminate includes
diff --git a/Tactical/ShopKeeper Interface.cpp b/Tactical/ShopKeeper Interface.cpp
index c82cdce0..3273c51e 100644
--- a/Tactical/ShopKeeper Interface.cpp	
+++ b/Tactical/ShopKeeper Interface.cpp	
@@ -1,4 +1,5 @@
-	#include "types.h"
+#include "builddefines.h"
+#include "types.h"
 	#include "ShopKeeper Interface.h"
 	#include "Utilities.h"
 	#include "Game Clock.h"
@@ -32,14 +33,11 @@
 	#include "Squads.h"
 	#include "Soldier Profile.h"
 	#include "message.h"
-	#include "personnel.h"
 	#include "LaptopSave.h"
 	#include "Quests.h"
 	#include "Weapons.h"
 	#include "MessageBoxScreen.h"
-	#include "line.h"
 	#include "Drugs And Alcohol.h"
-	#include "Map Screen Interface.h"
 	#include "Soldier macros.h"
 	#include "ArmsDealerInvInit.h"
 	#include "opplist.h"
@@ -49,22 +47,17 @@
 	#include "PATHAI.H"
 	#include "Points.h"
 	#include "InterfaceItemImages.h"
-	#include "Encyclopedia_new.h"
 	#include "Animation Control.h"	// added by Flugente
 	#include "Town Militia.h"		// added by Flugente
 
 #ifdef JA2UB
-#include "Explosion Control.h"
 #include "Ja25_Tactical.h"
 #include "Ja25 Strategic Ai.h"
-#include "MapScreen Quotes.h"
-#include "email.h"
-#include "interface Dialogue.h"
-#include "Ja25_Tactical.h"
+#include "soldier profile type.h"
+#include <mousesystem.h>
 #include "ub_config.h"
 #endif
 
-#include "builddefines.h"
 #include <algorithm>
 
 ////////////////////////////////////////////
diff --git a/Tactical/SkillCheck.cpp b/Tactical/SkillCheck.cpp
index 7eb3ad67..8ae8dd1e 100644
--- a/Tactical/SkillCheck.cpp
+++ b/Tactical/SkillCheck.cpp
@@ -8,8 +8,6 @@
 	#include "Isometric Utils.h"
 	#include "Morale.h"
 	#include "Drugs And Alcohol.h"
-	#include "strategicmap.h"
-	// added by SANDRO
 	#include "GameSettings.h"
 	#include "Animation Data.h"
 	#include "Soldier Control.h"
diff --git a/Tactical/Soldier Add.cpp b/Tactical/Soldier Add.cpp
index 276ee471..11c0be7d 100644
--- a/Tactical/Soldier Add.cpp	
+++ b/Tactical/Soldier Add.cpp	
@@ -5,36 +5,32 @@
 	#include "Isometric Utils.h"
 	#include "Interface Panels.h"
 	#include "Soldier macros.h"
-	#include "strategicmap.h"
 	#include "strategic.h"
 	#include "Animation Control.h"
-	#include "Soldier Create.h"
-	#include "Soldier Init List.h"
 	#include "Soldier Add.h"
 	#include "Map Information.h"
 	#include "fov.h"
 	#include "PATHAI.H"
 	#include "random.h"
 	#include "Render Fun.h"
-	#include "Meanwhile.h"
 	#include "Exit Grids.h"
-	#include "Interface.h"			// added by Flugente for zBackground
 	#include "renderworld.h"		// added by Flugente
-	#include "Vehicles.h"			// added by Flugente
 	#include "CampaignStats.h"		// added by Flugente
 	#include "worldman.h"			// added by Flugente for Water(...)
-
-#ifdef JA2UB
-#include "Ja25 Strategic Ai.h"
-#include "Ja25_Tactical.h"
-#include "ub_config.h"
-#endif
-
 #include "GameSettings.h"	// ary-05/05/2009 : add forced turn mode
 #include "Text.h"			//	: add forced turn mode
 #include "Font Control.h"	//	: add forced turn mode
 #include "message.h"		//  : add forced turn mode
 #include "connect.h"
+
+
+#ifdef JA2UB
+#include "Ja25_Tactical.h"
+#include "ub_config.h"
+#else
+#include "Meanwhile.h"
+#endif
+
 //forward declarations of common classes to eliminate includes
 class OBJECTTYPE;
 class SOLDIERTYPE;
diff --git a/Tactical/Soldier Ani.cpp b/Tactical/Soldier Ani.cpp
index a76b070a..750b3317 100644
--- a/Tactical/Soldier Ani.cpp	
+++ b/Tactical/Soldier Ani.cpp	
@@ -1,18 +1,15 @@
-#include <stdio.h>
-#include <string.h>
 #include "stdlib.h"
 #include "DEBUG.H"
 #include "MemMan.h"
 #include "Overhead Types.h"
 #include "Soldier Control.h" // I need this here - SANDRO
-#include "Animation Cache.h"
 #include "Animation Data.h"
 #include "Animation Control.h"
 #include "Weapons.h"
 #include "Soldier Ani.h"
 #include "random.h"
 #include "video.h"
-#include "vobject_blitters.h"
+#include "shading.h"
 #include "Sound Control.h"
 #include "Isometric Utils.h"
 #include "Handle UI.h"
@@ -33,11 +30,9 @@
 #include "merc entering.h"
 #include "Soldier Add.h"
 #include "Soldier Profile.h"
-#include "Soldier Functions.h"
 #include "Interface.h"
 #include "qarray.h"
 #include "Soldier macros.h"
-#include "Strategic Town Loyalty.h"
 #include "Squads.h"
 #include "worldman.h"
 #include "Structure Wrap.h"
@@ -45,16 +40,12 @@
 #include "pits.h"
 #include "Text.h"
 #include "NPC.h"
-#include "Meanwhile.h"
 #include "Explosion Control.h"
-#include "fov.h"
-#include "Campaign.h"
 #include "LOS.h"
 #include "GameSettings.h"
 #include "Boxing.h"
 #include "Drugs And Alcohol.h"
 #include "Smell.h"
-#include "GameSettings.h"
 #include "interface Dialogue.h"
 #include "Strategic Status.h"
 #include "Food.h"
@@ -64,15 +55,21 @@
 #include "Town Militia.h"				// added by Flugente
 #include "PreBattle Interface.h"		// added by Flugente
 #include "Rebel Command.h"
-
-// anv: for enemy taunts
 #include "Civ Quotes.h"
+#include "connect.h"
+#include "fresh_header.h"
+
+#ifdef JA2UB
+#else
+#include "Meanwhile.h"
+#endif // JA2UB
+
 
 //forward declarations of common classes to eliminate includes
 class OBJECTTYPE;
 class SOLDIERTYPE;
-#include "connect.h"
-#include "fresh_header.h"
+
+
 #define		NO_JUMP											0
 #define		MAX_ANIFRAMES_PER_FLASH			3
 //#define		TIME_FOR_RANDOM_ANIM_CHECK	10
diff --git a/Tactical/Soldier Control.cpp b/Tactical/Soldier Control.cpp
index 213cb918..6d4a108a 100644
--- a/Tactical/Soldier Control.cpp	
+++ b/Tactical/Soldier Control.cpp	
@@ -1,14 +1,13 @@
+#include "Soldier Functions.h"
 #include "builddefines.h"
 #include <wchar.h>
 #include <stdio.h>
 #include <string.h>
 #include "WCheck.h"
-#include "Render Fun.h"
 #include "stdlib.h"
 #include "DEBUG.H"
 #include "MemMan.h"
 #include "Overhead Types.h"
-//#include "Soldier Control.h"
 #include "Animation Cache.h"
 #include "Animation Data.h"
 #include "Animation Control.h"
@@ -23,7 +22,7 @@
 #include "Points.h"
 #include "Sound Control.h"
 #include "Weapons.h"
-#include "vobject_blitters.h"
+#include "shading.h"
 #include "Handle UI.h"
 #include "Soldier Ani.h"
 #include "Event Pump.h"
@@ -33,12 +32,10 @@
 #include "lighting.h"
 #include "faces.h"
 #include "Soldier Profile.h"
-#include "GAP.H"
 #include "Campaign.h"
 #include "Soldier macros.h"
 #include "english.h"
 #include "Squads.h"
-
 #ifdef NETWORKED
 #include "Networking.h"
 #include "NetworkEvent.h"
@@ -52,9 +49,7 @@
 #include "Smell.h"
 #include "Keys.h"
 #include "Dialogue Control.h"
-#include "Soldier Functions.h"
 #include "rt time defines.h"
-#include "Exit Grids.h"
 #include "Quests.h"
 #include "message.h"
 #include "NPC.h"
@@ -70,7 +65,6 @@
 #include "Interface Control.h"
 #include "strategicmap.h"
 #include "Morale.h"
-#include "Meanwhile.h"
 #include "Drugs And Alcohol.h"
 #include "Boxing.h"
 #include "overhead map.h"
@@ -84,7 +78,6 @@
 #include "Campaign Types.h"
 #include "Strategic Status.h"
 #include "Civ Quotes.h"
-#include "Strategic Pathing.h"
 #include "Debug Control.h"
 #include "LOS.h" // added by SANDRO
 #include "CampaignStats.h"		// added by Flugente
@@ -97,22 +90,9 @@
 #include "MilitiaIndividual.h"	// added by Flugente
 #include "Arms Dealer Init.h"	// added by Flugente for armsDealerInfo[]
 #include "LuaInitNPCs.h"		// added by Flugente
-#include "SaveLoadMap.h"		// added by Flugente
 #include "qarray.h"				// added by Flugente
-
-#include "ub_config.h"
-#include "../ModularizedTacticalAI/include/Plan.h" // for plan destructor call
-
-#ifdef JA2UB
-#include "Ja25_Tactical.h"
-#include "Ja25 Strategic Ai.h"
-#endif
-
 #include "GameInitOptionsScreen.h"
-
 #include "fresh_header.h"
-
-
 #include "IMP Skill Trait.h"	// added by Flugente
 #include "Food.h"				// added by Flugente
 #include "Tactical Save.h"		// added by Flugente for AddItemsToUnLoadedSector()
@@ -121,6 +101,15 @@
 #include "Strategic Town Loyalty.h"		// added by Flugente for gTownLoyalty
 #include "Rebel Command.h"
 
+
+#ifdef JA2UB
+#include "Ja25_Tactical.h"
+#include "Ja25 Strategic Ai.h"
+#else
+#include "Meanwhile.h"
+#endif
+
+
 //forward declarations of common classes to eliminate includes
 class OBJECTTYPE;
 class SOLDIERTYPE;
diff --git a/Tactical/Soldier Create.cpp b/Tactical/Soldier Create.cpp
index 0001bdf2..e72a54c4 100644
--- a/Tactical/Soldier Create.cpp	
+++ b/Tactical/Soldier Create.cpp	
@@ -14,7 +14,6 @@
 	#include "opplist.h"
 	#include "random.h"
 	#include "Assignments.h"
-	#include "Soldier Init List.h"
 	#include "Smell.h"
 	#include "Squads.h"
 	#include "Interface Panels.h"
@@ -34,7 +33,6 @@
 	#include "GameSettings.h"
 	#include "PreBattle Interface.h"
 	#include "Auto Resolve.h"
-	#include "Morale.h"
 	#include "ai.h"
 	#include "Strategic Mines.h"
 	#include "math.h"
@@ -43,17 +41,14 @@
 	#include "Soldier macros.h"		// added by Flugente
 	#include "MilitiaIndividual.h"	// added by Flugente
 	#include "Rebel Command.h"
-
 #include "connect.h"
 #include "message.h"
-#include "fresh_header.h"
+#include "GameInitOptionsScreen.h"
 
 #ifdef JA2UB
 #include "Ja25_Tactical.h"
-#include "Ja25 Strategic Ai.h"
 #endif
 
-#include "GameInitOptionsScreen.h"
 
 extern INT32 GetTheStateOfDepartedMerc(INT32 iId);
 
diff --git a/Tactical/Soldier Find.cpp b/Tactical/Soldier Find.cpp
index 1e153b70..c6ed1d9f 100644
--- a/Tactical/Soldier Find.cpp	
+++ b/Tactical/Soldier Find.cpp	
@@ -1,8 +1,4 @@
-	#include <stdio.h>
-	#include <string.h>
-	#include "stdlib.h"
 	#include "DEBUG.H"
-	#include "math.h"
 	#include "worlddef.h"
 	#include "worldman.h"
 	#include "renderworld.h"
@@ -11,31 +7,13 @@
 	#include "Animation Control.h"
 	#include "Animation Data.h"
 	#include "Isometric Utils.h"
-	#include "Event Pump.h"
-	#include "Render Fun.h"
-	#include "mousesystem.h"
 	#include "Interface.h"
-	#include "sysutil.h"
-	#include "FileMan.h"
-	#include "random.h"
-	#include "ai.h"
-	#include "Interactive Tiles.h"
 	#include "english.h"
 	#include "Overhead.h"
-	//#include "Sound Control.h"
-	#include "lighting.h"
-	#include "PATHAI.H"
-	#include "screenids.h"
-	#include "Weapons.h"
-	#include "lighting.h"
-	#include "Handle UI Plan.h"
-	#include "structure.h"
-	#include "message.h"
-	#include "Items.h"
-	#include "Soldier Profile.h"
-	#include "fov.h"
+	#include "vobject.h"
+#include "Overhead Types.h"
+	#include "Item Types.h"
 	#include "Soldier macros.h"
-	#include "soldier tile.h"
 	#include "Soldier Find.h"
 	#include "Vehicles.h"
 	#include "GameSettings.h"
diff --git a/Tactical/Soldier Init List.cpp b/Tactical/Soldier Init List.cpp
index ee79cfe4..b0d3455c 100644
--- a/Tactical/Soldier Init List.cpp	
+++ b/Tactical/Soldier Init List.cpp	
@@ -1,13 +1,9 @@
 #include "builddefines.h"
 #include <stdio.h>
-#include <memory.h>
-
 #include "types.h"
-
 #include "strategicmap.h"
 #include "Overhead.h"
 #include "Isometric Utils.h"
-
 #include "Soldier Add.h"
 #include "Soldier Create.h"
 #include "Soldier Init List.h"
@@ -15,8 +11,6 @@
 #include "random.h"
 #include "Items.h"
 #include "GameSettings.h"
-
-
 #include "Map Information.h"
 #include "Soldier Profile.h"
 #include "Sys Globals.h"
@@ -27,12 +21,9 @@
 #include "Sound Control.h"
 #include "Quests.h"
 #include "Render Fun.h"
-#include "Meanwhile.h"
 #include "Map Screen Interface Map.h"
-#include "mapscreen.h"
 #include "Debug Control.h"
 #include "Inventory Choosing.h"
-#include "Strategic AI.h"
 #include "strategic.h"
 #include "Campaign Types.h"
 #include "ai.h"
@@ -43,12 +34,9 @@
 #include "screenids.h"
 #include "SaveLoadScreen.h"
 #include "Rotting Corpses.h"
-
 #include "connect.h"
 #include "Map Edgepoints.h"
 #include "Queen Command.h"
-
-#include "Map Edgepoints.h"
 #include "Campaign.h"			// added by Flugente for HighestPlayerProgressPercentage()
 #include "CampaignStats.h"		// added by Flugente
 #include "Town Militia.h"		// added by Flugente
@@ -57,6 +45,12 @@
 #include "Soldier macros.h"		// added by Flugente
 #include "Creature Spreading.h"	// added by Flugente
 
+#ifdef JA2UB
+#else
+#include "Meanwhile.h"
+#include "Strategic AI.h"
+#endif // JA2UB
+
 
 BOOLEAN gfOriginalList = TRUE;
 
diff --git a/Tactical/Soldier Profile.cpp b/Tactical/Soldier Profile.cpp
index 68019ca6..03763266 100644
--- a/Tactical/Soldier Profile.cpp	
+++ b/Tactical/Soldier Profile.cpp	
@@ -1,25 +1,14 @@
-	#include <stdio.h>
 	#include <string.h>
-	#include "stdlib.h"
 	#include "DEBUG.H"
 	#include "math.h"
 	#include "worlddef.h"
-	#include "renderworld.h"
-
-
-	#include "Animation Control.h"
 	#include "Animation Data.h"
 	#include "Isometric Utils.h"
-	#include "Event Pump.h"
 	#include "Render Fun.h"
 	#include "Interface.h"
-	#include "sysutil.h"
 	#include "FileMan.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"
 	#include "Game Clock.h"
@@ -31,7 +20,6 @@
 	#include "Weapons.h"
 	#include "Strategic Town Loyalty.h"
 	#include "Squads.h"
-	#include "Tactical Save.h"
 	#include "Quests.h"
 	#include "aim.h"
 	#include "interface Dialogue.h"
@@ -49,26 +37,20 @@
 	#include "Drugs And Alcohol.h" // added by Flugente
 	#include "Campaign.h"
 	#include "LuaInitNPCs.h"		// added by Flugente
-
-#include "aim.h"
 #include "AimFacialIndex.h"
-#include "mercs.h"
+#include "connect.h"
+
 
 #ifdef JA2UB
 #include "Ja25_Tactical.h"
-#endif
-
-#include "ub_config.h"
-#include "XML.h"
-
-#ifdef JA2UB
 #else
 	// anv: for playable Speck
-	#include "Speck Quotes.h"
+#include "mercs.h"
+#include "Speck Quotes.h"
 	#include "LaptopSave.h"
 #endif
 
-#include "connect.h"
+
 #ifdef JA2EDITOR
 	extern BOOLEAN gfProfileDataLoaded;
 #endif
diff --git a/Tactical/Soldier Tile.cpp b/Tactical/Soldier Tile.cpp
index 76d25cb0..4a117f15 100644
--- a/Tactical/Soldier Tile.cpp	
+++ b/Tactical/Soldier Tile.cpp	
@@ -1,42 +1,25 @@
-	#include <wchar.h>
-	#include <stdio.h>
-	#include <string.h>
 	#include "Render Fun.h"
-	#include "stdlib.h"
 	#include "DEBUG.H"
-	#include "MemMan.h"
 	#include "Overhead Types.h"
 
-	#include "Animation Cache.h"
-	#include "Animation Data.h"
+	#include "EditorMercs.h"
+#include "Overhead.h"
 	#include "Animation Control.h"
 	#include "PATHAI.H"
-	#include "random.h"
 	#include "worldman.h"
 	#include "Isometric Utils.h"
 	#include "renderworld.h"
-	#include "video.h"
 	#include "Points.h"
-//	#include "Sound Control.h"
 	#include "lighting.h"
-	#include "Weapons.h"
-	#include "vobject_blitters.h"
-	#include "Handle UI.h"
-	#include "Event Pump.h"
 	#include "opplist.h"
 	#include "ai.h"
-	#include "Interface.h"
-	#include "lighting.h"
-	#include "faces.h"
-	#include "Soldier Profile.h"
-
+		
 	#ifdef NETWORKED
 	#include "Networking.h"
 	#include "NetworkEvent.h"
 	#endif
 
 	#include "Items.h"
-	#include "soundman.h"
 	#include "soldier tile.h"
 	#include "Soldier Add.h"
 	#include "fov.h"
diff --git a/Tactical/SoldierTooltips.cpp b/Tactical/SoldierTooltips.cpp
index 9ccf92dc..f49c877e 100644
--- a/Tactical/SoldierTooltips.cpp
+++ b/Tactical/SoldierTooltips.cpp
@@ -1,6 +1,5 @@
 #include "types.h"
 #include "windows.h"
-//#include "Soldier Control.h"
 #include "input.h"
 #include "english.h"
 #include "Isometric Utils.h"
@@ -18,18 +17,12 @@
 #include "vsurface.h"
 #include "line.h"
 #include "LOS.h"
-// added by SANDRO
 #include "SkillCheck.h"
 #include "soldier profile type.h"
 #include "Soldier macros.h"
-#include "Encyclopedia_new.h"	///< Encyclopedia item visibility
-// sevenfm
 #include "ai.h"
 #include "AIInternals.h"
 #include "opplist.h"
-#include "Map Screen Interface.h"
-#include "Cheats.h"
-#include "Drugs And Alcohol.h"
 
 //forward declarations of common classes to eliminate includes
 class OBJECTTYPE;
diff --git a/Tactical/Spread Burst.cpp b/Tactical/Spread Burst.cpp
index 4362859c..f5389546 100644
--- a/Tactical/Spread Burst.cpp	
+++ b/Tactical/Spread Burst.cpp	
@@ -1,10 +1,6 @@
-	#include <stdio.h>
-	#include <string.h>
 	#include "stdlib.h"
 	#include "DEBUG.H"
-	//#include "Soldier Control.h"
 	#include "Weapons.h"
-	#include "Cursor Control.h"
 	#include "Soldier Find.h"
 	#include "Isometric Utils.h"
 	#include "renderworld.h"
diff --git a/Tactical/Squads.cpp b/Tactical/Squads.cpp
index 0cf026b6..6eb7da47 100644
--- a/Tactical/Squads.cpp
+++ b/Tactical/Squads.cpp
@@ -15,7 +15,6 @@
 	#include "screenids.h"
 	#include "Soldier macros.h"
 	#include "GameSettings.h"
-#include <vector>
 
 
 typedef struct
diff --git a/Tactical/Strategic Exit GUI.cpp b/Tactical/Strategic Exit GUI.cpp
index 83a86e27..1713467e 100644
--- a/Tactical/Strategic Exit GUI.cpp	
+++ b/Tactical/Strategic Exit GUI.cpp	
@@ -9,7 +9,7 @@
 	#include "sysutil.h"
 	#include "Font Control.h"
 	#include "Text.h"
-	#include "PopUpBox.h"
+	#include "Render Dirty.h"
 	#include "Cursors.h"
 	#include "Strategic Exit GUI.h"
 	#include "MercTextBox.h"
@@ -18,12 +18,10 @@
 	#include "Cursor Control.h"
 	#include "input.h"
 	#include "english.h"
-	#include "Text.h"
 	#include "Strategic Movement.h"
 	#include "Squads.h"
 	#include "Assignments.h"
 	#include "Soldier macros.h"
-	#include "Map Screen Interface Map.h"
 	#include "PreBattle Interface.h"
 	#include "strategic.h"
 	#include "MessageBoxScreen.h"
@@ -32,8 +30,6 @@
 	#include "Queen Command.h"		// added by Flugente
 
 #ifdef JA2UB
-#include "Explosion Control.h"
-#include "Ja25 Strategic Ai.h"
 #include "Ja25_Tactical.h"
 #endif
 
diff --git a/Tactical/Structure Wrap.cpp b/Tactical/Structure Wrap.cpp
index ab23bc3c..e252c7bc 100644
--- a/Tactical/Structure Wrap.cpp	
+++ b/Tactical/Structure Wrap.cpp	
@@ -1,10 +1,8 @@
-	#include <stdio.h>
 	#include "DEBUG.H"
 	#include "worlddef.h"
 	#include "worldman.h"
 	#include "Structure Wrap.h"
 	#include "Isometric Utils.h"
-	#include "worldman.h"
 	#include "Overhead.h"
 	#include "renderworld.h"
 	#include "strategicmap.h"
diff --git a/Tactical/Tactical Save.cpp b/Tactical/Tactical Save.cpp
index 015339de..3b974e0b 100644
--- a/Tactical/Tactical Save.cpp	
+++ b/Tactical/Tactical Save.cpp	
@@ -12,12 +12,9 @@
 	#include "Rotting Corpses.h"
 	#include "Overhead.h"
 	#include "Keys.h"
-	#include "Soldier Create.h"
 	#include "Soldier Profile.h"
 	#include "Isometric Utils.h"
-	#include "Soldier Add.h"
 	#include "NPC.h"
-	#include "ai.h"
 	#include "Game Clock.h"
 	#include "Animation Control.h"
 	#include "Map Information.h"
@@ -27,14 +24,11 @@
 	#include "Quests.h"
 	#include "Animated ProgressBar.h"
 	#include "Text.h"
-	#include "Meanwhile.h"
 	#include "Enemy Soldier Save.h"
 	#include "SmokeEffects.h"
 	#include "LightEffects.h"
 	#include "PATHAI.H"
-	#include "GameVersion.h"
 	#include "strategic.h"
-	#include "Map Screen Interface Map.h"
 	#include "Strategic Status.h"
 	#include "Soldier macros.h"
 	#include "sgp.h"
@@ -42,8 +36,13 @@
 	#include "screenids.h"
 	#include "Queen Command.h"
 	#include "Map Screen Interface Map Inventory.h"
-#include "Animation Control.h"
-#include <vfs/Core/vfs.h>
+
+#ifdef JA2UB
+#else
+#include "Meanwhile.h"
+#endif // JA2UB
+
+
 BOOLEAN gfWasInMeanwhile = FALSE;
 
 
diff --git a/Tactical/Tactical Turns.cpp b/Tactical/Tactical Turns.cpp
index ad27e157..23dbc020 100644
--- a/Tactical/Tactical Turns.cpp	
+++ b/Tactical/Tactical Turns.cpp	
@@ -1,17 +1,9 @@
 	#include "sgp.h"
 	#include "Game Clock.h"
-	#include "Font Control.h"
 	#include "Timer Control.h"
 	#include "Overhead.h"
-	#include "Game Clock.h"
-	#include "message.h"
 	#include "worlddef.h"
 	#include "Rotting Corpses.h"
-	#include "Soldier Create.h"
-	#include "Soldier Add.h"
-	#include "Isometric Utils.h"
-	#include "Animation Data.h"
-	#include "Animation Control.h"
 	#include "Tactical Turns.h"
 	#include "Smell.h"
 	#include "opplist.h"
@@ -19,15 +11,17 @@
 	#include "Dialogue Control.h"
 	#include "SmokeEffects.h"
 	#include "LightEffects.h"
-	#include "Campaign.h"
 	#include "Soldier macros.h"
-	#include "strategicmap.h"
-	#include "random.h"
 	#include "Explosion Control.h"
-	#include "Dialogue Control.h"	// added by Flugente
-
 #include "Reinforcement.h"
 
+#ifdef JA2UB
+#else
+#include "strategicmap.h"
+#include "random.h"
+#endif // JA2UB
+
+
 extern void DecayPublicOpplist( INT8 bTeam );
 
 //not in overhead.h!
diff --git a/Tactical/TeamTurns.cpp b/Tactical/TeamTurns.cpp
index ffd2698c..b1336c62 100644
--- a/Tactical/TeamTurns.cpp
+++ b/Tactical/TeamTurns.cpp
@@ -3,21 +3,16 @@
 	#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"
 	#include "message.h"
 	#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 "lighting.h"
@@ -28,7 +23,6 @@
 	#include "SmokeEffects.h"
 	#include "LightEffects.h"
 	#include "Air Raid.h"
-	#include "Meanwhile.h"
 	#include "SkillCheck.h"
 	#include "AIInternals.h"
 	#include "AIList.h"
@@ -42,20 +36,22 @@
 	#include "Soldier Profile.h"
 	#include "NPC.h"
 	#include "Drugs And Alcohol.h"	// added by Flugente
+#include "GameSettings.h"
+#include "Reinforcement.h"
+#include "fresh_header.h"
+#include "connect.h"
+
 
 #ifdef JA2UB
 #include "Ja25_Tactical.h"
 #include "Ja25 Strategic Ai.h"
-#endif
+#else
+#include "meanwhile.h"
+#endif // JA2UB
 
-// HEADROCK HAM 3.2: Gamesettings.h for external modifications to team turns.
-#include "GameSettings.h"
-#include "Reinforcement.h"
-#include "fresh_header.h"
 //forward declarations of common classes to eliminate includes
 class OBJECTTYPE;
 class SOLDIERTYPE;
-#include "connect.h"
 
 extern INT8 STRAIGHT;
 //extern UINT8 gubSpeedUpAnimationFactor;
diff --git a/Tactical/Turn Based Input.cpp b/Tactical/Turn Based Input.cpp
index 31d3e62a..9bdee0c1 100644
--- a/Tactical/Turn Based Input.cpp	
+++ b/Tactical/Turn Based Input.cpp	
@@ -1,14 +1,11 @@
 #include "builddefines.h"
 #include <stdio.h>
-#include <string.h>
 #include "stdlib.h"
 #include "DEBUG.H"
-#include "math.h"
 #include "jascreens.h"
 #include "PATHAI.H"
 #include "Animation Control.h"
 #include "Animation Data.h"
-#include "Event Pump.h"
 #include "Timer Control.h"
 #include "Handle UI.h"
 #include "Isometric Utils.h"
@@ -22,9 +19,7 @@
 #include "Interactive Tiles.h"
 #include "Interface Cursors.h"
 #include "Weapons.h"
-#include "lighting.h"
 #include "Sound Control.h"
-#include "environment.h"
 #include "Music Control.h"
 #include "ai.h"
 #include "renderworld.h"
@@ -42,7 +37,6 @@
 #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"
@@ -50,17 +44,14 @@
 #include "Dialogue Control.h"
 #include "interface Dialogue.h"
 #include "opplist.h"
-#include "Interactive Tiles.h"
 #include "MessageBoxScreen.h"
 #include "gameloop.h"
-
 #include "Spread burst.h"
 #include "Explosion Control.h"
 #include "QuestDebug.h"
 #include "Assignments.h"
-#include "editscreen.h"
 #include "SaveLoadGame.h"
-#include "LOS.h"
+#include "WorldDat.h"
 #include "Exit Grids.h"
 #include "Strategic Exit GUI.h"
 #include "Auto Bandage.h"
@@ -69,15 +60,10 @@
 #include "Interface Panels.h"
 #include "soldier tile.h"
 #include "Soldier Functions.h"
-#include "Game Events.h"
 #include "english.h"
 #include "random.h"
-#include "Assignments.h"
 #include "Map Screen Interface.h"
-#include "renderworld.h"
 #include	"Quest Debug System.h"
-//#include "medical.h"
-#include "Arms Dealer Init.h"
 #include "ShopKeeper Interface.h"
 #include "GameSettings.h"
 #include "Vehicles.h"
@@ -94,27 +80,25 @@
 #include "history.h"
 #include "Queen Command.h"
 #include "PreBattle Interface.h"
-#include "_Ja25EnglishText.h"
 #include "Militia Control.h"
 #include "Ambient Control.h"
 #include "Strategic AI.h"
 #include "VehicleMenu.h"
-
-#include "Quest Debug System.h"
 #include "connect.h"
 #include "fresh_header.h"
-
-#include "IMP Skill Trait.h"			// added by Flugente
 #include "SkillMenu.h"					// added by Flugente
 #include "Map Screen Interface Map Inventory.h"//dnl ch75 021113
-
-#include "DisplayCover.h"				// added by Sevenfm
 #include "InterfaceItemImages.h"		// added by Sevenfm
 #include "DynamicDialogueWidget.h"		// added by Flugente for DelayBoxDestructionBy(...)
-#include "Utilities.h"					// added by Flugente
 #include "AIInternals.h"				// sevenfm
-#include "Interface Cursors.h"			// sevenfm
 #include "strategic.h"					// shadooow for CreateNewMerc
+
+#ifdef JA2EDITOR
+#include "editscreen.h"
+#include "Map Edgepoints.h"
+#endif // JA2EDITOR
+
+
 //forward declarations of common classes to eliminate includes
 class OBJECTTYPE;
 class SOLDIERTYPE;
@@ -6329,7 +6313,6 @@ void EscapeUILock( )
 }
 
 #ifdef JA2BETAVERSION
-#include "Map Edgepoints.h"
 void ToggleMapEdgepoints()
 {
 #ifdef JA2EDITOR
diff --git a/Tactical/UI Cursors.cpp b/Tactical/UI Cursors.cpp
index 25bbf6ce..5bf3f397 100644
--- a/Tactical/UI Cursors.cpp	
+++ b/Tactical/UI Cursors.cpp	
@@ -15,7 +15,6 @@
 	#include "LOS.h"
 	#include "renderworld.h"
 	#include "Interface.h"
-	#include "UI Cursors.h"
 	#include "Cursors.h"
 	#include "Cursor Control.h"
 	#include "Structure Wrap.h"
@@ -27,7 +26,6 @@
 	#include "Interactive Tiles.h"
 	#include "PATHAI.H"
 	#include "SkillCheck.h" // added by SANDRO
-	#include "message.h" //ddd
 	#include "english.h"		// added by Flugente
 
 //forward declarations of common classes to eliminate includes
diff --git a/Tactical/VehicleMenu.cpp b/Tactical/VehicleMenu.cpp
index 5cca5bd8..9fd2297f 100644
--- a/Tactical/VehicleMenu.cpp
+++ b/Tactical/VehicleMenu.cpp
@@ -1,12 +1,10 @@
 // anv: totally not a copy of SkillMenu.cpp
 
 #include "VehicleMenu.h"
-#include "soldier profile type.h"
+#include "mapscreen.h"
 #include "Overhead.h"
 #include "Text.h"
 #include "Isometric Utils.h"
-#include "DisplayCover.h"
-#include "worldman.h"
 #include "Vehicles.h"
 #include "Soldier macros.h"
 #include "Soldier Add.h"
diff --git a/Tactical/Vehicles.cpp b/Tactical/Vehicles.cpp
index 2ea1022f..3a5bf7f5 100644
--- a/Tactical/Vehicles.cpp
+++ b/Tactical/Vehicles.cpp
@@ -1,5 +1,4 @@
 	#include "Vehicles.h"
-	#include "string.h"
 	#include "Strategic Pathing.h"
 	#include "Assignments.h"
 	#include "Strategic Movement.h"
@@ -9,19 +8,16 @@
 	#include "Overhead.h"
 	#include "Soldier Profile.h"
 	#include "Sound Control.h"
-	#include "soundman.h"
 	#include "Soldier Add.h"
 	#include "Interface Panels.h"
 	#include "strategic.h"
 	#include "worlddef.h"
 	#include "Isometric Utils.h"
-	#include "Mapscreen.h"
 	#include "message.h"
 	#include "Interface.h"
 	#include "random.h"
 	#include "Text.h"
 	#include "Explosion Control.h"
-	#include "Soldier Create.h"
 	#include "Animation Control.h"
 	#include "strategicmap.h"
 	#include "Interface Control.h"
@@ -36,7 +32,6 @@
 	#include "Soldier Ani.h"
 	#include "GameSettings.h"
 	#include "Queen Command.h"
-
 #include "Points.h"
 #include "Init.h"
 
diff --git a/Tactical/Weapons.cpp b/Tactical/Weapons.cpp
index e9a56c5e..a378fceb 100644
--- a/Tactical/Weapons.cpp
+++ b/Tactical/Weapons.cpp
@@ -1,7 +1,6 @@
 	#include "sgp.h"
 	#include "Overhead Types.h"
 	#include "Sound Control.h"
-	#include "Cheats.h"
 	#include "Overhead.h"
 	#include "Event Pump.h"
 	#include "Weapons.h"
@@ -26,14 +25,13 @@
 	#include "SkillCheck.h"
 	#include "Render Fun.h"
 	#include "Explosion Control.h"
-	#include "Quests.h"
+	#include "strategicmap.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"
 	#include "Debug Control.h"
@@ -45,22 +43,21 @@
 	#include "Auto Resolve.h"
 	#include "Soldier Functions.h" // added by SANDRO
 	#include "Drugs And Alcohol.h" // HEADROCK HAM 4: Get drunk level
-	#include "LOS.h" // HEADROCK HAM 4: Required for new shooting mechanism. Alternately, maybe move the functions to LOS.h.
 	#include "Campaign Types.h"	// added by Flugente
 	#include "CampaignStats.h"	// added by Flugente
 	#include "environment.h"	// added by silversurfer
 	// sevenfm
 	#include "Buildings.h"		// SameBuilding
+#include "connect.h"
+// anv: for taunts on miss
+#include "Civ Quotes.h"
+#include "GameInitOptionsScreen.h"
+
 
 //forward declarations of common classes to eliminate includes
 class OBJECTTYPE;
 class SOLDIERTYPE;
-#include "connect.h"
 
-// anv: for taunts on miss
-#include "Civ Quotes.h"
-
-#include "GameInitOptionsScreen.h"
 
 // sevenfm: this global variable is needed to correctly set default number of bullets for autofire
 extern BOOLEAN gfAutofireInitBulletNum;
diff --git a/Tactical/World Items.cpp b/Tactical/World Items.cpp
index 769d5437..71471b4e 100644
--- a/Tactical/World Items.cpp	
+++ b/Tactical/World Items.cpp	
@@ -1,15 +1,10 @@
 	#include "Items.h"
 	#include "handle Items.h"
 	#include "Overhead.h"
-	#include "Weapons.h"
 	#include "tiledef.h"
 	#include "worlddef.h"
-	#include "Interface.h"
-	#include "renderworld.h"
-	#include "Animation Control.h"
 	#include "Font Control.h"
 	#include "World items.h"
-	#include "DEBUG.H"
 	#include "Isometric Utils.h"
 	#include "Sys Globals.h"
 	#include "Tactical Save.h"
@@ -24,6 +19,8 @@
 	#include "message.h"
 	#include "Map Screen Interface Map Inventory.h"	// added by Flugente
 #include "connect.h"
+
+
 #ifdef JA2EDITOR//dnl ch84 290114
 #include "Item Statistics.h"
 #endif
diff --git a/Tactical/XML_AmmoStrings.cpp b/Tactical/XML_AmmoStrings.cpp
index 16069ccd..9408e5ca 100644
--- a/Tactical/XML_AmmoStrings.cpp
+++ b/Tactical/XML_AmmoStrings.cpp
@@ -1,5 +1,4 @@
 	#include "sgp.h"
-	#include "Overhead Types.h"
 	#include "Overhead.h"
 	#include "Text.h"
 	#include "Debug Control.h"
diff --git a/Tactical/XML_AmmoTypes.cpp b/Tactical/XML_AmmoTypes.cpp
index 22442b70..9d68f801 100644
--- a/Tactical/XML_AmmoTypes.cpp
+++ b/Tactical/XML_AmmoTypes.cpp
@@ -1,6 +1,5 @@
 	#include "sgp.h"
 	#include "Weapons.h"
-	#include "Overhead.h"
 	#include "Debug Control.h"
 	#include "expat.h"
 	#include "XML.h"
diff --git a/Tactical/XML_Armour.cpp b/Tactical/XML_Armour.cpp
index ae4abab8..107d0f09 100644
--- a/Tactical/XML_Armour.cpp
+++ b/Tactical/XML_Armour.cpp
@@ -1,6 +1,5 @@
 	#include "sgp.h"
 	#include "Weapons.h"
-	#include "Overhead.h"
 	#include "GameSettings.h"
 	#include "Debug Control.h"
 	#include "expat.h"
diff --git a/Tactical/XML_AttachmentInfo.cpp b/Tactical/XML_AttachmentInfo.cpp
index 35f1bd3d..ce93f81f 100644
--- a/Tactical/XML_AttachmentInfo.cpp
+++ b/Tactical/XML_AttachmentInfo.cpp
@@ -1,6 +1,5 @@
 	#include "sgp.h"
 	#include "Overhead.h"
-	#include "Weapons.h"
 	#include "Debug Control.h"
 	#include "expat.h"
 	#include "XML.h"
diff --git a/Tactical/XML_AttachmentSlots.cpp b/Tactical/XML_AttachmentSlots.cpp
index d68ac1bc..37ef45d3 100644
--- a/Tactical/XML_AttachmentSlots.cpp
+++ b/Tactical/XML_AttachmentSlots.cpp
@@ -1,6 +1,6 @@
 	#include "sgp.h"
-	#include "Overhead.h"
-	#include "Weapons.h"
+	#include "FileMan.h"
+#include "Item Types.h"
 	#include "Debug Control.h"
 	#include "expat.h"
 	#include "XML.h"
diff --git a/Tactical/XML_Attachments.cpp b/Tactical/XML_Attachments.cpp
index e38f2c74..c642222f 100644
--- a/Tactical/XML_Attachments.cpp
+++ b/Tactical/XML_Attachments.cpp
@@ -1,6 +1,5 @@
 	#include "sgp.h"
 	#include "Overhead.h"
-	#include "Weapons.h"
 	#include "Debug Control.h"
 	#include "expat.h"
 	#include "GameSettings.h"
diff --git a/Tactical/XML_BurstSounds.cpp b/Tactical/XML_BurstSounds.cpp
index d1d91f68..05a482eb 100644
--- a/Tactical/XML_BurstSounds.cpp
+++ b/Tactical/XML_BurstSounds.cpp
@@ -1,35 +1,7 @@
 	#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 "Handle UI.h"
-	#include "Isometric Utils.h"
-	#include "math.h"
-	#include "ai.h"
-	#include "LOS.h"
-	#include "renderworld.h"
-	#include "Interface.h"
-	#include "message.h"
-	#include "Campaign.h"
-	#include "Items.h"
-	#include "Text.h"
-	#include "Soldier Profile.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 "SkillCheck.h"
-	#include "GameSettings.h"
-	#include "SaveLoadMap.h"
+	#include "FileMan.h"
 	#include "Debug Control.h"
 	#include "expat.h"
 	#include "XML.h"
diff --git a/Tactical/XML_Clothes.cpp b/Tactical/XML_Clothes.cpp
index 0541a899..090f089a 100644
--- a/Tactical/XML_Clothes.cpp
+++ b/Tactical/XML_Clothes.cpp
@@ -1,5 +1,6 @@
 	#include "sgp.h"
-	#include "Overhead.h"
+	#include "FileMan.h"
+#include "Soldier Control.h"
 	#include "Debug Control.h"
 	#include "expat.h"
 	#include "XML.h"
diff --git a/Tactical/XML_ComboMergeInfo.cpp b/Tactical/XML_ComboMergeInfo.cpp
index 8184398b..64b65482 100644
--- a/Tactical/XML_ComboMergeInfo.cpp
+++ b/Tactical/XML_ComboMergeInfo.cpp
@@ -1,6 +1,6 @@
 	#include "sgp.h"
-	#include "Overhead.h"
-	#include "Weapons.h"
+	#include "FileMan.h"
+#include "Item Types.h"
 	#include "Debug Control.h"
 	#include "expat.h"
 	#include "XML.h"
diff --git a/Tactical/XML_CompatibleFaceItems.cpp b/Tactical/XML_CompatibleFaceItems.cpp
index be38b1f9..c84f9335 100644
--- a/Tactical/XML_CompatibleFaceItems.cpp
+++ b/Tactical/XML_CompatibleFaceItems.cpp
@@ -1,6 +1,6 @@
 	#include "sgp.h"
-	#include "Overhead.h"
-	#include "Weapons.h"
+#include "FileMan.h"
+#include "Item Types.h"
 	#include "Debug Control.h"
 	#include "expat.h"
 	#include "XML.h"
diff --git a/Tactical/XML_Disease.cpp b/Tactical/XML_Disease.cpp
index e446f1f1..c8f7a07d 100644
--- a/Tactical/XML_Disease.cpp
+++ b/Tactical/XML_Disease.cpp
@@ -1,5 +1,5 @@
 #include "sgp.h"
-#include "Overhead.h"
+#include "FileMan.h"
 #include "Disease.h"
 #include "Debug Control.h"
 #include "expat.h"
diff --git a/Tactical/XML_Drugs.cpp b/Tactical/XML_Drugs.cpp
index dbc6f76f..59b37dd0 100644
--- a/Tactical/XML_Drugs.cpp
+++ b/Tactical/XML_Drugs.cpp
@@ -1,5 +1,5 @@
 	#include "sgp.h"
-	#include "Overhead.h"
+	#include "FileMan.h"
 	#include "Drugs And Alcohol.h"
 	#include "Debug Control.h"
 	#include "expat.h"
diff --git a/Tactical/XML_EnemyAmmoDrops.cpp b/Tactical/XML_EnemyAmmoDrops.cpp
index 31eaa617..a46e5267 100644
--- a/Tactical/XML_EnemyAmmoDrops.cpp
+++ b/Tactical/XML_EnemyAmmoDrops.cpp
@@ -1,6 +1,6 @@
 	#include "sgp.h"
-	#include "Overhead.h"
-	#include "Weapons.h"
+	#include "FileMan.h"
+#include "Item Types.h"
 	#include "Debug Control.h"
 	#include "expat.h"
 	#include "XML.h"
diff --git a/Tactical/XML_EnemyArmourDrops.cpp b/Tactical/XML_EnemyArmourDrops.cpp
index b34c25d1..6ec4c67f 100644
--- a/Tactical/XML_EnemyArmourDrops.cpp
+++ b/Tactical/XML_EnemyArmourDrops.cpp
@@ -1,6 +1,6 @@
 	#include "sgp.h"
-	#include "Overhead.h"
-	#include "Weapons.h"
+	#include "FileMan.h"
+#include "Item Types.h"
 	#include "Debug Control.h"
 	#include "expat.h"
 	#include "XML.h"
diff --git a/Tactical/XML_EnemyExplosiveDrops.cpp b/Tactical/XML_EnemyExplosiveDrops.cpp
index 609e8000..3a875a13 100644
--- a/Tactical/XML_EnemyExplosiveDrops.cpp
+++ b/Tactical/XML_EnemyExplosiveDrops.cpp
@@ -1,6 +1,6 @@
 	#include "sgp.h"
-	#include "Overhead.h"
-	#include "Weapons.h"
+	#include "FileMan.h"
+#include "Item Types.h"
 	#include "Debug Control.h"
 	#include "expat.h"
 	#include "XML.h"
diff --git a/Tactical/XML_EnemyItemChoice.cpp b/Tactical/XML_EnemyItemChoice.cpp
index 2fa46fd8..ddf06a24 100644
--- a/Tactical/XML_EnemyItemChoice.cpp
+++ b/Tactical/XML_EnemyItemChoice.cpp
@@ -1,6 +1,7 @@
 	#include "sgp.h"
-	#include "Overhead.h"
-	#include "Weapons.h"
+	#include "FileMan.h"
+#include "Strategic Status.h"
+#include "Soldier Control.h"
 	#include "Debug Control.h"
 	#include "expat.h"
 	#include "XML.h"
diff --git a/Tactical/XML_EnemyMiscDrops.cpp b/Tactical/XML_EnemyMiscDrops.cpp
index 5ed4b494..6b4ee8e1 100644
--- a/Tactical/XML_EnemyMiscDrops.cpp
+++ b/Tactical/XML_EnemyMiscDrops.cpp
@@ -1,6 +1,6 @@
 	#include "sgp.h"
-	#include "Overhead.h"
-	#include "Weapons.h"
+	#include "FileMan.h"
+#include "Item Types.h"
 	#include "Debug Control.h"
 	#include "expat.h"
 	#include "XML.h"
diff --git a/Tactical/XML_EnemyWeaponChoice.cpp b/Tactical/XML_EnemyWeaponChoice.cpp
index 636d85b9..4fe5f72b 100644
--- a/Tactical/XML_EnemyWeaponChoice.cpp
+++ b/Tactical/XML_EnemyWeaponChoice.cpp
@@ -1,6 +1,7 @@
 	#include "sgp.h"
-	#include "Overhead.h"
-	#include "Weapons.h"
+	#include "FileMan.h"
+#include "Strategic Status.h"
+#include "Soldier Control.h"
 	#include "Debug Control.h"
 	#include "expat.h"
 	#include "XML.h"
diff --git a/Tactical/XML_EnemyWeaponDrops.cpp b/Tactical/XML_EnemyWeaponDrops.cpp
index 0c591582..3fc9a236 100644
--- a/Tactical/XML_EnemyWeaponDrops.cpp
+++ b/Tactical/XML_EnemyWeaponDrops.cpp
@@ -1,32 +1,6 @@
 	#include "sgp.h"
-	#include "Overhead Types.h"
-	#include "Overhead.h"
-	#include "Event Pump.h"
-	#include "Weapons.h"
-	#include "Animation Control.h"
-	#include "Handle UI.h"
-	#include "Isometric Utils.h"
-	#include "math.h"
-	#include "ai.h"
-	#include "LOS.h"
-	#include "renderworld.h"
-	#include "Interface.h"
-	#include "message.h"
-	#include "Campaign.h"
-	#include "Items.h"
-	#include "Text.h"
-	#include "Soldier Profile.h"
-	#include "Dialogue Control.h"
-	#include "SkillCheck.h"
-	#include "Quests.h"
-	#include "physics.h"
-	#include "random.h"
-	#include "Vehicles.h"
-	#include "Bullets.h"
-	#include "Morale.h"
-	#include "SkillCheck.h"
-	#include "GameSettings.h"
-	#include "SaveLoadMap.h"
+	#include "FileMan.h"
+#include "Item Types.h"
 	#include "Debug Control.h"
 	#include "expat.h"
 	#include "XML.h"
diff --git a/Tactical/XML_Explosive.cpp b/Tactical/XML_Explosive.cpp
index b64ccc03..afa7a23b 100644
--- a/Tactical/XML_Explosive.cpp
+++ b/Tactical/XML_Explosive.cpp
@@ -1,5 +1,6 @@
 	#include "sgp.h"
-	#include "Overhead.h"
+	#include "FileMan.h"
+#include "Item Types.h"
 	#include "Weapons.h"
 	#include "Debug Control.h"
 	#include "expat.h"
diff --git a/Tactical/XML_Food.cpp b/Tactical/XML_Food.cpp
index 4840810e..6fc617d0 100644
--- a/Tactical/XML_Food.cpp
+++ b/Tactical/XML_Food.cpp
@@ -1,5 +1,6 @@
 	#include "sgp.h"
-	#include "Overhead.h"
+	#include "FileMan.h"
+#include "Soldier Control.h"
 	#include "Food.h"
 	#include "Debug Control.h"
 	#include "expat.h"
diff --git a/Tactical/XML_FoodOpinions.cpp b/Tactical/XML_FoodOpinions.cpp
index 7c602e47..fa24add6 100644
--- a/Tactical/XML_FoodOpinions.cpp
+++ b/Tactical/XML_FoodOpinions.cpp
@@ -1,5 +1,6 @@
 	#include "sgp.h"
-	#include "Overhead.h"
+	#include "FileMan.h"
+#include "Soldier Control.h"
 	#include "Food.h"
 	#include "Debug Control.h"
 	#include "expat.h"
diff --git a/Tactical/XML_IMPItemChoices.cpp b/Tactical/XML_IMPItemChoices.cpp
index f5f79c9e..7ef81c7e 100644
--- a/Tactical/XML_IMPItemChoices.cpp
+++ b/Tactical/XML_IMPItemChoices.cpp
@@ -1,6 +1,6 @@
 	#include "sgp.h"
-	#include "Overhead.h"
-	#include "Weapons.h"
+	#include "FileMan.h"
+#include "Item Types.h"
 	#include "Debug Control.h"
 	#include "expat.h"
 	#include "XML.h"
diff --git a/Tactical/XML_IncompatibleAttachments.cpp b/Tactical/XML_IncompatibleAttachments.cpp
index b73fe408..66a03010 100644
--- a/Tactical/XML_IncompatibleAttachments.cpp
+++ b/Tactical/XML_IncompatibleAttachments.cpp
@@ -1,6 +1,6 @@
 	#include "sgp.h"
-	#include "Overhead.h"
-	#include "Weapons.h"
+	#include "FileMan.h"
+#include "Item Types.h"
 	#include "Debug Control.h"
 	#include "expat.h"
 	#include "XML.h"
diff --git a/Tactical/XML_InteractiveTiles.cpp b/Tactical/XML_InteractiveTiles.cpp
index 665d43ec..f478ff6b 100644
--- a/Tactical/XML_InteractiveTiles.cpp
+++ b/Tactical/XML_InteractiveTiles.cpp
@@ -6,7 +6,7 @@
 #include "sgp.h"
 #include "Debug Control.h"
 #include "expat.h"
-#include "GameSettings.h"
+#include "Campaign Types.h"
 #include "XML.h"
 #include "FileMan.h"
 #include "Handle Items.h"
diff --git a/Tactical/XML_ItemAdjustments.cpp b/Tactical/XML_ItemAdjustments.cpp
index d528a304..f76d1228 100644
--- a/Tactical/XML_ItemAdjustments.cpp
+++ b/Tactical/XML_ItemAdjustments.cpp
@@ -1,6 +1,5 @@
 	#include "sgp.h"
-	#include "Overhead.h"
-	#include "Weapons.h"
+	#include "FileMan.h"
 	#include "Debug Control.h"
 	#include "expat.h"
 	#include "GameSettings.h"
diff --git a/Tactical/XML_Keys.cpp b/Tactical/XML_Keys.cpp
index dcaeb715..845592ec 100644
--- a/Tactical/XML_Keys.cpp
+++ b/Tactical/XML_Keys.cpp
@@ -2,7 +2,6 @@
 	#include "Debug Control.h"
 	#include "expat.h"
 	#include "XML.h"
-	#include "Interface.h"
 	#include "Keys.h"
 
 
diff --git a/Tactical/XML_LBEPocket.cpp b/Tactical/XML_LBEPocket.cpp
index 7810eedb..3c3cfbac 100644
--- a/Tactical/XML_LBEPocket.cpp
+++ b/Tactical/XML_LBEPocket.cpp
@@ -1,6 +1,6 @@
 	#include "sgp.h"
-	#include "Overhead.h"
-	#include "Weapons.h"
+	#include "FileMan.h"
+#include "Item Types.h"
 	#include "Debug Control.h"
 	#include "expat.h"
 	#include "XML.h"
diff --git a/Tactical/XML_LBEPocketPopup.cpp b/Tactical/XML_LBEPocketPopup.cpp
index 40c959bf..aa3467f0 100644
--- a/Tactical/XML_LBEPocketPopup.cpp
+++ b/Tactical/XML_LBEPocketPopup.cpp
@@ -4,7 +4,6 @@
 	#include "Debug Control.h"
 	#include "expat.h"
 	#include "XML.h"
-	#include "GameSettings.h"
 
 // namespace'd because of name collision with POPUP class def
 namespace POPUP_PARSE {
diff --git a/Tactical/XML_Launchable.cpp b/Tactical/XML_Launchable.cpp
index 40e7c6b9..b620387d 100644
--- a/Tactical/XML_Launchable.cpp
+++ b/Tactical/XML_Launchable.cpp
@@ -1,6 +1,6 @@
 	#include "sgp.h"
-	#include "Overhead.h"
-	#include "Weapons.h"
+	#include "FileMan.h"
+#include "Item Types.h"
 	#include "Debug Control.h"
 	#include "expat.h"
 	#include "XML.h"
diff --git a/Tactical/XML_LoadBearingEquipment.cpp b/Tactical/XML_LoadBearingEquipment.cpp
index e9135dd2..112acede 100644
--- a/Tactical/XML_LoadBearingEquipment.cpp
+++ b/Tactical/XML_LoadBearingEquipment.cpp
@@ -1,6 +1,6 @@
 	#include "sgp.h"
-	#include "Overhead.h"
-	#include "Weapons.h"
+	#include "FileMan.h"
+#include "Item Types.h"
 	#include "Debug Control.h"
 	#include "expat.h"
 	#include "XML.h"
diff --git a/Tactical/XML_Locks.cpp b/Tactical/XML_Locks.cpp
index ff252fd0..1f0d7c97 100644
--- a/Tactical/XML_Locks.cpp
+++ b/Tactical/XML_Locks.cpp
@@ -2,7 +2,6 @@
 	#include "Debug Control.h"
 	#include "expat.h"
 	#include "XML.h"
-	#include "Interface.h"
 	#include "Keys.h"
 
 
diff --git a/Tactical/XML_Magazine.cpp b/Tactical/XML_Magazine.cpp
index f2215eb2..373f065d 100644
--- a/Tactical/XML_Magazine.cpp
+++ b/Tactical/XML_Magazine.cpp
@@ -1,5 +1,6 @@
 	#include "sgp.h"
-	#include "Overhead.h"
+	#include "FileMan.h"
+#include "Item Types.h"
 	#include "Weapons.h"
 	#include "Debug Control.h"
 	#include "expat.h"
diff --git a/Tactical/XML_MercStartingGear.cpp b/Tactical/XML_MercStartingGear.cpp
index 69ce78e6..4b11a2b8 100644
--- a/Tactical/XML_MercStartingGear.cpp
+++ b/Tactical/XML_MercStartingGear.cpp
@@ -1,6 +1,6 @@
 	#include "sgp.h"
-	#include "Overhead.h"
-	#include "Weapons.h"
+	#include "FileMan.h"
+#include "Item Types.h"
 	#include "Debug Control.h"
 	#include "expat.h"
 	#include "XML.h"
diff --git a/Tactical/XML_Merchants.cpp b/Tactical/XML_Merchants.cpp
index f1c72ce0..bc129028 100644
--- a/Tactical/XML_Merchants.cpp
+++ b/Tactical/XML_Merchants.cpp
@@ -1,5 +1,5 @@
 	#include "sgp.h"
-	#include "Overhead.h"
+	#include "FileMan.h"
 	#include "Arms Dealer Init.h"
 	#include "Debug Control.h"
 	#include "expat.h"
diff --git a/Tactical/XML_Merge.cpp b/Tactical/XML_Merge.cpp
index f06064c8..1f437afc 100644
--- a/Tactical/XML_Merge.cpp
+++ b/Tactical/XML_Merge.cpp
@@ -1,6 +1,6 @@
 	#include "sgp.h"
-	#include "Overhead.h"
-	#include "Weapons.h"
+	#include "FileMan.h"
+#include "Item Types.h"
 	#include "Debug Control.h"
 	#include "expat.h"
 	#include "GameSettings.h"
diff --git a/Tactical/XML_NewFaceGear.cpp b/Tactical/XML_NewFaceGear.cpp
index 4bde7a05..7a63ebf0 100644
--- a/Tactical/XML_NewFaceGear.cpp
+++ b/Tactical/XML_NewFaceGear.cpp
@@ -2,7 +2,6 @@
 	#include "Debug Control.h"
 	#include "expat.h"
 	#include "XML.h"
-	#include "Interface.h"
 	#include "faces.h"
 
 struct
diff --git a/Tactical/XML_Opinions.cpp b/Tactical/XML_Opinions.cpp
index 9571b7f3..6e614d68 100644
--- a/Tactical/XML_Opinions.cpp
+++ b/Tactical/XML_Opinions.cpp
@@ -13,7 +13,8 @@
 	#include "sgp.h"
 	#include "Debug Control.h"
 	#include "expat.h"
-	#include "GameSettings.h"
+	#include "FileMan.h"
+#include "Item Types.h"
 	#include "XML.h"
 	#include "Soldier Profile.h"
 
diff --git a/Tactical/XML_Profiles.cpp b/Tactical/XML_Profiles.cpp
index adce87e4..79c868ac 100644
--- a/Tactical/XML_Profiles.cpp
+++ b/Tactical/XML_Profiles.cpp
@@ -16,7 +16,6 @@
 	#include "GameSettings.h"
 	#include "XML.h"
 	#include "Soldier Profile.h"
-		#include "Soldier Profile.h"
 //#define MAX_PROFILE_NAME_LENGTH 30
 
 struct
@@ -1179,7 +1178,6 @@ profileEndElementHandle(void *userData, const XML_Char *name)
 
 // Flugente hack: analyze profiles and print out the result
 #include <vfs/Core/vfs_file_raii.h>		// added by Flugente for vfs-stuff
-#include <fstream>
 #include <iostream>
 
 extern STR16 gzMercSkillTextNew[];
diff --git a/Tactical/XML_Qarray.cpp b/Tactical/XML_Qarray.cpp
index da806bcb..8bfb125e 100644
--- a/Tactical/XML_Qarray.cpp
+++ b/Tactical/XML_Qarray.cpp
@@ -2,7 +2,6 @@
 	#include "Debug Control.h"
 	#include "expat.h"
 	#include "XML.h"
-	#include "Interface.h"
 	#include "qarray.h"
 
 
diff --git a/Tactical/XML_RandomItem.cpp b/Tactical/XML_RandomItem.cpp
index 554d74c6..a175fb92 100644
--- a/Tactical/XML_RandomItem.cpp
+++ b/Tactical/XML_RandomItem.cpp
@@ -1,5 +1,5 @@
 	#include "sgp.h"
-	#include "Overhead.h"
+	#include "FileMan.h"
 	#include "Debug Control.h"
 	#include "expat.h"
 	#include "XML.h"
diff --git a/Tactical/XML_RandomStats.cpp b/Tactical/XML_RandomStats.cpp
index 73ee1838..9b932e3a 100644
--- a/Tactical/XML_RandomStats.cpp
+++ b/Tactical/XML_RandomStats.cpp
@@ -2,11 +2,8 @@
 	#include "Debug Control.h"
 	#include "expat.h"
 	#include "XML.h"
-	#include "Interface.h"
-
 #include "soldier profile type.h"
 #include "Soldier Profile.h"
-#include "random.h"
 
 struct
 {
diff --git a/Tactical/XML_SectorLoadscreens.cpp b/Tactical/XML_SectorLoadscreens.cpp
index ed2c1818..13e4a139 100644
--- a/Tactical/XML_SectorLoadscreens.cpp
+++ b/Tactical/XML_SectorLoadscreens.cpp
@@ -1,10 +1,9 @@
 	#include "sgp.h"
-	#include "Overhead.h"
-	#include "Weapons.h"
+	#include "FileMan.h"
+#include "Item Types.h"
 	#include "Debug Control.h"
 	#include "expat.h"
 	#include "XML.h"
-//	#include "SectorLoadscreens.h"
 
 struct
 {
diff --git a/Tactical/XML_SpreadPatterns.cpp b/Tactical/XML_SpreadPatterns.cpp
index 7a7f91a2..0f4b45f7 100644
--- a/Tactical/XML_SpreadPatterns.cpp
+++ b/Tactical/XML_SpreadPatterns.cpp
@@ -1,35 +1,8 @@
 //zilpin: pellet spread patterns externalized in XML
 	#include "sgp.h"
-	#include "Overhead Types.h"
-	#include "Soldier Control.h"
-	#include "Overhead.h"
-	#include "Event Pump.h"
-	#include "Weapons.h"
-	#include "Animation Control.h"
-	#include "Handle UI.h"
-	#include "Isometric Utils.h"
-	#include "math.h"
-	#include "ai.h"
+	#include "FileMan.h"
+#include "math.h"
 	#include "LOS.h"
-	#include "renderworld.h"
-	#include "Interface.h"
-	#include "message.h"
-	#include "Campaign.h"
-	#include "Items.h"
-	#include "Weapons.h"
-	#include "Text.h"
-	#include "Soldier Profile.h"
-	#include "Dialogue Control.h"
-	#include "SkillCheck.h"
-	#include "Quests.h"
-	#include "physics.h"
-	#include "random.h"
-	#include "Vehicles.h"
-	#include "Bullets.h"
-	#include "Morale.h"
-	#include "SkillCheck.h"
-	#include "GameSettings.h"
-	#include "SaveLoadMap.h"
 	#include "Debug Control.h"
 	#include "expat.h"
 	#include "XML.h"
diff --git a/Tactical/XML_TonyInventory.cpp b/Tactical/XML_TonyInventory.cpp
index 565a4a5c..f054be4c 100644
--- a/Tactical/XML_TonyInventory.cpp
+++ b/Tactical/XML_TonyInventory.cpp
@@ -1,6 +1,6 @@
 	#include "sgp.h"
-	#include "Overhead.h"
-	#include "Weapons.h"
+	#include "FileMan.h"
+#include "Item Types.h"
 	#include "Debug Control.h"
 	#include "expat.h"
 	#include "XML.h"
diff --git a/Tactical/XML_Vehicles.cpp b/Tactical/XML_Vehicles.cpp
index e40c6d81..afe278d9 100644
--- a/Tactical/XML_Vehicles.cpp
+++ b/Tactical/XML_Vehicles.cpp
@@ -2,7 +2,6 @@
 #include "Debug Control.h"
 #include "expat.h"
 #include "XML.h"
-#include "Interface.h"
 #include "Vehicles.h"
 
 struct
diff --git a/Tactical/bullets.cpp b/Tactical/bullets.cpp
index 852346fc..60bcda13 100644
--- a/Tactical/bullets.cpp
+++ b/Tactical/bullets.cpp
@@ -1,9 +1,8 @@
-	#include "builddefines.h"
-
+	#include <string.h>
 	#include "worlddef.h"
-	#include "sysutil.h"
+	#include <Isometric Utils.h>
 	#include "WCheck.h"
-	#include "vobject_blitters.h"
+	#include <shading.h>
 	#include "Overhead.h"
 	#include "Bullets.h"
 	#include "LOS.h"
diff --git a/Tactical/fov.cpp b/Tactical/fov.cpp
index 26f2d84e..ebca57ad 100644
--- a/Tactical/fov.cpp
+++ b/Tactical/fov.cpp
@@ -15,7 +15,6 @@
 	#include "english.h"
 	#include "random.h"
 	#include "input.h"
-	#include "Exit Grids.h"
 	#include "environment.h"
 	#include "worldman.h"
 	#include "Fog Of War.h"
diff --git a/Tactical/opplist.cpp b/Tactical/opplist.cpp
index 68eb337b..98919ce2 100644
--- a/Tactical/opplist.cpp
+++ b/Tactical/opplist.cpp
@@ -1,8 +1,6 @@
 	#include "sgp.h"
-	//#include "ai.h"
 	#include "Isometric Utils.h"
 	#include "Overhead.h"
-	#include "math.h"
 	#include "Event Pump.h"
 	#include "random.h"
 	#include "Overhead Types.h"
@@ -26,15 +24,12 @@
 	#include "Soldier macros.h"
 	#include "Soldier Functions.h"
 	#include "Handle UI.h"
-	#include "Queen Command.h"
 	#include "Keys.h"
 	#include "Campaign.h"
 	#include "Soldier Init List.h"
 	#include "Music Control.h"
-	#include "Soldier Profile.h"
 	#include "strategicmap.h"
 	#include "Quests.h"
-	#include "Meanwhile.h"
 	#include "worldman.h"
 	#include "SkillCheck.h"
 	#include "GameSettings.h"
@@ -42,24 +37,24 @@
 	#include "Game Clock.h"
 	#include "Civ Quotes.h"
 	#include "Sound Control.h"
-	#include "Drugs And Alcohol.h"
 	#include "Interface.h"
 	#include "Explosion Control.h"//dnl ch40 200909
 	#include "Vehicles.h"
-
-#ifdef JA2UB
-#include "Ja25_Tactical.h"
-#endif
-
 #include "GameInitOptionsScreen.h"
-
-#include "Music Control.h"
-
 #include "connect.h"
 #include "../ModularizedTacticalAI/include/Plan.h"
 #include "../ModularizedTacticalAI/include/PlanFactoryLibrary.h"
 #include "../ModularizedTacticalAI/include/AbstractPlanFactory.h"
 
+
+#ifdef JA2UB
+#include "Ja25_Tactical.h"
+#else
+#include "Meanwhile.h"
+#endif
+
+
+
 //rain
 //#define VIS_DIST_DECREASE_PER_RAIN_INTENSITY 20
 //end rain
diff --git a/TileEngine/Explosion Control.cpp b/TileEngine/Explosion Control.cpp
index fff3a2e1..0ec1a05b 100644
--- a/TileEngine/Explosion Control.cpp	
+++ b/TileEngine/Explosion Control.cpp	
@@ -1,5 +1,5 @@
 #include "builddefines.h"
-
+#include "WorldDat.h"
 #include "DEBUG.H"
 #include "Weapons.h"
 #include "worldman.h"
diff --git a/TileEngine/overhead map.cpp b/TileEngine/overhead map.cpp
index e67fd496..4bda376b 100644
--- a/TileEngine/overhead map.cpp	
+++ b/TileEngine/overhead map.cpp	
@@ -1,6 +1,7 @@
 #include "builddefines.h"
 
-	#include "sysutil.h"
+#include "WorldDat.h"
+#include "sysutil.h"
 	#include "Utilities.h"
 	#include "renderworld.h"
 	#include "vobject_blitters.h"