significantly cleaned up includes (by IoP)

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

GameSettings.cpp

@@ -34,7 +34,6 @@
 	#include "Queen Command.h"
 	#include "Game Clock.h"
 	#include "Init.h"
-	#include "displaycover.h"
 	#include "InterfaceItemImages.h"
 #endif
 

HelpScreen.cpp

@@ -5,7 +5,6 @@
 	#include	"Line.h"
 #else
 	#include "sgp.h"
-	#include "sys globals.h"
 	#include "sysutil.h"
 	#include "vobject_blitters.h"
 	#include "wcheck.h"
@@ -13,13 +12,11 @@
 	#include "font control.h"
 	#include "cursor control.h"
 	#include "render dirty.h"
-	#include "GameScreen.h"
 	#include	"Text.h"
 	#include	"Utilities.h"
 	#include	"WordWrap.h"
 	#include "Font Control.h"
 	#include "text.h"
-	#include "Multi Language Graphic Utils.h"
 	#include "HelpScreen.h"
 	#include "HelpScreenText.h"
 	#include "Line.h"

Init.cpp

@@ -10,7 +10,6 @@
 	#include "sgp.h"
 	#include "Gameloop.h"
 	#include "Screens.h"
-	#include "Wcheck.h"
 	#include "INIReader.h"
 	#include "vobject_blitters.h"
 	#include "renderworld.h"
@@ -25,14 +24,12 @@
 	#include "Utilities.h"
 	#include "Radar Screen.h"
 	#include "Render Dirty.h"
-	#include "cursors.h"
 	#include "Sound Control.h"
 	#include "Event Pump.h"
 	#include "lighting.h"
 	#include "Cursor Control.h"
 	#include "music control.h"
 	#include "video.h"
-	#include "sys globals.h"
 	#include "mapscreen.h"
 	#include "interface items.h"
 	#include "Maputility.h"
@@ -82,9 +79,7 @@
 
 
 #include "Civ Quotes.h"
-#include "Sector Summary.h"
 #include "LuaInitNPCs.h"
-#include "Encyclopedia_Data.h"
 #include "Encyclopedia.h"
 #include "AimArchives.h"
 

Intro.cpp

@@ -4,21 +4,15 @@
 	#include "Cinematics.h"
 #else
 	#include "sgp.h"
-	#include "sys globals.h"
 	#include "sysutil.h"
 	#include "vobject_blitters.h"
-	#include "wcheck.h"
-	#include "cursors.h"
 	#include "font control.h"
 	#include "cursor control.h"
 	#include "render dirty.h"
-	#include "GameScreen.h"
 	#include	"Text.h"
 	#include	"Utilities.h"
 	#include	"WordWrap.h"
-	#include "Font Control.h"
 	#include "text.h"
-	#include "Multi Language Graphic Utils.h"
 	#include "Line.h"
 	#include "Intro.h"
 	#include "Cinematics.h"
@@ -27,8 +21,6 @@
 	#include "Music Control.h"
 	#include "LibraryDataBase.h"
 	#include "english.h"
-	#include "Game Init.h"
-	#include "Soldier Profile.h"
 	#include "soldier profile type.h"
 	#include "MessageBoxScreen.h"
 	#include "sgp_logger.h"

Ja25Update.cpp

@@ -5,7 +5,6 @@
 #include <wchar.h>
 #include <stdio.h>
 #include <string.h>
-#include "wcheck.h"
 #include "Render Fun.h"
 #include "stdlib.h"
 #include "debug.h"
@@ -19,29 +18,18 @@
 #include <math.h>
 #include "pathai.h"
 #include "Random.h"
-#include "worldman.h"
 #include "Isometric Utils.h"
-#include "Render Dirty.h"
 #include "renderworld.h"
-#include "sys globals.h"
 #include "video.h"
-#include "points.h"
-#include "Win util.h"
-#include "Sound Control.h"
 #include "weapons.h"
 #include "vobject_blitters.h"
 #include "Handle UI.h"
-#include "soldier ani.h"
 #include "Event pump.h"
-#include "opplist.h"
 #include "ai.h"
 #include "interface.h"
 #include "lighting.h"
 #include "faces.h"
 #include "Soldier Profile.h"
-#include "gap.h"
-#include "interface panels.h"
-#include "campaign.h"
 #include "soldier macros.h"
 #include "english.h"
 #include "Squads.h"
@@ -50,7 +38,6 @@
 #include "Networking.h"
 #include "NetworkEvent.h"
 #endif
-#include "structure wrap.h"
 #include "items.h"
 #include "Soundman.h"
 #include "utilities.h"
@@ -60,41 +47,24 @@
 #include "Keys.h"
 #include "dialogue control.h"
 #include "soldier functions.h"
-#include "rt time defines.h"
 #include "Exit Grids.h"
-#include "gamescreen.h"
 #include "Quests.h"
 #include "message.h"
-#include "NPC.h"
 #include "SkillCheck.h"
-#include "handle doors.h"
 #include "interface dialogue.h"
-#include "smokeeffects.h"
 #include	"GameSettings.h"
-#include "tile animation.h"
 #include "ShopKeeper Interface.h"
-#include "Arms Dealer Init.h"
 #include "vehicles.h"
-#include "rotting corpses.h"
-#include "Interface Control.h"
 #include "strategicmap.h"
 #include "morale.h"
-#include "meanwhile.h"
 #include "drugs and alcohol.h"
 #include "SkillCheck.h"
-#include "boxing.h"
-#include "overhead map.h"
 #include "Map Information.h"
-#include "environment.h"
-#include "Game Clock.h"
-#include "Explosion Control.h"
 #include "Buildings.h"
 #include "Text.h"
-#include "Strategic Merc Handler.h"
 #include "Campaign Types.h"
 #include "Strategic Status.h"
 #include "civ quotes.h"
-#include "Strategic Pathing.h"
 #include "Debug Control.h"
 #endif
 
@@ -128,4 +98,4 @@ typedef struct
 
 #endif														
 
-//******************************************************************************
+//******************************************************************************

Laptop/AimLinks.cpp

@@ -4,7 +4,6 @@
 	#include "laptop.h"
 	#include "AimLinks.h"
 	#include "aim.h"
-	#include "Utilities.h"
 	#include "WCheck.h"
 	#include "WordWrap.h"
 	#include "Text.h"

Laptop/AimSort.cpp

@@ -9,7 +9,6 @@
 	#include "WordWrap.h"
 	#include "Soldier Profile.h"
 	#include "stdlib.h"
-	#include "Game Clock.h"
 	#include "Text.h"
 	#include "Multi Language Graphic Utils.h"
 	#include "english.h"

Laptop/BobbyRAmmo.cpp

@@ -8,8 +8,6 @@
 	#include "Utilities.h"
 	#include "WCheck.h"
 	#include "WordWrap.h"
-	#include "Cursors.h"
-	#include "interface items.h"
 	#include "Encrypted File.h"
 	#include "text.h"
 #endif

Laptop/BobbyRArmour.cpp

@@ -8,7 +8,6 @@
 	#include "Utilities.h"
 	#include "WCheck.h"
 	#include "WordWrap.h"
-	#include "Cursors.h"
 	#include "Text.h"
 #endif
 

Laptop/BobbyRGuns.cpp

@@ -14,7 +14,6 @@
 	#include "Store Inventory.h"
 	#include "LaptopSave.h"
 	#include "Finances.h"
-	#include "AimMembers.h"
 	#include "Overhead.h"
 	#include "Weapons.h"
 	#include "GameSettings.h"
@@ -4298,4 +4297,4 @@ void GetHelpTextForItemInLaptop( STR16 pzStr, UINT16 usItemNumber )
 		}
 		break;
 	}
-}
+}

Laptop/BobbyRMailOrder.cpp

@@ -32,7 +32,6 @@
 #include "connect.h"
 #include "GameSettings.h"
 #include <vfs/Core/vfs.h>
-#include <vfs/Core/vfs_file_raii.h>
 #include <vfs/Core/File/vfs_file.h>
 
 /*

Laptop/BobbyRMisc.cpp

@@ -8,7 +8,6 @@
 	#include "Utilities.h"
 	#include "WCheck.h"
 	#include "WordWrap.h"
-	#include "Cursors.h"
 	#include "Text.h"
 #endif
 

Laptop/BobbyRUsed.cpp

@@ -8,9 +8,7 @@
 	#include "Utilities.h"
 	#include "WCheck.h"
 	#include "WordWrap.h"
-	#include "Cursors.h"
 	#include "Text.h"
-	#include "LaptopSave.h"
 #endif
 
 UINT32		guiUsedBackground;

Laptop/BriefingRoom.cpp

@@ -11,8 +11,6 @@
 	#include "email.h"
 	#include "Game Clock.h"
 	#include "Text.h"
-	#include "LaptopSave.h"
-	#include "Multi Language Graphic Utils.h"
 	#include "soldier profile type.h"
 #endif
 
@@ -593,4 +591,4 @@ void ResetActivationBriefingRoomStringTextBox(void)
 	uiCursorBriefingRoomPosition = StringPixLength( pPlayerBriefingRoomActivationString, FONT14ARIAL ) + IMP_PLAYER_ACTIVATION_STRING_X;
 	DisplayPlayerActivationBriefingRoomString();
 	DisplayActivationBriefingRoomStringCursor();
-}
+}

Laptop/BriefingRoomM.cpp

@@ -11,8 +11,6 @@
 	#include "email.h"
 	#include "Game Clock.h"
 	#include "Text.h"
-	#include "LaptopSave.h"
-	#include "Multi Language Graphic Utils.h"
 	#include "soldier profile type.h"
 #endif
 
@@ -662,4 +660,4 @@ void ResetActivationBriefingRoomEnterStringTextBox(void)
 	uiCursorBriefingRoomEnterPosition = StringPixLength( pPlayerBriefingRoomEnterActivationString, FONT14ARIAL ) + IMP_PLAYER_ACTIVATION_STRING_X;
 	DisplayPlayerActivationBriefingRoomEnterString();
 	DisplayActivationBriefingRoomEnterStringCursor();
-}
+}

Laptop/Encyclopedia.cpp

@@ -2,8 +2,6 @@
 	#include "Laptop All.h"
 #else
 	#include "Laptop All.h"
-	#include "Utilities.h"
-	#include "WCheck.h"
 	#include "timer control.h"
 	#include "Debug.h"
 	#include "WordWrap.h"
@@ -11,8 +9,6 @@
 	#include "email.h"
 	#include "Game Clock.h"
 	#include "Text.h"
-	#include "LaptopSave.h"
-	#include "Multi Language Graphic Utils.h"
 	#include "soldier profile type.h"
 #endif
 

Laptop/Encyclopedia_Data.cpp

@@ -8,7 +8,6 @@
 	#include "WCheck.h"
 	#include "WordWrap.h"
 	#include "Text.h"
-	#include "Multi Language Graphic Utils.h"
 	#include "Encrypted File.h"
 	#include "Soldier Profile.h"
 #endif	
@@ -16,7 +15,6 @@
 #include "Encyclopedia_Data.h"
 #include "Encyclopedia.h"
 #include "Quests.h"
-#include "Tactical Save.h"
 
 #define MAX_FILTR_LOCATION_BUTTONS 11
 #define FILTR_INVENTORY_BUTTONS 5
@@ -3131,4 +3129,4 @@ void BtnEncyclopediaTogglesCallback( GUI_BUTTON *btn, INT32 reason )
 		}
 	}
 }
-*/
+*/

Laptop/IMP AboutUs.cpp

@@ -5,10 +5,8 @@
 	#include "CharProfile.h"
 	#include "IMPVideoObjects.h"
 	#include "Utilities.h"
-	#include "WCheck.h"
 	#include "Debug.h"
 	#include "WordWrap.h"
-	#include "Render Dirty.h"
 	#include "Encrypted File.h"
 	#include "cursors.h"
 	#include "laptop.h"

Laptop/IMP Attribute Entrance.cpp

@@ -4,13 +4,10 @@
 	#include "CharProfile.h"
 	#include "IMP Attribute Entrance.h"
 	#include "IMP MainPage.h"
-	#include "IMP HomePage.h"
 	#include "IMPVideoObjects.h"
 	#include "Utilities.h"
-	#include "WCheck.h"
 	#include "Debug.h"
 	#include "WordWrap.h"
-	#include "Render Dirty.h"
 	#include "Encrypted File.h"
 	#include "cursors.h"
 	#include "laptop.h"

Laptop/IMP Attribute Finish.cpp

@@ -4,15 +4,12 @@
 	#include "CharProfile.h"
 	#include "IMP Attribute Finish.h"
 	#include "IMP MainPage.h"
-	#include "IMP HomePage.h"
 	#include "IMPVideoObjects.h"
 	#include "Utilities.h"
-	#include "WCheck.h"
 	#include "input.h"
 	#include "Isometric Utils.h"
 	#include "Debug.h"
 	#include "WordWrap.h"
-	#include "Render Dirty.h"
 	#include "Encrypted File.h"
 	#include "cursors.h"
 	#include "laptop.h"

Laptop/IMP Attribute Selection.cpp

@@ -6,16 +6,13 @@
 	#include "CharProfile.h"
 	#include "IMP Attribute Selection.h"
 	#include "IMP MainPage.h"
-	#include "IMP HomePage.h"
 	#include "IMPVideoObjects.h"
 	#include "Utilities.h"
-	#include "WCheck.h"
 	#include "input.h"
 	#include "Isometric Utils.h"
 	#include "IMP Skill Trait.h"
 	#include "Debug.h"
 	#include "WordWrap.h"
-	#include "Render Dirty.h"
 	#include "Encrypted File.h"
 	#include "cursors.h"
 	#include "laptop.h"
@@ -2238,4 +2235,4 @@ INT8 StartingLevelChosen()
 		return(iStartingLevel);
 	else
 		return(1);
-}
+}

Laptop/IMP Begin Screen.cpp

@@ -7,11 +7,9 @@
 	#include "IMP HomePage.h"
 	#include "IMPVideoObjects.h"
 	#include "Utilities.h"
-	#include "WCheck.h"
 	#include "Timer Control.h"
 	#include "Debug.h"
 	#include "WordWrap.h"
-	#include "Render Dirty.h"
 	#include "Encrypted File.h"
 	#include "cursors.h"
 	#include "laptop.h"
@@ -21,18 +19,15 @@
 	#include "messageboxscreen.h"
 	#include "Soldier Profile Type.h"
 	#include "IMP Portraits.h"
-	#include "IMP Voices.h"
 	#include "IMP Attribute Selection.h"
 	#include "english.h"
 	#include "line.h"
 	#include "Merc Hiring.h"
 	#include "strategic.h"
-	#include "Game Clock.h"
 	#include "text.h"
 	#include "LaptopSave.h"
 #endif
 
-#include <vfs/Tools/vfs_parser_tools.h>
 
 #define FULL_NAME_CURSOR_Y LAPTOP_SCREEN_WEB_UL_Y + 138
 #define NICK_NAME_CURSOR_Y LAPTOP_SCREEN_WEB_UL_Y + 195

Laptop/IMP Character Trait.cpp

@@ -17,8 +17,6 @@
 	#include "_Ja25EnglishText.h"
 	#include "wordwrap.h"
 	#include "CharProfile.h"
-	#include "soldier profile type.h"
-	#include "IMP Compile Character.h"
 	#include "GameSettings.h"
 #endif
 
@@ -493,4 +491,4 @@ void AssignCharacterTraitHelpText( UINT8 ubNumber )
 	SetRegionHelpEndCallback( &gMR_CharacterTraitHelpTextRegions[ubNumber], MSYS_NO_CALLBACK );
 
 	return;
-}
+}

Laptop/IMP Character and Disability Entrance.cpp

@@ -4,13 +4,10 @@
 	#include "CharProfile.h"
 	#include "IMP Character and Disability Entrance.h"
 	#include "IMP MainPage.h"
-	#include "IMP HomePage.h"
 	#include "IMPVideoObjects.h"
 	#include "Utilities.h"
-	#include "WCheck.h"
 	#include "Debug.h"
 	#include "WordWrap.h"
-	#include "Render Dirty.h"
 	#include "Encrypted File.h"
 	#include "cursors.h"
 	#include "laptop.h"

Laptop/IMP Color Choosing.cpp

@@ -14,13 +14,10 @@
 	#include "cursors.h"
 	#include "IMP MainPage.h"
 	#include "IMPVideoObjects.h"
-	#include "_Ja25EnglishText.h"
 	#include "wordwrap.h"
 	#include "CharProfile.h"
 	#include "soldier profile type.h"
-	#include "IMP Compile Character.h"
 	#include "IMP Portraits.h"
-	#include "IMP Begin Screen.h"
 	#include "WCheck.h"
 	#include "Animation Data.h"
 	#include "GameSettings.h"
@@ -1204,4 +1201,4 @@ void SetBadAss( BOOLEAN fSetTrue )
 		bBadAss = TRUE;
 	else
 		bBadAss = FALSE;
-}
+}

Laptop/IMP Compile Character.cpp

@@ -6,29 +6,17 @@
 	#include "laptop.h"
 	#include "CharProfile.h"
 	#include "Utilities.h"
-	#include "WCheck.h"
 	#include "Debug.h"
 	#include "WordWrap.h"
-	#include "Render Dirty.h"
 	#include "Encrypted File.h"
-	#include "cursors.h"
 	#include "GameSettings.h"
-	#include "IMP HomePage.h"
 	#include "IMPVideoObjects.h"
-	#include "IMP AboutUs.h"
 	#include "IMP MainPage.h"
-	#include "IMP Begin Screen.h"
 	#include "IMP Personality Entrance.h"
-	#include "IMP Personality Quiz.h"
-	#include "IMP Personality Finish.h"
 	#include "IMP Skill Trait.h"
-	#include "IMP Attribute Entrance.h"
 	#include "IMP Attribute Selection.h"
-	#include "IMP Attribute Finish.h"
 	#include "IMP Portraits.h"
 	#include "IMP Compile Character.h"
-	#include "IMP Voices.h"
-	#include "IMP Finish.h"
 	#include "Soldier Profile Type.h"
 	#include "Soldier Profile.h"
 	#include "Animation Data.h"

Laptop/IMP Confirm.cpp

@@ -6,10 +6,8 @@
 	#include "IMP HomePage.h"
 	#include "IMPVideoObjects.h"
 	#include "Utilities.h"
-	#include "WCheck.h"
 	#include "Debug.h"
 	#include "WordWrap.h"
-	#include "Render Dirty.h"
 	#include "Encrypted File.h"
 	#include "cursors.h"
 	#include "laptop.h"
@@ -22,7 +20,6 @@
 	#include "Soldier Profile Type.h"
 	#include "Soldier Control.h"
 	#include "IMP Portraits.h"
-	#include "IMP Voices.h"
 	#include "Overhead.h"
 	#include "finances.h"
 	#include "history.h"
@@ -34,7 +31,6 @@
 	#include "weapons.h"
 	#include "Random.h"
 	#include "GameVersion.h"
-	#include "faces.h"
 	#include "GameSettings.h"
 #endif
 

Laptop/IMP Disability Trait.cpp

@@ -17,8 +17,6 @@
 	#include "_Ja25EnglishText.h"
 	#include "wordwrap.h"
 	#include "CharProfile.h"
-	#include "soldier profile type.h"
-	#include "IMP Compile Character.h"
 	#include "GameSettings.h"
 #endif
 
@@ -505,4 +503,4 @@ void AssignDisabilityHelpText( UINT8 ubNumber )
 	SetRegionHelpEndCallback( &gMR_DisabilityHelpTextRegions[ubNumber], MSYS_NO_CALLBACK );
 
 	return;
-}
+}

Laptop/IMP Finish.cpp

@@ -4,7 +4,6 @@
 	#include "CharProfile.h"
 	#include "IMP Finish.h"
 	#include "IMP Portraits.h"
-	#include "IMP HomePage.h"
 	#include "IMP MainPage.h"
 	#include "IMP Voices.h"
 	#include "IMPVideoObjects.h"
@@ -13,14 +12,12 @@
 	#include "Timer Control.h"
 	#include "Debug.h"
 	#include "WordWrap.h"
-	#include "Render Dirty.h"
 	#include "Encrypted File.h"
 	#include "cursors.h"
 	#include "laptop.h"
 	#include "IMP Attribute Selection.h"
 	#include "IMP Text System.h"
 	#include "soundman.h"
-	#include "IMP Compile Character.h"
 	#include "text.h"
 #endif
 

Laptop/IMP HomePage.cpp

@@ -6,11 +6,9 @@
 	#include "IMP HomePage.h"
 	#include "IMPVideoObjects.h"
 	#include "Utilities.h"
-	#include "WCheck.h"
 	#include "Debug.h"
 	#include "WordWrap.h"
 	#include "IMP Compile Character.h"
-	#include "Render Dirty.h"
 	#include "Encrypted File.h"
 	#include "cursors.h"
 	#include "laptop.h"

Laptop/IMP MainPage.cpp

@@ -8,18 +8,15 @@
 	#include "WCheck.h"
 	#include "Debug.h"
 	#include "WordWrap.h"
-	#include "Render Dirty.h"
 	#include "Encrypted File.h"
 	#include "cursors.h"
 	#include "laptop.h"
-	#include "finances.h"
 	#include "IMP Attribute Selection.h"
 	#include "IMP Text System.h"
 	#include "IMP Finish.h"
 	#include "mousesystem.h"
 	#include "Merc Hiring.h"
 	#include "LaptopSave.h"
-	#include "IMP Compile Character.h"
 	#include "IMP Portraits.h"
 	#include "soldier profile type.h"
 	#include "GameSettings.h"

Laptop/IMP Personality Entrance.cpp

@@ -4,13 +4,10 @@
 	#include "CharProfile.h"
 	#include "IMP Personality Entrance.h"
 	#include "IMP MainPage.h"
-	#include "IMP HomePage.h"
 	#include "IMPVideoObjects.h"
 	#include "Utilities.h"
-	#include "WCheck.h"
 	#include "Debug.h"
 	#include "WordWrap.h"
-	#include "Render Dirty.h"
 	#include "Encrypted File.h"
 	#include "cursors.h"
 	#include "laptop.h"

Laptop/IMP Personality Finish.cpp

@@ -4,14 +4,10 @@
 	#include "CharProfile.h"
 	#include "IMP Personality Finish.h"
 	#include "IMP MainPage.h"
-	#include "IMP HomePage.h"
 	#include "IMPVideoObjects.h"
 	#include "Utilities.h"
-	#include "WCheck.h"
-	#include "Timer Control.h"
 	#include "Debug.h"
 	#include "WordWrap.h"
-	#include "Render Dirty.h"
 	#include "Encrypted File.h"
 	#include "cursors.h"
 	#include "laptop.h"

Laptop/IMP Personality Quiz.cpp

@@ -4,13 +4,10 @@
 	#include "CharProfile.h"
 	#include "IMP Personality Quiz.h"
 	#include "IMP MainPage.h"
-	#include "IMP HomePage.h"
 	#include "IMPVideoObjects.h"
 	#include "Utilities.h"
-	#include "WCheck.h"
 	#include "Debug.h"
 	#include "WordWrap.h"
-	#include "Render Dirty.h"
 	#include "Encrypted File.h"
 	#include "cursors.h"
 	#include "laptop.h"

Laptop/IMP Portraits.cpp

@@ -4,7 +4,6 @@
 	#include "CharProfile.h"
 	#include "IMP Portraits.h"
 	#include "IMP MainPage.h"
-	#include "IMP HomePage.h"
 	#include "IMPVideoObjects.h"
 	#include "Utilities.h"
 	#include "WCheck.h"
@@ -12,13 +11,10 @@
 	#include "Isometric Utils.h"
 	#include "Debug.h"
 	#include "WordWrap.h"
-	#include "Render Dirty.h"
 	#include "Encrypted File.h"
 	#include "cursors.h"
 	#include "laptop.h"
 	#include "IMP Text System.h"
-	#include "IMP Voices.h"
-	#include "IMP Compile Character.h"
 #endif
 
 #include "IMP Confirm.h"

Laptop/IMP Text System.cpp

@@ -3,7 +3,6 @@
 #else
 	#include "WordWrap.h"
 	#include "sgp.h"
-	#include "Render Dirty.h"
 	#include "Encrypted File.h"
 	#include "IMP Text System.h"
 	#include "CharProfile.h"
@@ -24,7 +23,6 @@
 	#include "WCheck.h"
 	#include "Debug.h"
 	#include "WordWrap.h"
-	#include "Render Dirty.h"
 	#include "Encrypted File.h"
 	#include "cursors.h"
 	#include "soldier profile.h"

Laptop/IMP Voices.cpp

@@ -4,15 +4,12 @@
 	#include "CharProfile.h"
 	#include "IMP Voices.h"
 	#include "IMP MainPage.h"
-	#include "IMP HomePage.h"
 	#include "IMPVideoObjects.h"
 	#include "Utilities.h"
-	#include "WCheck.h"
 	#include "input.h"
 	#include "Isometric Utils.h"
 	#include "Debug.h"
 	#include "WordWrap.h"
-	#include "Render Dirty.h"
 	#include "Encrypted File.h"
 	#include "cursors.h"
 	#include "laptop.h"

Laptop/IMPVideoObjects.cpp

@@ -6,10 +6,7 @@
 	#include "WCheck.h"
 	#include "Debug.h"
 	#include "WordWrap.h"
-	#include "Render Dirty.h"
 	#include "Encrypted File.h"
-	#include "cursors.h"
-	#include "IMP HomePage.h"
 	#include "laptop.h"
 	#include "Multi Language Graphic Utils.h"
 	#include "IMP Attribute Selection.h"

Laptop/XML_Email.cpp

@@ -8,7 +8,6 @@
 	#include "expat.h"
 	#include "XML.h"
 	#include "Interface.h"
-	#include "Item Statistics.h"
 	#include "LuaInitNPCs.h"
 	#include "email.h"
 #endif

Laptop/XML_EmailMercAvailable.cpp

@@ -8,7 +8,6 @@
 	#include "expat.h"
 	#include "XML.h"
 	#include "Interface.h"
-	#include "Item Statistics.h"
 	#include "LuaInitNPCs.h"
 	#include "email.h"
 #endif

Laptop/XML_EmailMercLevelUp.cpp

@@ -8,7 +8,6 @@
 	#include "expat.h"
 	#include "XML.h"
 	#include "Interface.h"
-	#include "Item Statistics.h"
 	#include "LuaInitNPCs.h"
 	#include "email.h"
 #endif

Laptop/XML_EncyclopediaLocation.cpp

@@ -8,7 +8,6 @@
 	#include "expat.h"
 	#include "XML.h"
 	#include "Interface.h"
-	#include "Item Statistics.h"
 	#include "LuaInitNPCs.h"
 	#include "email.h"
 	#include "InterfaceItemImages.h"

Laptop/XML_IMPPortraits.cpp

@@ -7,7 +7,6 @@
 	#include "XML.h"
 	#include "Interface.h"
 	#include "IMP Confirm.h"
-	#include "IMP Portraits.h"
 	#include "Soldier Profile.h"
 #endif
 

Laptop/email.cpp

@@ -7,16 +7,13 @@
 	#include "WCheck.h"
 	#include "Debug.h"
 	#include "WordWrap.h"
-	#include "Render Dirty.h"
 	#include "Encrypted File.h"
 	#include "cursors.h"
 	#include "soldier profile.h"
 	#include "CharProfile.h"
 	#include "IMP Compile Character.h"
-	#include "IMP Voices.h"
 	#include "IMP Portraits.h"
 	#include "Game Clock.h"
-	#include "environment.h"
 	#include "AimMembers.h"
 	#include "Random.h"
 	#include "Text.h"

Laptop/files.cpp

@@ -10,7 +10,6 @@
 	#include "WCheck.h"
 	#include "Debug.h"
 	#include "WordWrap.h"
-	#include "Render Dirty.h"
 	#include "Encrypted File.h"
 	#include "cursors.h"
 	#include "email.h"

Laptop/finances.cpp

@@ -8,7 +8,6 @@
 	#include "WCheck.h"
 	#include "Debug.h"
 	#include "WordWrap.h"
-	#include "Render Dirty.h"
 	#include "Encrypted File.h"
 	#include "cursors.h"
 	#include "Soldier Profile.h"

Laptop/florist Cards.cpp

@@ -9,7 +9,6 @@
 	#include "WordWrap.h"
 	#include "Cursors.h"
 	#include "Encrypted File.h"
-	#include "Florist Gallery.h"
 	#include "Text.h"
 #endif
 

Laptop/history.cpp

@@ -8,7 +8,6 @@
 	#include "WCheck.h"
 	#include "Debug.h"
 	#include "WordWrap.h"
-	#include "Render Dirty.h"
 	#include "Encrypted File.h"
 	#include "cursors.h"
 	#include "Soldier Profile.h"

Laptop/personnel.cpp

@@ -7,7 +7,6 @@
 	#include "WCheck.h"
 	#include "Debug.h"
 	#include "WordWrap.h"
-	#include "Render Dirty.h"
 	#include "Encrypted File.h"
 	#include "cursors.h"
 	#include "Overhead.h"
@@ -17,7 +16,6 @@
 	#include "Game Clock.h"
 	#include "finances.h"
 	#include "LaptopSave.h"
-	#include "AimMembers.h"
 	#include "Map Screen Interface Map.h"
 	#include "input.h"
 	#include "english.h"

MPChatScreen.cpp

@@ -4,21 +4,17 @@
 	#include "sgp.h"
 	#include "screenids.h"
 	#include "Timer Control.h"
-	#include "sys globals.h"
 	#include "fade screen.h"
 	#include "sysutil.h"
 	#include "vobject_blitters.h"
 	#include "MercTextBox.h"
-	#include "wcheck.h"
 	#include "cursors.h"
 	#include "font control.h"
-	#include "Game Clock.h"
 	#include "Map Screen Interface.h"
 	#include "renderworld.h"
 	#include "gameloop.h"
 	#include "english.h"
 	#include "GameSettings.h"
-	#include "Interface Control.h"
 	#include "cursor control.h"
 	#include "laptop.h"
 	#include "text.h"
@@ -26,7 +22,6 @@
 	#include "overhead map.h"
 	#include "MPChatScreen.h"
 	#include "WordWrap.h"
-	#include "Render Dirty.h"
 #include "message.h"
 #include "utilities.h"
 #include "connect.h"
@@ -1611,4 +1606,4 @@ void ClearWrappedStringsCHAT( WRAPPED_STRING *pStringWrapperHead )
 
 	pStringWrapperHead = NULL;
 
-}
+}

MPConnectScreen.cpp

@@ -1,6 +1,5 @@
 #ifdef PRECOMPILEDHEADERS
 	#include "JA2 All.h"
-	#include "Intro.h"
 #else
 	#include "Types.h"
 	#include "MPConnectScreen.h"
@@ -18,12 +17,9 @@
 	#include "Cursor Control.h"
 	#include "Music Control.h"
 	#include "cursors.h"
-	#include "Intro.h"
 	#include "Text.h"
 	#include "Text Input.h"
-	#include "_Ja25EnglishText.h"
 	#include "Soldier Profile.h"
-	#include "Loading Screen.h"
 	#include "Animated ProgressBar.h"
 	#include "mainmenuscreen.h"
 #endif
@@ -32,7 +28,6 @@
 #include "Game Init.h"
 #include "connect.h"
 #include "network.h" // for client name
-#include "saveloadscreen.h"
 #include "message.h"
 #include "init.h"
 #include "xml.h"

MPHostScreen.cpp

@@ -16,7 +16,6 @@
 	#include "Sysutil.h"
 	#include "Fade Screen.h"
 	#include "Cursor Control.h"
-	#include "Music Control.h"
 	#include "cursors.h"
 	#include "Intro.h"
 	#include "Text.h"
@@ -2864,4 +2863,4 @@ void RenderMPHSmallSelectionFrame(INT16 sX, INT16 sY)
 	BltVideoObject(FRAME_BUFFER, hHandle, 0, sX, sY , VO_BLT_SRCTRANSPARENCY,NULL);
 
 	return;
-}
+}

MPJoinScreen.cpp

@@ -1,6 +1,5 @@
 #ifdef PRECOMPILEDHEADERS
 	#include "JA2 All.h"
-	#include "Intro.h"
 #else
 	#include "Types.h"
 	#include "MPJoinScreen.h"
@@ -16,12 +15,9 @@
 	#include "Sysutil.h"
 	#include "Fade Screen.h"
 	#include "Cursor Control.h"
-	#include "Music Control.h"
 	#include "cursors.h"
-	#include "Intro.h"
 	#include "Text.h"
 	#include "Text Input.h"
-	#include "_Ja25EnglishText.h"
 	#include "Soldier Profile.h"
 #endif
 
@@ -799,4 +795,4 @@ void DoneFadeOutForExitMPJScreen( void )
 void DoneFadeInForExitMPJScreen( void )
 {
 	SetCurrentCursorFromDatabase( VIDEO_NO_CURSOR );
-}
+}

MPScoreScreen.cpp

@@ -21,7 +21,6 @@
 	#include "Intro.h"
 	#include "Text.h"
 	#include "Text Input.h"
-	#include "_Ja25EnglishText.h"
 	#include "Soldier Profile.h"
 #endif
 
@@ -29,7 +28,6 @@
 #include "Game Init.h"
 #include "connect.h"
 #include "network.h" // for client name
-#include "saveloadscreen.h"
 
 
 ////////////////////////////////////////////
@@ -657,4 +655,4 @@ void BtnMPSContinueCallback(GUI_BUTTON *btn,INT32 reason)
 
 		InvalidateRegion(btn->Area.RegionTopLeftX, btn->Area.RegionTopLeftY, btn->Area.RegionBottomRightX, btn->Area.RegionBottomRightY);
 	}
-}
+}

MainMenuScreen.cpp

@@ -5,12 +5,9 @@
 	#include "sgp.h"
 	#include "screenids.h"
 	#include "Timer Control.h"
-	#include "sys globals.h"
-	#include "fade screen.h"
 	#include "sysutil.h"
 	#include "vobject_blitters.h"
 	#include "MercTextBox.h"
-	#include "wcheck.h"
 	#include "cursors.h"
 	#include "font control.h"
 	#include "mainmenuscreen.h"
@@ -18,7 +15,6 @@
 	#include "render dirty.h"
 	#include "music control.h"
 	#include "GameSettings.h"
-	#include "GameScreen.h"
 	#include "SaveLoadScreen.h"
 	#include "SaveLoadGame.h"
 	#include "Options Screen.h"
@@ -32,10 +28,8 @@
 	#include "Multi Language Graphic Utils.h"
 	#include "Encrypted File.h"
 	#include "ja2 splash.h"
-	#include "GameVersion.h"
 #endif
 
-#include "mercs.h"
 #include "gamesettings.h"
 #include "connect.h"
 #include "strategic.h"

MessageBoxScreen.cpp

@@ -3,17 +3,13 @@
 #else
 	#include "sgp.h"
 	#include "screenids.h"
-	#include "Timer Control.h"
-	#include "sys globals.h"
 	#include "fade screen.h"
 	#include "sysutil.h"
 	#include "vobject_blitters.h"
 	#include "MercTextBox.h"
-	#include "wcheck.h"
 	#include "cursors.h"
 	#include "messageboxscreen.h"
 	#include "font control.h"
-	#include "Game Clock.h"
 	#include "Map Screen Interface.h"
 	#include "renderworld.h"
 	#include "gameloop.h"

SaveLoadGame.cpp

@@ -48,7 +48,6 @@
 	#include "GameVersion.h"
 	#include "GameSettings.h"
 	#include "Music Control.h"
-	#include "GameScreen.h"
 	#include "Options Screen.h"
 	#include "Ai.h"
 	#include "RenderWorld.h"
@@ -138,7 +137,6 @@
 
 #include <vfs/Core/vfs.h>
 //rain
-#include "Rain.h"
 //end rain
 
 #include "connect.h"

SaveLoadScreen.cpp

@@ -30,7 +30,6 @@
 	#include	"English.h"
 	#include	"Gameloop.h"
 	#include	"Game Init.h"
-	#include	"Sys Globals.h"
 	#include	"Text.h"
 	#include	"Message.h"
 	#include	"Map Screen Interface.h"
@@ -39,7 +38,6 @@
 	#include	"PostalService.h"
 #endif
 
-#include "Campaign Init.h"
 #include "connect.h"
 
 #ifdef JA2UB
@@ -2923,4 +2921,4 @@ BOOLEAN LoadDataSaveFromLoadGameFile( HWFILE hFile )
 	}
 
 	return( TRUE );
-}
+}

Standard Gaming Platform/Cursor Control.cpp

@@ -11,7 +11,6 @@
 	#include "video2.h"
 	#endif
 
-	#include "wcheck.h"
 #endif
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////

Standard Gaming Platform/DEBUG.cpp

@@ -25,14 +25,10 @@
 
 	#include "types.h"
 	#include <windows.h>
-	#include <ddeml.h>
 	#include <stdio.h>
 	#include <string>
 	#include <sstream>
 	#include "debug.h"
-	#include "WCheck.h"
-	#include "TopicIDs.h"
-	#include "TopicOps.h"
 	#include "WizShare.h"
 
 	//Kris addition

Standard Gaming Platform/DirectDraw Calls.cpp

@@ -8,7 +8,6 @@
 
 	#include <ddraw.h>
 	#include "debug.h"
-	#include "video_private.h"
 	#include "vobject_blitters.h"
 #endif
 

Standard Gaming Platform/ExceptionHandling.cpp

@@ -10,14 +10,9 @@
 	#include "FileMan.h"
 #endif
 
-#include "ExceptionHandling.h"
 
-#include <time.h>
-#include <tlhelp32.h>
-#include <imagehlp.h>
 
 #ifdef JA2
-	#include "GameVersion.h"
 #endif
 
 //If we are to use exception handling
@@ -1602,4 +1597,4 @@ void ERLogModules(HWFILE fdump)
 #endif	
 }
 
-#endif
+#endif

Standard Gaming Platform/Install.cpp

@@ -23,8 +23,6 @@
 #else
 	#include "types.h"
 	#include <windows.h>
-	#include <tchar.h>
-	#include <assert.h>
 	#include "Install.h"
 	#include "RegInst.h"
 #endif

Standard Gaming Platform/MemMan.cpp

@@ -49,7 +49,6 @@
 //**************************************************************************
 
 #ifdef JA2
-#include "mousesystem.h"
 #include "MessageBoxScreen.h"
 STR16 gzJA2ScreenNames[] =
 {

Standard Gaming Platform/PCX.cpp

@@ -4,7 +4,6 @@
 	#include "WIZ8 SGP ALL.H"
 #else
 	#include <stdio.h>
-	#include <stdarg.h>
 	#include "pcx.h"
 	#include "memman.h"
 	#include "fileman.h"

Standard Gaming Platform/Random.cpp

@@ -1,5 +1,4 @@
 #include "Random.h"
-#include <time.h>
 #include "debug control.h"
 
 extern bool is_client;
@@ -93,4 +92,4 @@ void InitializeRandom()
 	guiPreRandomIndex = 0;
 }
 
-#endif
+#endif

Standard Gaming Platform/debug_win_util.cpp

@@ -12,7 +12,6 @@
 
 
 #include <dbghelp.h>
-#include <iostream>
 
 #include <vfs/Tools/vfs_log.h>
 

Standard Gaming Platform/input.cpp

@@ -29,7 +29,6 @@
 	#include "local.h"
 #endif
 
-#include "zmouse.h"
 
 // Make sure to refer to the translation table which is within one of the following files (depending
 // on the language used). ENGLISH.C, JAPANESE.C, FRENCH.C, GERMAN.C, SPANISH.C, etc...

Standard Gaming Platform/sgp.cpp

@@ -9,7 +9,6 @@
 #else
 	#include "types.h"
 	#include <windows.h>
-	#include <windowsx.h>
 	#include <stdio.h>
 	#include <stdarg.h>
 	#include <string.h>
@@ -58,9 +57,7 @@
 #include <iostream>
 #include <excpt.h>
 
-#include "ExceptionHandling.h"
 
-#include "dbt.h"
 #include "INIReader.h"
 #include "Console.h"
 #include "Lua Interpreter.h"

Standard Gaming Platform/shading.cpp

@@ -13,9 +13,6 @@
 	#endif
 	#include "himage.h"
 	#include "vobject.h"
-	#include "vobject_private.h"
-	#include "video_private.h"
-	#include "wcheck.h"
 	#include "vobject_blitters.h"
 	#include "shading.h"
 #endif

Standard Gaming Platform/video.cpp

@@ -11,7 +11,6 @@
 #include <io.h>
 #include "renderworld.h"
 #include "Render Dirty.h"
-#include "Isometric utils.h"
 #include "fade screen.h"
 #include "impTGA.h"
 #include "timer control.h"

Standard Gaming Platform/vobject.cpp

@@ -13,8 +13,6 @@
 	#endif
 	#include "himage.h"
 	#include "vobject.h"
-	#include "vobject_private.h"
-	#include "video_private.h"
 	#include "wcheck.h"
 	#include "vobject_blitters.h"
 	#include "sgp.h"

Standard Gaming Platform/vobject_blitters.cpp

@@ -13,8 +13,6 @@
 	#endif
 	#include "himage.h"
 	#include "vobject.h"
-	#include "vobject_private.h"
-	#include "video_private.h"
 	#include "wcheck.h"
 	#include "vobject.h"
 	#include "vobject_blitters.h"

Standard Gaming Platform/vsurface.cpp

@@ -15,7 +15,6 @@
 #include "himage.h"
 #include "vsurface.h"
 #include "vsurface_private.h"
-#include "video_private.h"
 #include "wcheck.h"
 #include "vobject_blitters.h"
 #endif

Strategic/AI Viewer.cpp

@@ -12,7 +12,6 @@
 	#include "vsurface.h"
 	#include "Button System.h"
 	#include "Font Control.h"
-	#include "Simple Render Utils.h"
 	#include "Editor Taskbar Utils.h"
 	#include "line.h"
 	#include "input.h"
@@ -26,7 +25,6 @@
 	#include "Game Clock.h"
 	#include "Campaign Types.h"
 	#include "Queen Command.h"
-	#include "Campaign Init.h"
 	#include "overhead.h"
 	#include "Strategic Movement.h"
 	#include "GameSettings.h"

Strategic/Assignments.cpp

@@ -26,7 +26,6 @@
 	#include "Map Screen Helicopter.h"
 	#include "PopUpBox.h"
 	#include "Vehicles.h"
-	#include "Strategic Merc Handler.h"
 	#include "Merc Contract.h"
 	#include "Map Screen Interface Map.h"
 	#include "Strategic Movement.h"

Strategic/Campaign Init.cpp

@@ -11,7 +11,6 @@
 	#include "Strategic Movement.h"
 	#include "Strategic Status.h"
 	#include "GameSettings.h"
-	#include "Creature Spreading.h"
 	#include "Strategic AI.h"
 	#include "XML.h"
 	#include "expat.h"

Strategic/Game Event Hook.cpp

@@ -26,7 +26,6 @@
 	#include "Map Screen Interface.h"
 	#include "Map Screen Helicopter.h"
 	#include "Scheduling.h"
-	#include "BobbyRGuns.h"
 	#include "Arms Dealer Init.h"
 	#include "Strategic town reputation.h"
 	#include "air raid.h"

Strategic/Game Init.cpp

@@ -10,8 +10,6 @@
 	#include "worlddef.h"
 	#include "Soldier Control.h"
 	#include "overhead.h"
-	#include "fade screen.h"
-	#include "gamescreen.h"
 	#include "email.h"
 	#include "Game Clock.h"
 	#include "soldier profile.h"
@@ -21,7 +19,6 @@
 	#include "finances.h"
 	#include "soldier create.h"
 	#include "Soldier Init List.h"
-	#include "music control.h"
 	#include "strategic.h"
 	#include "history.h"
 	#include "merc entering.h"
@@ -40,21 +37,17 @@
 	#include "Creature Spreading.h"
 	#include "Quests.h"
 	#include "Strategic AI.h"
-	#include "sound control.h"
 	#include "Laptopsave.h"
 	#include "AimMembers.h"
 	#include "dialogue control.h"
 	#include "npc.h"
-	#include "Init.h"
 	#include "GameSettings.h"
-	#include "opplist.h"
 	#include "interface dialogue.h"
 	#include "Map Screen Interface Border.h"
 	#include "Map Screen Helicopter.h"
 	#include "Vehicles.h"
 	#include "Map Screen Interface Map.h"
 	#include "PreBattle Interface.h"
-	#include "Arms Dealer Init.h"
 	#include "bobbyr.h"
 	#include "helpscreen.h"
 	#include "Air Raid.h"
@@ -78,7 +71,6 @@
 #ifdef JA2UB
 #include "Ja25 Strategic Ai.h"
 #include "Ja25_Tactical.h"
-#include "Arms Dealer Init.h"
 #endif
 
 #include "LuaInitNPCs.h"
@@ -1247,4 +1239,4 @@ void ReStartingGame()
 	else
 		gubCheatLevel = 0;
 
-}
+}

Strategic/Hourly Update.cpp

@@ -10,7 +10,6 @@
 	#include "Quests.h"
 	#include "Game Clock.h"
 	#include "Overhead.h"
-	#include "Boxing.h"
 	#include "jascreens.h"
 	#include "screenids.h"
 	#include "Items.h"

Strategic/Ja25 Strategic Ai.cpp

@@ -2,9 +2,6 @@
 
 #ifdef PRECOMPILEDHEADERS
 	#include "Strategic All.h"
-	#include "Loading Screen.h"
-	#include "Enemy Soldier Save.h"
-	#include "points.h"
 #else
 	#include "strategicmap.h"
 	#include "strategic.h"
@@ -19,9 +16,7 @@
 	#include "worlddef.h"
 	#include "Soldier Control.h"
 	#include "overhead.h"
-	#include "interface panels.h"
 	#include "isometric utils.h"
-	#include "Ambient Control.h"
 	#include "worlddef.h"
 	#include "worlddat.h"
 	#include "text.h"
@@ -32,82 +27,56 @@
 	#include "handle UI.h"
 	#include "faces.h"
 	#include "renderworld.h"
-	#include "gamescreen.h"
-	#include "game clock.h"
-	#include "Soldier Init List.h"
-	#include "strategic turns.h"
-	#include "merc entering.h"
 	#include "Map Information.h"
 	#include "Assignments.h"
 	#include "message.h"
-	#include "Font Control.h"
-	#include "environment.h"
 	#include "Game Events.h"
 	#include "quests.h"
 	#include "FileMan.h"
 	#include "animated progressbar.h"
-	#include "music control.h"
-	#include "fade screen.h"
 	#include "Strategic Movement.h"
 	#include "Campaign Types.h"
-	#include "sys globals.h"
 	#include "Exit Grids.h"
 	#include "Tactical Save.h"
-	#include "pathai.h"
 	#include "animation control.h"
 	#include "squads.h"
-	#include "worldman.h"
 	#include "Overhead.h"
 	#include "Strategic Town Loyalty.h"
 	#include "Queen Command.h"
 	#include "cursor control.h"
 	#include "PreBattle Interface.h"
-	#include "Shade Table Util.h"
-	#include "Scheduling.h"
 	#include "gameloop.h"
 	#include "Random.h"
 	#include "ai.h"
-	#include "opplist.h"
 	#include "keys.h"
 	#include "Tactical Placement GUI.h"
 	#include "Map Screen Helicopter.h"
-	#include "map edgepoints.h"
 	#include "Player Command.h"
 	#include "Event Pump.h"
-	#include "meanwhile.h"
 	#include "air raid.h"
 	#include "Strategic Mines.h"
-	#include "Creature Spreading.h"
 	#include "SaveLoadMap.h"
 	#include "Militia Control.h"
 	#include "gamesettings.h"
-	#include "dialogue control.h"
 	#include "Town Militia.h"
 	#include "sysutil.h"
-	#include "Sound Control.h"
-	#include "points.h"
-	#include "render dirty.h"
 	#include "Debug Control.h"
-	#include "expat.h"
-	#include "Loading Screen.h"
 	#include "Queen Command.h"
-	#include "Enemy Soldier Save.h"
-	#include "Boxing.h"
-	#include "NPC.h"
 	#include "Strategic Event Handler.h"
 	#include "MessageBoxScreen.h"
 	#include "interface dialogue.h"
 	#include "Map Screen Interface.h"
-	#include "history.h"
 	#include "Bullets.h"
 	#include "physics.h"
-	#include "Explosion Control.h"
 	#include "Auto Resolve.h"
 	#include "cursors.h"
 #endif
 
 #ifdef JA2UB
-
+#include "Soldier Init List.h"
+#include "Dialogue Control.h"
+#include "Game Clock.h"
+#include "opplist.h"
 #include "Ja25Update.h"
 #include "Ja25_Tactical.h"
 #include "Ja25 Strategic Ai.h"
@@ -2937,4 +2906,4 @@ void AddJA25AIDataToSector( JA25_SECTOR_AI *pSectorAIInfo )
 */
 }
 
-#endif
+#endif

Strategic/LuaInitNPCs.cpp

@@ -1,5 +1,4 @@
 #include <iostream>
-#include <string>
 #include <sstream>
 
 #include "Lua Interpreter.h"
@@ -51,10 +50,10 @@
 #include "Ja25Update.h"
 #include "ub_config.h"
 #include "Ja25Update.h"
+#include "End Game.h"
 #endif
 
 #include "Intro.h"
-#include "End Game.h"
 #include "Queen Command.h"
 #include "gamescreen.h"
 #include "Arms Dealer Init.h"
@@ -68,7 +67,6 @@ extern "C" {
 
 #include "lua_state.h"
 #include "lua_function.h"
-#include <vfs/Core/vfs_string.h>
 
 #include "Encrypted File.h"
 //-------------------------- UB ------------------------------
@@ -12053,4 +12051,4 @@ BOOLEAN LoadLuaGlobalFromLoadGameFile( HWFILE hFile )
 
 	return( TRUE );
 }
-//--------------------------------------------------------------
+//--------------------------------------------------------------

Strategic/Luaglobal.cpp

@@ -1,41 +1,37 @@
 #include <iostream>
-#include <string>
 #include <sstream>
 
 
 #include "connect.h"
 #include "FileMan.h"
 #include "GameSettings.h"
-#include "Game Init.h"
 #include "interface Dialogue.h"
-#include "opplist.h"
 #include "Strategic All.h"
 #include "Luaglobal.h"
 #include "Boxing.h"
 #include "LuaInitNPCs.h"
-#include "Game Clock.h"
 #include "Overhead.h"
 #include "Music Control.h"
 
 #include "Intro.h"
-#include "End Game.h"
 #include "Queen Command.h"
 #include "gamescreen.h"
 #include "Map Screen Interface Map.h"
-#include "ub_config.h"
 
 #include "Creature Spreading.h"
 #include "World Items.h"
 #include "Map Screen Helicopter.h"
 #include "Campaign Types.h"
 
+#include "ub_config.h"
+#include "Ja25_Tactical.h"
+
 extern "C" {
 #include "lua.h"
 #include "lauxlib.h"
 #include "lualib.h"
 }
 
-#include "Ja25_Tactical.h"
 
 using namespace std;
 
@@ -376,4 +372,4 @@ void IniGlobalGameSetting(lua_State *L)
 	lua_pushboolean(L, MORRIS_INSTRUCTION_NOTE);
 	lua_setglobal(L, "itemMORRIS_INSTRUCTION_NOTE");
 #endif
-}
+}

Strategic/Map Screen Interface Bottom.cpp

@@ -8,7 +8,6 @@
 	#include "mousesystem.h"
 	#include "Button System.h"
 	#include "sgp.h"
-	#include "WCheck.h"
 	#include "Utilities.h"
 	#include "message.h"
 	#include "mapscreen.h"
@@ -16,7 +15,6 @@
 	#include "font control.h"
 	#include "Radar Screen.h"
 	#include "game clock.h"
-	#include "cursors.h"
 	#include "sysutil.h"
 	#include "Render Dirty.h"
 	#include "Map Screen Interface.h"
@@ -33,7 +31,6 @@
 	#include "Air Raid.h"
 	#include "Finances.h"
 	#include "LaptopSave.h"
-	#include "Sound Control.h"
 	#include "Interface Items.h"
 	#include "wordwrap.h"
 	#include "meanwhile.h"
@@ -47,7 +44,6 @@
 	#include "Assignments.h"
 	#include "Soldier macros.h"
 	#include "GameSettings.h"
-	#include "_Ja25EnglishText.h"
 	#include "SaveLoadScreen.h"
 	#include "Interface Control.h"
 	#include "Sys Globals.h"

Strategic/Map Screen Interface Map Inventory.cpp

@@ -21,7 +21,6 @@
 	#include "Tactical Save.h"
 	#include "Overhead.h"
 	#include "english.h"
-	#include "Multi Language Graphic Utils.h"
 	#include "GameSettings.h"
 	#include "Radar Screen.h"
 	#include "message.h"
@@ -5271,4 +5270,4 @@ void HandleSectorCooldownFunctions( INT16 sMapX, INT16 sMapY, INT8 sMapZ, WORLDI
 			}
 		}
 	}
-}
+}

Strategic/MapScreen Quotes.cpp

@@ -4,17 +4,14 @@
 	#include "Map Screen Interface.h"
 	#include "string.h"
 	#include "Map Screen Interface Map.h"
-	#include "Render Dirty.h"
 	#include "Font Control.h"
 	#include "Assignments.h"
 	#include "Soldier Control.h"
 	#include "Overhead.h"
 	#include "Squads.h"
-	#include "Sound Control.h"
 	#include "Soundman.h"
 	#include "Message.h"
 	#include "PopUpBox.h"
-	#include "Game Clock.h"
 	#include "Handle Items.h"
 	#include "Interface Items.h"
 	#include "Isometric Utils.h"
@@ -35,7 +32,6 @@
 	#include "Map Screen Helicopter.h"
 	#include "PreBattle Interface.h"
 	#include "WordWrap.h"
-	#include "interface control.h"
 	#include "GameSettings.h"
 	#include "Campaign Types.h"
 	#include "Map Screen Interface Map Inventory.h"
@@ -46,9 +42,7 @@
 	#include "Random.h"
 	#include "Cursor Control.h"
 	#include "renderworld.h"
-	#include "Game Init.h"
 	#include "Strategic Mines.h"
-	#include "finances.h"
 	#include "strategic.h"
 	#include "Air Raid.h"
 	#include "Queen Command.h"
@@ -483,4 +477,4 @@ BOOLEAN HasJerryAlreadySaidTheMapScreenIntroSequence()
 	}
 }
 
-#endif
+#endif

Strategic/Merc Contract.cpp

@@ -21,10 +21,8 @@
 	#include "strategicmap.h"
 	#include "Quests.h"
 	#include "worlddef.h"
-	#include "rotting corpses.h"
 	#include "Animation Control.h"
 	#include "Tactical Save.h"
-	#include "Strategic Merc Handler.h"
 	#include "Interface Control.h"
 	#include "gamescreen.h"
 	#include "jascreens.h"

Strategic/MilitiaSquads.cpp

@@ -14,7 +14,6 @@
 	#include "Map Screen Interface.h"
 	#include "Interface.h"
 	#include "Laptopsave.h"
-	#include "finances.h"
 	#include "Game Clock.h"
 	#include "Assignments.h"
 	#include "squads.h"

Strategic/PreBattle Interface.cpp

@@ -2210,4 +2210,4 @@ void HandlePreBattleInterfaceStates()
 	{
 		gfTransitionMapscreenToAutoResolve = FALSE;
 	}
-}
+}

Strategic/Quest Debug System.cpp

@@ -30,7 +30,6 @@
 	#include	"dialogue control.h"
 	//#include	"Soldier Control.h"
 	#include	"overhead.h"
-	#include	"AimMembers.h"
 	#include	"MessageBoxScreen.h"
 	#include	"Stdio.h"
 	#include	"english.h"

Strategic/Reinforcement.cpp

@@ -14,8 +14,6 @@
 	#include "Map Screen Interface.h"
 	#include "Interface.h"
 	#include "Laptopsave.h"
-	#include "finances.h"
-	#include "Game Clock.h"
 	#include "Assignments.h"
 	#include "squads.h"
 	#include "Soldier Create.h"

Strategic/Strategic Event Handler.cpp

@@ -19,19 +19,15 @@
 	#include "Strategic Town Loyalty.h"
 	#include "Soldier Init List.h"
 	#include "SaveLoadMap.h"
-	#include "Worldman.h"
 	#include "Soldier Create.h"
 	#include "Soldier Add.h"
-	#include "Opplist.h"
 	#include "Renderworld.h"
 	#include "Soldier Profile.h"
 	#include "email.h"
 	#include "strategic.h"
-	#include "structure wrap.h"
 	#include "GameSettings.h"
 	#include "history.h"
 #endif
-#include "BobbyRMailOrder.h"
 
 #include "Luaglobal.h"
 #include "connect.h"

Strategic/Strategic Pathing.cpp

@@ -2,7 +2,6 @@
 	#include "Strategic All.h"
 #else
 	#include <stdio.h>
-	#include <stdarg.h>
 	#include <time.h>
 	#include "types.h"
 	#include "worlddef.h"
@@ -10,8 +9,6 @@
 	#include "strategic.h"
 	#include "mapscreen.h"
 	#include "overhead.h"
-	#include "interface panels.h"
-	#include "worldman.h"
 	#include "strategicmap.h"
 	#include "Strategic Pathing.h"
 	#include "Map Screen Interface Border.h"

Strategic/Strategic Status.cpp

@@ -1,7 +1,6 @@
 #ifdef PRECOMPILEDHEADERS
 	#include "Strategic All.h"
 #else
-	#include <memory.h>
 	#include "Strategic Status.h"
 	#include "Inventory Choosing.h"
 	#include "FileMan.h"
@@ -10,8 +9,6 @@
 	#include "Strategic Mines.h"
 	#include "email.h"
 	#include "Game Clock.h"
-	#include "TopicIDs.h"
-	#include "TopicOps.h"
 	#include "Debug.h"
 	#include "GameSettings.h"
 	#include "history.h"

Strategic/Strategic Town Loyalty.cpp

@@ -28,7 +28,6 @@
 	#include "GameSettings.h"
 	#include "Text.h"
 	#include "MessageBoxScreen.h"
-	#include "Creature Spreading.h"
 	#include "Town Militia.h"
 	#include "history.h"
 	#include "meanwhile.h"

Strategic/Strategic Turns.cpp

@@ -4,14 +4,11 @@
 	#include "sgp.h"
 	#include "Game Clock.h"
 	#include "Font Control.h"
-	#include "render dirty.h"
 	#include "Timer Control.h"
 	#include "overhead.h"
-	#include "environment.h"
 	#include "Game Clock.h"
 	#include "message.h"
 	#include "worlddef.h"
-	#include "rotting corpses.h"
 	#include "soldier create.h"
 	#include "soldier add.h"
 	#include "strategic turns.h"

Strategic/UndergroundInit.cpp

@@ -3,7 +3,6 @@
 #include <sstream>
 
 #include "UndergroundInit.h"
-#include "Campaign Init.h"
 #include "FileMan.h"
 #include "GameSettings.h"
 #include "Game Clock.h"

Strategic/mapscreen.cpp

@@ -31,11 +31,9 @@
 	#include <tchar.h>
 	#include "cursors.h"
 	#include "Soldier Profile.h"
-	#include "Interface Cursors.h"
 	#include "Interface Panels.h"
 	#include "Interface Control.h"
 	#include "sys globals.h"
-	#include "environment.h"
 	#include "Radar Screen.h"
 	#include "Render Dirty.h"
 	#include "utilities.h"
@@ -82,7 +80,6 @@
 	#include "english.h"
 	#include "Fade Screen.h"
 	#include "Strategic Mines.h"
-	#include "GameVersion.h"
 	#include "SaveLoadScreen.h"
 	#include "Options Screen.h"
 	#include "Auto Resolve.h"
@@ -101,7 +98,6 @@
 	#include "cheats.h"
 	#include "Strategic Town Loyalty.h"
 	#include "GameSettings.h"
-	#include "_Ja25EnglishText.h"
 	#include "Militia Control.h"
 	#include "Tactical Save.h"
 	#include "Explosion Control.h"
@@ -117,7 +113,6 @@
 #endif
 
 #include "connect.h" //hayden
-#include "fresh_header.h"
 #include "InterfaceItemImages.h"
 
 #ifdef JA2UB

Strategic/strategic.cpp

@@ -8,7 +8,6 @@
 	#include "Assignments.h"
 	#include "Interface Control.h"
 	#include "Overhead.h"
-	#include "Music Control.h"
 	#include "Soldier Profile.h"
 	#include "Dialogue Control.h"
 	#include "personnel.h"

Strategic/strategicmap.cpp

@@ -92,7 +92,6 @@
 	#include "Loading Screen.h"
 	#include "Queen Command.h"
 	#include "Enemy Soldier Save.h"
-	#include "Boxing.h"
 	#include "NPC.h"
 	#include "Strategic Event Handler.h"
 	#include "MessageBoxScreen.h"