More unused stuff removal (#49)

* More unused stuff removal

delete:
- giant 'metaheaders' (JA2 All.h, Laptop All.h, etc), preferring to add #includes directly where needed
- unused ExceptionHandling and DbMan translation units
- unused WizShare.h, Bitmap.h, trle.h, video_private.h headers

* remove mentions from vc proj files too

* remove preprocessor conditionals for unused definitions

find . -iname '*.h' -o -iname '*.cpp' -exec unifdef.exe -m -UPRECOMPILED_HEADERS -UJA2_PRECOMPILED_HEADERS -UWIZ8_PRECOMPILED_HEADERS -UPRECOMPILEDHEADERS {} ';'

then manually fixed a couple files the tool errored out on

* yes, the comments too

as title

Laptop/AimArchives.cpp

@@ -1,7 +1,4 @@
 
-#ifdef PRECOMPILEDHEADERS
-	#include "Laptop All.h"
-#else
 	#include "laptop.h"
 	#include "AimArchives.h"
 	#include "aim.h"
@@ -10,7 +7,6 @@
 	#include "WCheck.h"
 	#include "Encrypted File.h"
 	#include "Text.h"
-#endif
 
 #include "Soldier Profile.h"
 

Laptop/AimFacialIndex.cpp

@@ -1,6 +1,3 @@
-#ifdef PRECOMPILEDHEADERS
-	#include "Laptop All.h"
-#else
 	#include "laptop.h"
 	#include "AimFacialIndex.h"
 	#include "WordWrap.h"
@@ -16,7 +13,6 @@
 	#include "GameSettings.h"
 	#include "english.h"
 	#include "sysutil.h"
-#endif
 
 
 extern UINT8	gubCurrentSortMode; // symbol already defined in AimSort.cpp (jonathanl)

Laptop/AimHistory.cpp

@@ -1,6 +1,3 @@
-#ifdef PRECOMPILEDHEADERS
-	#include "Laptop All.h"
-#else
 	#include "laptop.h"
 	#include "AimHistory.h"
 	#include "aim.h"
@@ -9,7 +6,6 @@
 	#include "WordWrap.h"
 	#include "Encrypted File.h"
 	#include "Text.h"
-#endif
 
 #include "LocalizedStrings.h"
 

Laptop/AimLinks.cpp

@@ -1,6 +1,3 @@
-#ifdef PRECOMPILEDHEADERS
-	#include "Laptop All.h"
-#else
 	#include "laptop.h"
 	#include "AimLinks.h"
 	#include "aim.h"
@@ -8,7 +5,6 @@
 	#include "WordWrap.h"
 	#include "Text.h"
 	#include "Multi Language Graphic Utils.h"
-#endif
 
 #ifdef JA2UB
 #include "ub_config.h"

Laptop/AimMembers.cpp

@@ -1,7 +1,3 @@
-#ifdef PRECOMPILEDHEADERS
-	#include "Laptop All.h"
-	#include "Language Defines.h"
-#else
 	#include "email.h"
 	#include "laptop.h"
 	#include "AimMembers.h"
@@ -47,7 +43,6 @@
 	#include "strategicmap.h"
 	#include "Personnel.h"
 	#include "Encyclopedia_new.h"	//update encyclopedia item visibility when viewing that item
-#endif
 
 #include "Strategic Town Loyalty.h"
 #include "connect.h"

Laptop/AimPolicies.cpp

@@ -1,6 +1,3 @@
-#ifdef PRECOMPILEDHEADERS
-	#include "Laptop All.h"
-#else
 	#include "laptop.h"
 	#include "AimPolicies.h"
 	#include "aim.h"
@@ -10,7 +7,6 @@
 	#include "Encrypted File.h"
 	#include "Text.h"
 	#include "GameSettings.h"
-#endif
 
 #include "LocalizedStrings.h"
 

Laptop/AimSort.cpp

@@ -1,6 +1,3 @@
-#ifdef PRECOMPILEDHEADERS
-	#include "Laptop All.h"
-#else
 	#include "laptop.h"
 	#include "AimSort.h"
 	#include "Aim.h"
@@ -13,7 +10,6 @@
 	#include "Multi Language Graphic Utils.h"
 	#include "english.h"
 	#include "sysutil.h"
-#endif
 
 //#define
 

Laptop/BobbyR.cpp

@@ -1,6 +1,3 @@
-#ifdef PRECOMPILEDHEADERS
-	#include "Laptop All.h"
-#else
 	#include "laptop.h"
 	#include "BobbyR.h"
 	#include "BobbyRGuns.h"
@@ -22,7 +19,6 @@
 	#include "GameSettings.h"
 	#include "message.h"
 	#include "postalservice.h"
-#endif
 
 
 #ifdef JA2TESTVERSION

Laptop/BobbyRAmmo.cpp

@@ -1,6 +1,3 @@
-#ifdef PRECOMPILEDHEADERS
-	#include "Laptop All.h"
-#else
 	#include "laptop.h"
 	#include "BobbyRAmmo.h"
 	#include "BobbyRGuns.h"
@@ -10,7 +7,6 @@
 	#include "WordWrap.h"
 	#include "Encrypted File.h"
 	#include "text.h"
-#endif
 
 UINT32		guiAmmoBackground;
 UINT32		guiAmmoGrid;

Laptop/BobbyRArmour.cpp

@@ -1,6 +1,3 @@
-#ifdef PRECOMPILEDHEADERS
-	#include "Laptop All.h"
-#else
 	#include "laptop.h"
 	#include "BobbyRArmour.h"
 	#include "BobbyRGuns.h"
@@ -9,7 +6,6 @@
 	#include "WCheck.h"
 	#include "WordWrap.h"
 	#include "Text.h"
-#endif
 
 
 UINT32		guiArmourBackground;

Laptop/BobbyRGuns.cpp

@@ -1,6 +1,3 @@
-#ifdef PRECOMPILEDHEADERS
-	#include "Laptop All.h"
-#else
 	#include "laptop.h"
 	#include "BobbyRGuns.h"
 	#include "BobbyR.h"
@@ -23,7 +20,6 @@
 	// HEADROCK HAM 4
 	#include "input.h"
 	#include "Encyclopedia_new.h"	//update encyclopedia item visibility when viewing that item
-#endif
 
 
 #define		BOBBYR_DEFAULT_MENU_COLOR					255

Laptop/BobbyRMailOrder.cpp

@@ -1,6 +1,3 @@
-#ifdef PRECOMPILEDHEADERS
-	#include "Laptop All.h"
-#else
 	#include "laptop.h"
 	#include "BobbyRMailOrder.h"
 	#include "BobbyR.h"
@@ -27,7 +24,6 @@
 	#include "postalservice.h"
 	#include "english.h"
 	#include <list>
-#endif
 
 #include "Strategic Event Handler.h"
 #include "connect.h"

Laptop/BobbyRMisc.cpp

@@ -1,6 +1,3 @@
-#ifdef PRECOMPILEDHEADERS
-	#include "Laptop All.h"
-#else
 	#include "laptop.h"
 	#include "BobbyRMisc.h"
 	#include "BobbyR.h"
@@ -9,7 +6,6 @@
 	#include "WCheck.h"
 	#include "WordWrap.h"
 	#include "Text.h"
-#endif
 
 
 UINT32		guiMiscBackground;

Laptop/BobbyRShipments.cpp

@@ -1,7 +1,3 @@
-#ifdef PRECOMPILEDHEADERS
-	#include "Laptop All.h"
-	#include "BobbyRShipments.h"
-#else
 	#include "laptop.h"
 	#include "BobbyRShipments.h"
 	#include "bobbyr.h"
@@ -17,7 +13,6 @@
 	#include "PostalService.h"
 	#include "input.h"
 	#include "english.h"
-#endif
 
 
 

Laptop/BobbyRUsed.cpp

@@ -1,6 +1,3 @@
-#ifdef PRECOMPILEDHEADERS
-	#include "Laptop All.h"
-#else
 	#include "laptop.h"
 	#include "BobbyRUsed.h"
 	#include "BobbyR.h"
@@ -9,7 +6,6 @@
 	#include "WCheck.h"
 	#include "WordWrap.h"
 	#include "Text.h"
-#endif
 
 UINT32		guiUsedBackground;
 UINT32		guiUsedGrid;

Laptop/BriefingRoom.cpp

@@ -1,7 +1,3 @@
-#ifdef PRECOMPILEDHEADERS
-	#include "Laptop All.h"
-#else
-	#include "Laptop All.h"
 	#include "Utilities.h"
 	#include "WCheck.h"
 	#include "timer control.h"
@@ -12,10 +8,15 @@
 	#include "Game Clock.h"
 	#include "Text.h"
 	#include "soldier profile type.h"
-#endif
 
 #include "BriefingRoom_Data.h"
 #include "BriefingRoom.h"
+#include "english.h"
+#include "laptop.h"
+#include "IMP HomePage.h"
+#include "line.h"
+#include "input.h"
+#include "Text Input.h"
 
 // Link Images
 #define	BRIEFINGROOM_BUTTON_SIZE_X						205

Laptop/BriefingRoomM.cpp

@@ -1,7 +1,3 @@
-#ifdef PRECOMPILEDHEADERS
-	#include "Laptop All.h"
-#else
-	#include "Laptop All.h"
 	#include "Utilities.h"
 	#include "WCheck.h"
 	#include "timer control.h"
@@ -12,10 +8,16 @@
 	#include "Game Clock.h"
 	#include "Text.h"
 	#include "soldier profile type.h"
-#endif
 
 #include "BriefingRoom_Data.h"
 #include "BriefingRoomM.h"
+#include "aim.h"
+#include "laptop.h"
+#include "IMP HomePage.h"
+#include "line.h"
+#include "input.h"
+#include "Text Input.h"
+#include "english.h"
 
 // Link Images
 #define	BRIEFINGROOM_MISSION_BUTTON_SIZE_X						121

Laptop/BriefingRoom_Data.cpp

@@ -1,6 +1,3 @@
-#ifdef PRECOMPILEDHEADERS
-	#include "Laptop All.h"
-#else
 	//#include "Laptop All.h"
 	#include "laptop.h"
 	#include "aim.h"
@@ -15,7 +12,6 @@
 	#include "Quests.h"
 	#include "Tactical Save.h"
 	#include "BriefingRoom_Data.h"
-#endif	
 
 
 #define MAX_FILTR_LOCATION_BUTTONS 11

Laptop/BrokenLink.cpp

@@ -1,14 +1,9 @@
-#ifdef PRECOMPILEDHEADERS
-	#include "Laptop All.h"
-	#include "BrokenLink.h"
-#else
 	#include "Types.h"
 	#include "font.h"
 	#include "laptop.h"
 	#include "Font Control.h"
 	#include "Text.h"
 	#include "wordwrap.h"
-#endif
 
 #define		BROKEN_LINK__FONT									FONT12ARIAL
 #define		BROKEN_LINK__COLOR								FONT_MCOLOR_BLACK

Laptop/CampaignHistoryMain.cpp

@@ -3,9 +3,6 @@
  * @author Flugente (bears-pit.com)
  */
 
-#ifdef PRECOMPILEDHEADERS
-	#include "Laptop All.h"
-#else
 	#include "laptop.h"
 	#include "insurance.h"
 	#include "insurance Contract.h"
@@ -19,7 +16,6 @@
 	#include "Text.h"
 	#include "Multi Language Graphic Utils.h"
 	#include "CampaignHistoryMain.h"
-#endif
 
 
 #define		BACKGROUND_WIDTH				125

Laptop/CampaignHistory_Summary.cpp

@@ -3,9 +3,6 @@
  * @author Flugente (bears-pit.com)
  */
 
-#ifdef PRECOMPILEDHEADERS
-	#include "Laptop All.h"
-#else
 	#include "laptop.h"
 	#include "Insurance Text.h"
 	#include "insurance.h"
@@ -22,7 +19,6 @@
 	#include "Game Clock.h"
 	#include "random.h"
 	#include "strategicmap.h"
-#endif
 
 #define		CAMPHIS_SUM_TITLE_Y								52 + LAPTOP_SCREEN_WEB_UL_Y
 

Laptop/CharProfile.cpp

@@ -1,7 +1,3 @@
-#ifdef PRECOMPILEDHEADERS
-	#include "Laptop All.h"
-	#include "IMP Skill Trait.h"
-#else
 	#include "laptop.h"
 	#include "cursors.h"
 	#include "CharProfile.h"
@@ -35,7 +31,6 @@
 	#include "IMP Prejudice.h"		// added by Flugente
 	#include "IMP Gear Entrance.h"	// added by Flugente
 	#include "IMP Gear.h"			// added by Flugente
-#endif
 
 
 //BOOLEAN fIMPCompletedFlag = FALSE;

Laptop/Encyclopedia_Data_new.cpp

@@ -1,6 +1,3 @@
-#ifdef PRECOMPILEDHEADERS
-	#include "Laptop All.h"
-#else
 	#include "Types.h"
 	#include "WCheck.h"
 	#include <string.h>
@@ -30,7 +27,6 @@
 	#include "Text.h"
 	#include "WordWrap.h"
     #include "Quests.h"
-#endif
 
 #ifdef ENCYCLOPEDIA_WORKS
 /** @ingroup ENCYCLOPEDIA

Laptop/Encyclopedia_new.cpp

@@ -29,9 +29,6 @@
 /// uncomment to use just graphic + mouseregion instead of real buttons. No sounds, no button states, just plain 'hyperlinks'.
 #define ENC_USE_BUTTONSYSTEM
 
-#ifdef PRECOMPILEDHEADERS
-	#include "Laptop All.h"
-#else
 	#include "Types.h"
 	#include "WCheck.h"
 	#include "DEBUG.H"
@@ -54,7 +51,6 @@
 	//#include "Quests.h"
 	//#include "Tactical Save.h"
 	#include "Encyclopedia_Data_new.h"
-#endif	
 
 #ifdef ENCYCLOPEDIA_WORKS
 /** @defgroup ENCYCLOPEDIA Encyclopedia

Laptop/FacilityProduction.cpp

@@ -3,9 +3,6 @@
 * @author Flugente (bears-pit.com)
 */
 
-#ifdef PRECOMPILEDHEADERS
-#include "Laptop All.h"
-#else
 #include "laptop.h"
 #include "insurance.h"
 #include "WCheck.h"
@@ -20,7 +17,6 @@
 #include "Strategic Town Loyalty.h"
 #include "strategic.h"
 #include "BaseTable.h"
-#endif
 
 /*#define		MERCOMP_FONT_COLOR								2
 #define		CAMPHIS_FONT_BIG								FONT14ARIAL

Laptop/IMP AboutUs.cpp

@@ -1,6 +1,3 @@
-#ifdef PRECOMPILEDHEADERS
-	#include "Laptop All.h"
-#else
 	#include "IMP AboutUs.h"
 	#include "CharProfile.h"
 	#include "IMPVideoObjects.h"
@@ -11,7 +8,6 @@
 	#include "cursors.h"
 	#include "laptop.h"
 	#include "IMP Text System.h"
-#endif
 
 // IMP AboutUs buttons
 INT32 giIMPAboutUsButton[1];

Laptop/IMP Attribute Entrance.cpp

@@ -1,6 +1,3 @@
-#ifdef PRECOMPILEDHEADERS
-	#include "Laptop All.h"
-#else
 	#include "CharProfile.h"
 	#include "IMP Attribute Entrance.h"
 	#include "IMP MainPage.h"
@@ -12,7 +9,6 @@
 	#include "cursors.h"
 	#include "laptop.h"
 	#include "IMP Text System.h"
-#endif
 
 // the buttons
 UINT32 giIMPAttributeEntranceButtonImage[ 1 ];

Laptop/IMP Attribute Finish.cpp

@@ -1,6 +1,3 @@
-#ifdef PRECOMPILEDHEADERS
-	#include "Laptop All.h"
-#else
 	#include "CharProfile.h"
 	#include "IMP Attribute Finish.h"
 	#include "IMP MainPage.h"
@@ -15,7 +12,6 @@
 	#include "laptop.h"
 	#include "IMP Text System.h"
 	#include "IMP Attribute Selection.h"
-#endif
 
 // buttons
 INT32 giIMPAttributeFinishButtonImage[ 2 ];

Laptop/IMP Attribute Selection.cpp

@@ -1,8 +1,3 @@
-#ifdef PRECOMPILEDHEADERS
-	#include "Laptop All.h"
-	#include "IMP Skill Trait.h"
-	#include "GameSettings.h"
-#else
 	#include "CharProfile.h"
 	#include "IMP Attribute Selection.h"
 	#include "IMP MainPage.h"
@@ -25,7 +20,6 @@
 	#include "IMP Color Choosing.h"
 	#include "IMP Minor Trait.h"
 
-#endif
 
 #define STARTING_LEVEL_BOX_POS_X	( 51 )
 #define STARTING_LEVEL_BOX_POS_Y	( 296 )

Laptop/IMP Background.cpp

@@ -1,8 +1,3 @@
-#ifdef PRECOMPILEDHEADERS
-	#include "Laptop All.h"
-	#include "IMP Skill Trait.h"
-	#include "_Ja25Englishtext.h"
-#else
 	#include "IMP Background.h"
 	#include "IMP Skill Trait.h"
 	#include "Button System.h"
@@ -22,7 +17,6 @@
 	#include "IMP Compile Character.h"
 	#include "GameSettings.h"
 	#include "Interface.h"
-#endif
 
 
 

Laptop/IMP Begin Screen.cpp

@@ -1,6 +1,3 @@
-#ifdef PRECOMPILEDHEADERS
-	#include "Laptop All.h"
-#else
 	#include "CharProfile.h"
 	#include "IMP Begin Screen.h"
 	#include "IMP MainPage.h"
@@ -26,7 +23,6 @@
 	#include "strategic.h"
 	#include "text.h"
 	#include "LaptopSave.h"
-#endif
 
 
 #define FULL_NAME_CURSOR_Y LAPTOP_SCREEN_WEB_UL_Y + 138

Laptop/IMP Character Trait.cpp

@@ -1,8 +1,3 @@
-#ifdef PRECOMPILEDHEADERS
-	#include "Laptop All.h"
-	#include "IMP Character Trait.h"
-	#include "_Ja25Englishtext.h"
-#else
 	#include "IMP Character Trait.h"
 	#include "Button System.h"
 	#include "utilities.h"
@@ -18,7 +13,6 @@
 	#include "wordwrap.h"
 	#include "CharProfile.h"
 	#include "GameSettings.h"
-#endif
 
 
 //*******************************************************************

Laptop/IMP Character and Disability Entrance.cpp

@@ -1,6 +1,3 @@
-#ifdef PRECOMPILEDHEADERS
-	#include "Laptop All.h"
-#else
 	#include "CharProfile.h"
 	#include "IMP Character and Disability Entrance.h"
 	#include "IMP MainPage.h"
@@ -14,7 +11,6 @@
 	#include "IMP Text System.h"
 	#include "text.h"
 
-#endif
 
 // IMP personality entrance buttons
 INT32 giIMPCharacterAndDisabilityEntranceButton[1];

Laptop/IMP Color Choosing.cpp

@@ -1,8 +1,3 @@
-#ifdef PRECOMPILEDHEADERS
-	#include "Laptop All.h"
-	#include "IMP Color Choosing Skin Hair.h"
-	#include "_Ja25Englishtext.h"
-#else
 	#include "IMP Color Choosing.h"
 	#include "Button System.h"
 	#include "utilities.h"
@@ -22,7 +17,6 @@
 	#include "Animation Data.h"
 	#include "GameSettings.h"
 	#include "Soldier Create.h" // added by Flugente for enums
-#endif
 
 #include "IMP Confirm.h"
 

Laptop/IMP Compile Character.cpp

@@ -1,8 +1,3 @@
-#ifdef PRECOMPILEDHEADERS
-	#include "Laptop All.h"
-	#include "IMP Skill Trait.h"
-	#include "GameSettings.h"
-#else
 	#include "laptop.h"
 	#include "CharProfile.h"
 	#include "Utilities.h"
@@ -28,7 +23,6 @@
 	#include "IMP Color Choosing.h"
 	#include "IMP Minor Trait.h"
 	#include "IMP Voices.h"
-#endif
 
 #include "IMP Confirm.h"
 

Laptop/IMP Confirm.cpp

@@ -1,6 +1,3 @@
-#ifdef PRECOMPILEDHEADERS
-	#include "Laptop All.h"
-#else
 	#include "CharProfile.h"
 	#include "IMP MainPage.h"
 	#include "IMP HomePage.h"
@@ -34,7 +31,6 @@
 	#include "GameSettings.h"
 	#include "IMP Gear.h"				// added by Flugente
 	#include "IMP Gear Entrance.h"		// added by Flugente
-#endif
 
 #include <vfs/Core/vfs.h>
 #include <vfs/Aspects/vfs_settings.h>

Laptop/IMP Disability Trait.cpp

@@ -1,8 +1,3 @@
-#ifdef PRECOMPILEDHEADERS
-	#include "Laptop All.h"
-	#include "IMP Disability Trait.h"
-	#include "_Ja25Englishtext.h"
-#else
 	#include "IMP Disability Trait.h"
 	#include "Button System.h"
 	#include "utilities.h"
@@ -18,7 +13,6 @@
 	#include "wordwrap.h"
 	#include "CharProfile.h"
 	#include "GameSettings.h"
-#endif
 
 
 //*******************************************************************

Laptop/IMP Finish.cpp

@@ -1,6 +1,3 @@
-#ifdef PRECOMPILEDHEADERS
-	#include "Laptop All.h"
-#else
 	#include "CharProfile.h"
 	#include "IMP Finish.h"
 	#include "IMP Portraits.h"
@@ -19,7 +16,6 @@
 	#include "IMP Text System.h"
 	#include "soundman.h"
 	#include "text.h"
-#endif
 
 
 #include "IMP Confirm.h"

Laptop/IMP Gear Entrance.cpp

@@ -3,9 +3,6 @@
 * @author Flugente (bears-pit.com)
 */
 
-#ifdef PRECOMPILEDHEADERS
-#include "Laptop All.h"
-#else
 #include "CharProfile.h"
 #include "IMP Gear Entrance.h"
 #include "IMP MainPage.h"
@@ -18,7 +15,6 @@
 #include "laptop.h"
 #include "IMP Text System.h"
 #include "Text.h"
-#endif
 
 // the buttons
 UINT32 giIMPGearEntranceButtonImage[2];

Laptop/IMP Gear.cpp

@@ -3,11 +3,6 @@
 * @author Flugente (bears-pit.com)
 */
 
-#ifdef PRECOMPILEDHEADERS
-#include "Laptop All.h"
-#include "IMP Skill Trait.h"
-#include "_Ja25Englishtext.h"
-#else
 #include "IMP Gear.h"
 #include "IMP Skill Trait.h"
 #include "Button System.h"
@@ -34,7 +29,6 @@
 #include "IMP Skill Trait.h"
 #include "IMP Minor Trait.h"
 #include "IMP Gear Entrance.h"
-#endif
 
 extern BOOLEAN gfGlowTimerExpired;
 BOOLEAN fShowIMPItemHighLight = FALSE;

Laptop/IMP HomePage.cpp

@@ -1,7 +1,3 @@
-#ifdef PRECOMPILEDHEADERS
-	#include "Laptop All.h"
-	#include "IMP Compile Character.h"
-#else
 	#include "CharProfile.h"
 	#include "IMP HomePage.h"
 	#include "IMPVideoObjects.h"
@@ -27,7 +23,6 @@
 	// WDS - make number of mercenaries, etc. be configurable
 	#include "Squads.h"
 	#include "Overhead.h"		// added by Flugente for OUR_TEAM_SIZE_NO_VEHICLE
-#endif
 
 #ifdef JA2UB
 #include "ub_config.h"

Laptop/IMP MainPage.cpp

@@ -1,6 +1,3 @@
-#ifdef PRECOMPILEDHEADERS
-	#include "Laptop All.h"
-#else
 	#include "IMP MainPage.h"
 	#include "CharProfile.h"
 	#include "IMPVideoObjects.h"
@@ -23,7 +20,6 @@
 	#include "Soldier Profile.h"
 	#include "Squads.h"
 	#include "Overhead.h"		// added by Flugente for OUR_TEAM_SIZE_NO_VEHICLE
-#endif
 
 #include "IMP Confirm.h"
 

Laptop/IMP Minor Trait.cpp

@@ -1,8 +1,3 @@
-#ifdef PRECOMPILEDHEADERS
-	#include "Laptop All.h"
-	#include "IMP Skill Trait.h"
-	#include "_Ja25Englishtext.h"
-#else
 	#include "IMP Minor Trait.h"
 	#include "IMP Skill Trait.h"
 	#include "Button System.h"
@@ -22,7 +17,6 @@
 	#include "IMP Compile Character.h"
 	#include "GameSettings.h"
 	#include "personnel.h"		// added by Flugente
-#endif
 
 
 

Laptop/IMP Personality Entrance.cpp

@@ -1,6 +1,3 @@
-#ifdef PRECOMPILEDHEADERS
-	#include "Laptop All.h"
-#else
 	#include "CharProfile.h"
 	#include "IMP Personality Entrance.h"
 	#include "IMP MainPage.h"
@@ -12,7 +9,6 @@
 	#include "cursors.h"
 	#include "laptop.h"
 	#include "IMP Text System.h"
-#endif
 
 // IMP personality entrance buttons
 INT32 giIMPPersonalityEntranceButton[1];

Laptop/IMP Personality Finish.cpp

@@ -1,6 +1,3 @@
-#ifdef PRECOMPILEDHEADERS
-	#include "Laptop All.h"
-#else
 	#include "CharProfile.h"
 	#include "IMP Personality Finish.h"
 	#include "IMP MainPage.h"
@@ -13,7 +10,6 @@
 	#include "laptop.h"
 	#include "IMP Text System.h"
 	#include "IMP Compile Character.h"
-#endif
 
 // this is the amount of time, the player waits until booted back to main profileing screen
 

Laptop/IMP Personality Quiz.cpp

@@ -1,6 +1,3 @@
-#ifdef PRECOMPILEDHEADERS
-	#include "Laptop All.h"
-#else
 	#include "CharProfile.h"
 	#include "IMP Personality Quiz.h"
 	#include "IMP MainPage.h"
@@ -16,7 +13,6 @@
 	#include "IMP Text System.h"
 	#include "input.h"
 	#include "english.h"
-#endif
 
 
 // Kaiden this line was commented before I screwed with it

Laptop/IMP Portraits.cpp

@@ -1,6 +1,3 @@
-#ifdef PRECOMPILEDHEADERS
-	#include "Laptop All.h"
-#else
 	#include "CharProfile.h"
 	#include "IMP Portraits.h"
 	#include "IMP MainPage.h"
@@ -15,7 +12,6 @@
 	#include "cursors.h"
 	#include "laptop.h"
 	#include "IMP Text System.h"
-#endif
 
 #include "IMP Confirm.h"
 

Laptop/IMP Prejudice.cpp

@@ -3,11 +3,6 @@
  * @author Flugente (bears-pit.com)
  */
 
-#ifdef PRECOMPILEDHEADERS
-	#include "Laptop All.h"
-	#include "IMP Skill Trait.h"
-	#include "_Ja25Englishtext.h"
-#else
 	#include "IMP Prejudice.h"
 	#include "IMP Skill Trait.h"
 	#include "Button System.h"
@@ -28,7 +23,6 @@
 	#include "GameSettings.h"
 	#include "Interface.h"
 	#include "DropDown.h"
-#endif
 
 
 //*******************************************************************

Laptop/IMP Skill Trait.cpp

@@ -1,8 +1,3 @@
-#ifdef PRECOMPILEDHEADERS
-	#include "Laptop All.h"
-	#include "IMP Skill Trait.h"
-	#include "_Ja25Englishtext.h"
-#else
 	#include "IMP Skill Trait.h"
 	#include "Button System.h"
 	#include "utilities.h"
@@ -24,7 +19,6 @@
 	#include "IMP Minor Trait.h"
 	#include "Soldier Profile.h"
 	#include "personnel.h"		// added by Flugente
-#endif
 
 
 

Laptop/IMP Text System.cpp

@@ -1,6 +1,3 @@
-#ifdef PRECOMPILEDHEADERS
-	#include "Laptop All.h"
-#else
 	#include "WordWrap.h"
 	#include "sgp.h"
 	#include "Encrypted File.h"
@@ -41,7 +38,6 @@
 	#include "GameSettings.h"
 #endif
 
-#endif
 
 #define IMP_SEEK_AMOUNT 5 * 80 * 2
 

Laptop/IMP Voices.cpp

@@ -1,6 +1,3 @@
-#ifdef PRECOMPILEDHEADERS
-	#include "Laptop All.h"
-#else
 	#include "CharProfile.h"
 	#include "IMP Voices.h"
 	#include "IMP MainPage.h"
@@ -20,7 +17,6 @@
 	#include "GameSettings.h"
 	#include "LaptopSave.h"
 	#include "IMP Confirm.h"
-#endif
 
 INT32 iCurrentVoice = 0;
 UINT32 iSelectedIMPVoiceSet = 0;

Laptop/IMPVideoObjects.cpp

@@ -1,6 +1,3 @@
-#ifdef PRECOMPILEDHEADERS
-	#include "Laptop All.h"
-#else
 	#include "IMPVideoObjects.h"
 	#include "Utilities.h"
 	#include "WCheck.h"
@@ -10,7 +7,6 @@
 	#include "laptop.h"
 	#include "Multi Language Graphic Utils.h"
 	#include "IMP Attribute Selection.h"
-#endif
 
 // globals
 

Laptop/Intelmarket.cpp

@@ -3,9 +3,6 @@
 * @author Flugente (bears-pit.com)
 */
 
-#ifdef PRECOMPILEDHEADERS
-#include "Laptop All.h"
-#else
 #include "laptop.h"
 #include "insurance.h"
 #include "insurance Contract.h"
@@ -32,7 +29,6 @@
 #include "Game Clock.h"
 #include "LuaInitNPCs.h"
 #include "Game Event Hook.h"
-#endif
 
 #define		MERCOMP_FONT_COLOR								2
 #define		CAMPHIS_FONT_COLOR_RED							FONT_MCOLOR_RED

Laptop/Laptop All.h

@@ -1,145 +0,0 @@
-#ifndef __LAPTOP_ALL_H
-#define __LAPTOP_ALL_H
-
-#pragma message("GENERATED PCH FOR LAPTOP PROJECT.")
-
-#include "Types.h"
-#include "laptop.h"
-#include "aim.h"
-#include "Utilities.h"
-#include "WCheck.h"
-#include "Debug.h"
-#include "WordWrap.h"
-#include "Encrypted File.h"
-#include "email.h"
-#include "Text.h"
-#include "LaptopSave.h"
-#include "Multi Language Graphic Utils.h"
-#include "AimArchives.h"
-#include "AimFacialIndex.h"
-#include "stdio.h"
-#include "Aim.h"
-#include "AimHistory.h"
-#include "AimLinks.h"
-#include "AimMembers.h"
-#include "sysutil.h"
-#include "Soldier Control.h"
-#include "Interface Items.h"
-#include "overhead.h"
-#include "finances.h"
-#include "vsurface.h"
-#include "VObject.h"
-#include "Faces.h"
-#include "dialogue control.h"
-#include "History.h"
-#include "Game Event Hook.h"
-#include "MercTextBox.h"
-#include "Render Dirty.h"
-#include "Soldier Add.h"
-#include "Merc Hiring.h"
-#include "strategic.h"
-#include "english.h"
-#include "GameSettings.h"
-#include "Random.h"
-#include "Strategic Status.h"
-#include "Merc Contract.h"
-#include "Strategic Merc Handler.h"
-#include "AimPolicies.h"
-#include "AimSort.h"
-#include <stdlib.h>
-#include "BobbyR.h"
-#include "Arms Dealer Init.h"
-#include "ArmsDealerInvInit.h"
-#include "BobbyRGuns.h"
-#include "Cursors.h"
-#include "Weapons.h"
-#include "Store Inventory.h"
-#include "BobbyRAmmo.h"
-#include "BobbyRArmour.h"
-#include "BobbyRMailOrder.h"
-#include "input.h"
-#include "line.h"
-#include "Campaign Types.h"
-#include "BobbyRMisc.h"
-#include "BobbyRUsed.h"
-#include "CharProfile.h"
-#include "IMP AboutUs.h"
-#include "IMP Attribute Entrance.h"
-#include "IMP Attribute Finish.h"
-#include "IMP MainPage.h"
-#include "IMP HomePage.h"
-#include "IMPVideoObjects.h"
-#include "IMP Text System.h"
-#include "IMP Finish.h"
-#include "IMP Portraits.h"
-#include "IMP Voices.h"
-#include "IMP Personality Entrance.h"
-#include "IMP Attribute Selection.h"
-#include "IMP Personality Quiz.h"
-#include "IMP Begin Screen.h"
-#include "IMP Personality Finish.h"
-#include "IMP Confirm.h"
-#include "messageboxscreen.h"
-#include "soldier profile.h"
-#include "IMP Compile Character.h"
-#include "environment.h"
-#include <stdio.h>
-#include "files.h"
-#include "Game clock.h"
-#include "Strategic Mines.h"
-#include "florist.h"
-#include "florist Cards.h"
-#include "Florist Gallery.h"
-#include "florist Order Form.h"
-#include "Text Input.h"
-#include "funeral.h"
-#include "strategicmap.h"
-#include "QuestText.h"
-#include "Isometric Utils.h"
-#include "Timer Control.h"
-#include "Soldier Profile Type.h"
-#include "Animation Data.h"
-#include "soundman.h"
-#include "mousesystem.h"
-#include "sgp.h"
-#include "Sound Control.h"
-#include "Insurance Text.h"
-#include "insurance.h"
-#include "Assignments.h"
-#include "insurance Info.h"
-#include "insurance Contract.h"
-#include "screens.h"
-#include "Event Pump.h"
-#include "mercs Files.h"
-#include "mercs Account.h"
-#include "mercs No Account.h"
-#include "insurance Comments.h"
-#include "sirtech.h"
-#include "personnel.h"
-#include "Interface Control.h"
-#include "Game init.h"
-#include "vobject_blitters.h"
-#include "LibraryDataBase.h"
-#include "music control.h"
-#include "SaveLoadGame.h"
-#include "RenderWorld.h"
-#include "gameloop.h"
-#include "Map Screen Interface.h"
-#include "ambient control.h"
-#include "Message.h"
-#include "Map Screen Interface Bottom.h"
-#include "Cursor Control.h"
-#include "Quests.h"
-#include "mercs.h"
-#include "Speck Quotes.h"
-#include "Font.h"
-#include "mapscreen.h"
-#include "Map Screen Interface Map.h"
-#include "ShopKeeper Interface.h"
-#include "Cheats.h"
-#include "GameVersion.h"
-#include "BriefingRoom_Data.h"
-#include "Encyclopedia_new.h"
-#include "Encyclopedia_Data_new.h"
-#include "Rebel Command.h"
-#endif

Laptop/Laptop_VS2005.vcproj

@@ -634,10 +634,6 @@
 				RelativePath=".\Intelmarket.h"
 				>
 			</File>
-			<File
-				RelativePath=".\Laptop All.h"
-				>
-			</File>
 			<File
 				RelativePath=".\laptop.h"
 				>

Laptop/Laptop_VS2008.vcproj

@@ -634,10 +634,6 @@
 				RelativePath="Intelmarket.h"
 				>
 			</File>
-			<File
-				RelativePath="Laptop All.h"
-				>
-			</File>
 			<File
 				RelativePath="laptop.h"
 				>

Laptop/Laptop_VS2010.vcxproj

@@ -97,7 +97,6 @@
     <ClInclude Include="Insurance Text.h" />
     <ClInclude Include="insurance.h" />
     <ClInclude Include="Intelmarket.h" />
-	<ClInclude Include="Laptop All.h" />
     <ClInclude Include="laptop.h" />
     <ClInclude Include="LaptopSave.h" />
     <ClInclude Include="merccompare.h" />

Laptop/Laptop_VS2010.vcxproj.filters

@@ -189,7 +189,6 @@
 	<ClInclude Include="Intelmarket.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Laptop All.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="laptop.h">

Laptop/Laptop_VS2013.vcxproj

@@ -97,7 +97,6 @@
     <ClInclude Include="Insurance Text.h" />
     <ClInclude Include="insurance.h" />
 	<ClInclude Include="Intelmarket.h" />
-    <ClInclude Include="Laptop All.h" />
     <ClInclude Include="laptop.h" />
     <ClInclude Include="LaptopSave.h" />
     <ClInclude Include="merccompare.h" />

Laptop/Laptop_VS2013.vcxproj.filters

@@ -180,7 +180,6 @@
 	<ClInclude Include="Intelmarket.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Laptop All.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="laptop.h">

Laptop/Laptop_VS2017.vcxproj

@@ -97,7 +97,6 @@
     <ClInclude Include="Insurance Text.h" />
     <ClInclude Include="insurance.h" />
     <ClInclude Include="Intelmarket.h" />
-    <ClInclude Include="Laptop All.h" />
     <ClInclude Include="laptop.h" />
     <ClInclude Include="LaptopSave.h" />
     <ClInclude Include="merccompare.h" />

Laptop/Laptop_VS2019.vcxproj

@@ -117,7 +117,6 @@
     <ClInclude Include="Insurance Text.h" />
     <ClInclude Include="insurance.h" />
     <ClInclude Include="Intelmarket.h" />
-    <ClInclude Include="Laptop All.h" />
     <ClInclude Include="laptop.h" />
     <ClInclude Include="LaptopSave.h" />
     <ClInclude Include="merccompare.h" />

Laptop/MilitiaWebsite.cpp

@@ -3,9 +3,6 @@
 * @author Flugente (bears-pit.com)
 */
 
-#ifdef PRECOMPILEDHEADERS
-#include "Laptop All.h"
-#else
 #include "laptop.h"
 #include "insurance.h"
 #include "insurance Contract.h"
@@ -48,7 +45,6 @@
 #include "Interface Items.h"
 #include "InterfaceItemImages.h"
 #include "CampaignStats.h"
-#endif
 
 
 #define		MERCOMP_FONT_COLOR								2

Laptop/PMC.cpp

@@ -3,9 +3,6 @@
 * @author Flugente (bears-pit.com)
 */
 
-#ifdef PRECOMPILEDHEADERS
-#include "Laptop All.h"
-#else
 #include "laptop.h"
 #include "insurance.h"
 #include "insurance Contract.h"
@@ -39,7 +36,6 @@
 #include "Town Militia.h"
 #include "Strategic Town Loyalty.h"
 #include "MilitiaIndividual.h"
-#endif
 
 std::vector<PMCReinforcesHireEvent> gPMCHiringEvents;
 PMCGlobalData gPMCData;

Laptop/Store Inventory.cpp

@@ -1,6 +1,3 @@
-#ifdef PRECOMPILEDHEADERS
-	#include "Laptop All.h"
-#else
 	#include "Types.h"
 	#include "Store Inventory.h"
 	#include "Random.h"
@@ -10,7 +7,6 @@
 	#include "ShopKeeper Interface.h"
 	#include "armsdealerinvinit.h"
 	#include "GameSettings.h"
-#endif
 
 
 UINT8 StoreInventory[MAXITEMS][BOBBY_RAY_LISTS]; //=

Laptop/WHO.cpp

@@ -3,9 +3,6 @@
 * @author Flugente (bears-pit.com)
 */
 
-#ifdef PRECOMPILEDHEADERS
-#include "Laptop All.h"
-#else
 #include "laptop.h"
 #include "insurance.h"
 #include "insurance Contract.h"
@@ -29,7 +26,6 @@
 #include "Quests.h"
 #include "finances.h"
 #include "Game Clock.h"
-#endif
 
 
 #define		MERCOMP_FONT_COLOR								2

Laptop/XML_AIMAvailability.cpp

@@ -1,13 +1,9 @@
-#ifdef PRECOMPILEDHEADERS
-	#include "Tactical All.h"
-#else
 	#include "sgp.h"
 	#include "Debug Control.h"
 	#include "expat.h"
 	#include "XML.h"
 	#include "Interface.h"
 	#include "aim.h"
-#endif
 
 struct
 {

Laptop/XML_BriefingRoom.cpp

@@ -1,8 +1,3 @@
-#ifdef PRECOMPILEDHEADERS
-	#include "Tactical All.h"
-	#include "Editor All.h"
-	#include "LuaInitNPCs.h"
-#else
 	#include "sgp.h"
 	#include "Debug Control.h"
 	#include "expat.h"
@@ -16,7 +11,6 @@
 	#include "mercs.h"
 	#include "Encrypted File.h"
 	#include "GameSettings.h"
-#endif
 
 #include "BriefingRoom_Data.h"
 

Laptop/XML_CampaignStatsEvents.cpp

@@ -1,12 +1,8 @@
-#ifdef PRECOMPILEDHEADERS
-	#include "Tactical All.h"
-#else
 	#include "sgp.h"
 	#include "Debug Control.h"
 	#include "expat.h"
 	#include "XML.h"
 	#include "CampaignStats.h"
-#endif
 
 struct
 {

Laptop/XML_ConditionsForMercAvailability.cpp

@@ -1,13 +1,9 @@
-#ifdef PRECOMPILEDHEADERS
-	#include "Tactical All.h"
-#else
 	#include "sgp.h"
 	#include "Debug Control.h"
 	#include "expat.h"
 	#include "XML.h"
 	#include "Interface.h"
 	#include "mercs.h"
-#endif
 
 struct
 {

Laptop/XML_Email.cpp

@@ -1,8 +1,3 @@
-#ifdef PRECOMPILEDHEADERS
-	#include "Tactical All.h"
-	#include "Editor All.h"
-	#include "LuaInitNPCs.h"
-#else
 	#include "sgp.h"
 	#include "Debug Control.h"
 	#include "expat.h"
@@ -10,7 +5,6 @@
 	#include "Interface.h"
 	#include "LuaInitNPCs.h"
 	#include "email.h"
-#endif
 
 struct
 {

Laptop/XML_EmailMercAvailable.cpp

@@ -1,8 +1,3 @@
-#ifdef PRECOMPILEDHEADERS
-	#include "Tactical All.h"
-	#include "Editor All.h"
-	#include "LuaInitNPCs.h"
-#else
 	#include "sgp.h"
 	#include "Debug Control.h"
 	#include "expat.h"
@@ -10,7 +5,6 @@
 	#include "Interface.h"
 	#include "LuaInitNPCs.h"
 	#include "email.h"
-#endif
 
 struct
 {

Laptop/XML_EmailMercLevelUp.cpp

@@ -1,8 +1,3 @@
-#ifdef PRECOMPILEDHEADERS
-	#include "Tactical All.h"
-	#include "Editor All.h"
-	#include "LuaInitNPCs.h"
-#else
 	#include "sgp.h"
 	#include "Debug Control.h"
 	#include "expat.h"
@@ -10,7 +5,6 @@
 	#include "Interface.h"
 	#include "LuaInitNPCs.h"
 	#include "email.h"
-#endif
 
 struct
 {

Laptop/XML_History.cpp

@@ -1,6 +1,3 @@
-#ifdef PRECOMPILEDHEADERS
-	#include "Tactical All.h"
-#else
 	#include "sgp.h"
 	#include "Debug Control.h"
 	#include "expat.h"
@@ -9,7 +6,6 @@
 	#include "Soldier Profile.h"
 	#include "Text.h"
 	#include "history.h"
-#endif
 
 struct
 {

Laptop/XML_IMPPortraits.cpp

@@ -1,6 +1,3 @@
-#ifdef PRECOMPILEDHEADERS
-	#include "Tactical All.h"
-#else
 	#include "sgp.h"
 	#include "Debug Control.h"
 	#include "expat.h"
@@ -8,7 +5,6 @@
 	#include "Interface.h"
 	#include "IMP Confirm.h"
 	#include "Soldier Profile.h"
-#endif
 
 struct
 {

Laptop/XML_IMPVoices.cpp

@@ -1,12 +1,8 @@
-#ifdef PRECOMPILEDHEADERS
-#include "Tactical All.h"
-#else
 #include "sgp.h"
 #include "Debug Control.h"
 #include "expat.h"
 #include "XML.h"
 #include "IMP Confirm.h"
-#endif
 
 struct
 {

Laptop/XML_OldAIMArchive.cpp

@@ -1,13 +1,9 @@
-#ifdef PRECOMPILEDHEADERS
-	#include "Tactical All.h"
-#else
 	#include "sgp.h"
 	#include "Debug Control.h"
 	#include "expat.h"
 	#include "XML.h"
 	#include "Interface.h"
 	#include "AimArchives.h"
-#endif
 
 struct
 {

Laptop/aim.cpp

@@ -1,6 +1,3 @@
-#ifdef PRECOMPILEDHEADERS
-	#include "Laptop All.h"
-#else
 	#include "laptop.h"
 	#include "aim.h"
 	#include "Utilities.h"
@@ -17,7 +14,6 @@
 	#include "GameSettings.h"
 	#include "english.h"
 	#include "sysutil.h"
-#endif
 
 #include "LocalizedStrings.h"
 #include "Soldier Profile.h"

Laptop/email.cpp

@@ -1,7 +1,4 @@
-#ifdef PRECOMPILEDHEADERS
-	#include "Laptop All.h"
-#else
-	#include "laptop.h"
+	#include "laptop.h"
 	#include "email.h"
 	#include "Utilities.h"
 	#include "WCheck.h"
@@ -23,7 +20,6 @@
 	#include "faces.h"
 	#include "GameSettings.h"
 	#include <string>
-#endif
 #include "soldier profile type.h"
 #include "strategicmap.h"
 

Laptop/files.cpp

@@ -1,6 +1,3 @@
-#ifdef PRECOMPILEDHEADERS
-	#include "Laptop All.h"
-#else
 	#include "builddefines.h"
 	#include <stdio.h>
 	#include <list>
@@ -21,7 +18,6 @@
 	#include "XML.h"
 	#include "expat.h"
 	#include "Debug Control.h"
-#endif
 
 #ifdef JA2UB
 #include "ub_config.h"

Laptop/finances.cpp

@@ -1,6 +1,3 @@
-#ifdef PRECOMPILEDHEADERS
-	#include "Laptop All.h"
-#else
 	#include "laptop.h"
 	#include "finances.h"
 	#include "Game clock.h"
@@ -23,7 +20,6 @@
 	#include "CampaignStats.h"		// added by Flugente
 	#include "DynamicDialogue.h"	// added by Flugente
 
-#endif
 
 // the global defines
 

Laptop/florist Cards.cpp

@@ -1,6 +1,3 @@
-#ifdef PRECOMPILEDHEADERS
-	#include "Laptop All.h"
-#else
 	#include "laptop.h"
 	#include "florist.h"
 	#include "florist Cards.h"
@@ -10,7 +7,6 @@
 	#include "Cursors.h"
 	#include "Encrypted File.h"
 	#include "Text.h"
-#endif
 
 
 

Laptop/florist Gallery.cpp

@@ -1,6 +1,3 @@
-#ifdef PRECOMPILEDHEADERS
-	#include "Laptop All.h"
-#else
 	#include "laptop.h"
 	#include "florist.h"
 	#include "florist Gallery.h"
@@ -11,7 +8,6 @@
 	#include "stdio.h"
 	#include "Encrypted File.h"
 	#include "Text.h"
-#endif
 
 
 

Laptop/florist Order Form.cpp

@@ -1,6 +1,3 @@
-#ifdef PRECOMPILEDHEADERS
-	#include "Laptop All.h"
-#else
 	#include "laptop.h"
 	#include "florist.h"
 	#include "florist Order Form.h"
@@ -20,7 +17,6 @@
 	#include "LaptopSave.h"
 	#include "Random.h"
 	#include "postalservice.h"
-#endif
 
 #include "meanwhile.h"
 

Laptop/florist.cpp

@@ -1,6 +1,3 @@
-#ifdef PRECOMPILEDHEADERS
-	#include "Laptop All.h"
-#else
 	#include "laptop.h"
 	#include "florist.h"
 	#include "florist Order Form.h"
@@ -12,7 +9,6 @@
 	#include "florist Cards.h"
 	#include "Text.h"
 	#include "Multi Language Graphic Utils.h"
-#endif
 
 
 #define		FLORIST_SENTENCE_FONT							FONT12ARIAL

Laptop/funeral.cpp

@@ -1,6 +1,3 @@
-#ifdef PRECOMPILEDHEADERS
-	#include "Laptop All.h"
-#else
 	#include "laptop.h"
 	#include "funeral.h"
 	#include "WCheck.h"
@@ -9,7 +6,6 @@
 	#include "Cursors.h"
 	#include "Text.h"
 	#include "Multi Language Graphic Utils.h"
-#endif
 
 
 #define		FUNERAL_SENTENCE_FONT							FONT12ARIAL

Laptop/history.cpp

@@ -1,6 +1,3 @@
-#ifdef PRECOMPILEDHEADERS
-	#include "Laptop All.h"
-#else
 	#include "laptop.h"
 	#include "History.h"
 	#include "Game clock.h"
@@ -16,7 +13,6 @@
 	#include "text.h"
 	#include "message.h"
 	#include "LaptopSave.h"
-#endif
 
 #include "connect.h"
 

Laptop/insurance Comments.cpp

@@ -1,6 +1,3 @@
-#ifdef PRECOMPILEDHEADERS
-	#include "Laptop All.h"
-#else
 	#include "laptop.h"
 	#include "Insurance Text.h"
 	#include "insurance.h"
@@ -10,7 +7,6 @@
 	#include "WordWrap.h"
 	#include "Cursors.h"
 	#include "Text.h"
-#endif
 
 
 #define		INS_CMNT_TITLE_Y								52 + LAPTOP_SCREEN_WEB_UL_Y

Laptop/insurance Contract.cpp

@@ -1,6 +1,3 @@
-#ifdef PRECOMPILEDHEADERS
-	#include "Laptop All.h"
-#else
 	#include "laptop.h"
 	#include "insurance.h"
 	#include "insurance Contract.h"
@@ -26,7 +23,6 @@
 	#include "Assignments.h"
 	#include "Map Screen Interface.h"
 	#include "Interface.h"				// added by Flugente
-#endif
 #include <vector>
 
 #ifdef JA2UB

Laptop/insurance Info.cpp

@@ -1,6 +1,3 @@
-#ifdef PRECOMPILEDHEADERS
-	#include "Laptop All.h"
-#else
 	#include "laptop.h"
 	#include "insurance Info.h"
 	#include "insurance.h"
@@ -10,7 +7,6 @@
 	#include "Cursors.h"
 	#include "Insurance Text.h"
 	#include "Text.h"
-#endif
 
 
 #define		INS_INFO_FRAUD_TEXT_COLOR					FONT_MCOLOR_RED

Laptop/insurance.cpp

@@ -1,6 +1,3 @@
-#ifdef PRECOMPILEDHEADERS
-	#include "Laptop All.h"
-#else
 	#include "laptop.h"
 	#include "insurance.h"
 	#include "insurance Contract.h"
@@ -13,7 +10,6 @@
 	#include "Encrypted File.h"
 	#include "Text.h"
 	#include "Multi Language Graphic Utils.h"
-#endif
 
 
 #define		INSURANCE_BACKGROUND_WIDTH					125

Laptop/laptop.cpp

@@ -1,9 +1,3 @@
-#ifdef PRECOMPILEDHEADERS
-	#include "Laptop All.h"
-	#include "HelpScreen.h"
-	#include "BrokenLink.h"
-	#include "BobbyRShipments.h"
-#else
 	#include "sgp.h"
 	#include "Utilities.h"
 	#include "WCheck.h"
@@ -94,7 +88,6 @@
 	#include "Intelmarket.h"				// added by Flugente
 	#include "FacilityProduction.h"			// added by Flugente
 	#include "Rebel Command.h"
-#endif
 
 #include "connect.h"
 #include "BriefingRoom_Data.h"

Laptop/merccompare.cpp

@@ -3,9 +3,6 @@
 * @author Flugente (bears-pit.com)
 */
 
-#ifdef PRECOMPILEDHEADERS
-#include "Laptop All.h"
-#else
 #include "laptop.h"
 #include "insurance.h"
 #include "insurance Contract.h"
@@ -27,7 +24,6 @@
 #include "Overhead.h"
 #include "Map Screen Interface.h"
 #include "DynamicDialogue.h"	// added by Flugente
-#endif
 
 
 #define		MERCOMP_FONT_COLOR								2
@@ -1227,4 +1223,4 @@ void SelectMercCompareMatrixRegionCallBack( MOUSE_REGION * pRegion, INT32 iReaso
 	{
 	}
 }
-////////////////////////// MERC COMPARE MATRIX ////////////////////////////////
+////////////////////////// MERC COMPARE MATRIX ////////////////////////////////

Laptop/mercs Account.cpp

@@ -1,6 +1,3 @@
-#ifdef PRECOMPILEDHEADERS
-	#include "Laptop All.h"
-#else
 	#include "laptop.h"
 	#include "mercs Account.h"
 	#include "mercs.h"
@@ -19,7 +16,6 @@
 	#include "Text.h"
 	#include "Speck Quotes.h"
 	#include "Multi Language Graphic Utils.h"
-#endif
 
 #define		MERC_ACCOUNT_TEXT_FONT				FONT14ARIAL
 #define		MERC_ACCOUNT_TEXT_COLOR				FONT_MCOLOR_WHITE

Laptop/mercs Files.cpp

@@ -1,7 +1,4 @@
 // WANNE 3 <changed some lines>
-#ifdef PRECOMPILEDHEADERS
-	#include "Laptop All.h"
-#else
 	#include "laptop.h"
 	#include "mercs Files.h"
 	#include "mercs.h"
@@ -33,7 +30,6 @@
 	#include "Personnel.h"
 	#include "Encyclopedia_new.h"	//update encyclopedia item visibility when viewing that item
 	#include "mousesystem.h"
-#endif
 
 #include "Cheats.h"
 #include "connect.h"

Laptop/mercs No Account.cpp

@@ -1,6 +1,3 @@
-#ifdef PRECOMPILEDHEADERS
-	#include "Laptop All.h"
-#else
 	#include "laptop.h"
 	#include "mercs No Account.h"
 	#include "mercs.h"
@@ -12,7 +9,6 @@
 	#include "Random.h"
 	#include "Text.h"
 	#include "Speck Quotes.h"
-#endif
 
 
 

Laptop/mercs.cpp

@@ -1,12 +1,3 @@
-#ifdef PRECOMPILEDHEADERS
-	#include "Laptop All.h"
-	#include "GameSettings.h"
-
-#ifdef JA2UB
-	#include "Ja25 Strategic Ai.h"
-#endif
-
-#else
 	#include "laptop.h"
 	#include "mercs.h"
 	#include "Utilities.h"
@@ -31,7 +22,6 @@
 	#include "Game Event Hook.h"
 	#include "Quests.h"
 	#include "AimMembers.h"
-#endif
 
 #ifdef JA2UB
 #include "Ja25_Tactical.h"

Laptop/personnel.cpp

@@ -1,6 +1,3 @@
-#ifdef PRECOMPILEDHEADERS
-	#include "Laptop All.h"
-#else
 	#include "laptop.h"
 	#include "personnel.h"
 	#include "Utilities.h"
@@ -30,7 +27,6 @@
 	#include "GameSettings.h"
 	#include "Merc Contract.h"
 	#include "_Ja25Englishtext.h" // added by SANDRO
-#endif
 
 #include "Soldier Macros.h"
 #include "InterfaceItemImages.h"

Laptop/sirtech.cpp

@@ -1,9 +1,5 @@
-#ifdef PRECOMPILEDHEADERS
-	#include "Laptop All.h"
-#else
 	#include "laptop.h"
 	#include "SirTech.h"
-#endif
 
 void GameInitSirTech()
 {