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

Credits.cpp

@@ -1,9 +1,3 @@
-#ifdef PRECOMPILEDHEADERS
-	#include "JA2 All.h"
-	#include "Credits.h"
-	#include "Encrypted File.h"
-	#include "Language Defines.h"
-#else
 	#include "Types.h"
 	#include "Credits.h"
 	#include "Language Defines.h"
@@ -26,7 +20,6 @@
 	#include "english.h"
 	#include "encrypted file.h"
 	#include "Random.h"
-#endif
 
 //externals
 extern HVSURFACE ghFrameBuffer;

Editor/Cursor Modes.cpp

@@ -1,12 +1,7 @@
-#ifdef PRECOMPILEDHEADERS
-	#include "Editor All.h"
-#else
 	#include "builddefines.h"
-#endif
 
 #ifdef JA2EDITOR
 
-#ifndef PRECOMPILEDHEADERS
 	#include "types.h"
 	#include "Cursor Modes.h"
 	#include "renderworld.h"
@@ -22,7 +17,6 @@
 	#include "Overhead.h"
 	#include "EditorMercs.h"
 	#include "EditorBuildings.h"
-#endif
 
 #include "Text.h"
 

Editor/Editor All.h

@@ -1,127 +0,0 @@
-#include "BuildDefines.h"
-
-#ifndef __EDITOR_ALL_H
-#define __EDITOR_ALL_H
-
-#ifdef JA2EDITOR
-
-#pragma message("GENERATED PCH FOR EDITOR PROJECT.")
-
-//external
-#include "types.h"
-#include <stdio.h>
-#include <windows.h>
-#include "Action Items.h"
-#include "Button System.h"
-#include "debug.h"
-#include "english.h"
-#include "environment.h"
-#include "Exit Grids.h"
-#include "font.h"
-#include "Font Control.h"
-#include "Keys.h"
-#include "input.h"
-#include "interface.h"
-#include "Interface Items.h"
-#include "Isometric Utils.h"
-#include "interface panels.h"
-#include "lighting.h"
-#include "Map Information.h"
-#include "mousesystem.h"
-#include "Overhead.h"
-#include "Overhead map.h"
-#include "overhead types.h"
-#include "pits.h"
-#include "random.h"
-#include "Render Fun.h"
-#include "Render Dirty.h"
-#include "renderworld.h"
-#include "Simple Render Utils.h"
-#include "Soldier Create.h"
-#include "Soldier Find.h"
-#include "sysutil.h"
-#include "Text.h"
-#include "Text Input.h"
-#include "tiledef.h"
-#include "utilities.h"
-#include "video.h"
-#include "vobject.h"
-#include "vobject_blitters.h"
-#include "vsurface.h"
-#include "wcheck.h"
-#include "weapons.h"
-#include "wordwrap.h"
-#include "WorldDat.h"
-#include "worlddef.h"
-#include "World Items.h"
-#include "worldman.h"
-#include "line.h"
-#include "Animation Data.h"
-#include "Animation Control.h"
-#include "Soldier Init List.h"
-#include "StrategicMap.h"
-#include "Soldier Add.h"
-#include "Soldier Control.h"
-#include "soldier profile type.h"
-#include "Soldier Profile.h"
-#include "Inventory Choosing.h"
-#include "Scheduling.h"
-#include "Timer Control.h"
-#include "sgp.h"
-#include "screenids.h"
-#include "Sys Globals.h"
-#include "Interactive Tiles.h"
-#include "Handle UI.h"
-#include "Event Pump.h"
-#include "message.h"
-#include "Game Clock.h"
-#include "Game Init.h"
-#include "Map Edgepoints.h"
-#include "Music Control.h"
-#include <memory.h>
-#include "Item Types.h"
-#include "Items.h"
-#include "Handle Items.h"
-#include "Animated ProgressBar.h"
-#include "gameloop.h"
-#include <stdlib.h>
-#include "Structure Internals.h"
-#include "Cursors.h"
-#include "FileMan.h"
-#include "Summary Info.h"
-#include "time.h"
-#include "structure wrap.h"
-#include "MessageBoxScreen.h"
-#include "GameSettings.h"
-
-
-//internal
-#include "Cursor Modes.h"
-#include "edit_sys.h"
-#include "Editor Callback Prototypes.h"
-#include "Editor Modes.h"
-#include "Editor Taskbar Creation.h"
-#include "Editor Taskbar Utils.h"
-#include "Editor Undo.h"
-#include "EditorBuildings.h"
-#include "EditorDefines.h"
-#include "EditorItems.h"
-#include "EditorMapInfo.h"
-#include "EditorMercs.h"
-#include "EditorTerrain.h"
-#include "editscreen.h"
-#include "Item Statistics.h"
-#include "LoadScreen.h"
-#include "messagebox.h"
-#include "newsmooth.h"
-#include "popupmenu.h"
-#include "Road Smoothing.h"
-#include "Sector Summary.h"
-#include "selectwin.h"
-#include "SmartMethod.h"
-#include "smooth.h"
-#include "Smoothing Utils.h"
-
-#endif
-
-#endif

Editor/Editor Callbacks.cpp

@@ -1,12 +1,7 @@
-#ifdef PRECOMPILEDHEADERS
-	#include "Editor All.h"
-#else
 	#include "builddefines.h"
-#endif
 
 #ifdef JA2EDITOR
 
-#ifndef PRECOMPILEDHEADERS
 	#include "types.h"
 	#include "Button System.h"
 	#include "EditorDefines.h"
@@ -31,7 +26,6 @@
 	#include "input.h"
 	#include "Map Information.h"
 	#include "EditorMapInfo.h"
-#endif
 
 #include "LoadScreen.h"
 #include "Text Input.h"

Editor/Editor Modes.cpp

@@ -1,13 +1,8 @@
-#ifdef PRECOMPILEDHEADERS
-	#include "Editor All.h"
-#else
 	#include "builddefines.h"
-#endif
 
 
 #ifdef JA2EDITOR
 
-#ifndef PRECOMPILEDHEADERS
 	#include "types.h"
 	#include "Editor Modes.h"
 	#include "Editor Taskbar Utils.h"
@@ -23,7 +18,6 @@
 	#include "worlddef.h"
 	#include "Exit Grids.h"
 	#include "Worldman.h"
-#endif
 
 BOOLEAN gfShowExitGrids = FALSE;
 

Editor/Editor Taskbar Creation.cpp

@@ -1,12 +1,7 @@
-#ifdef PRECOMPILEDHEADERS
-	#include "Editor All.h"
-#else
 	#include "builddefines.h"
-#endif
 
 #ifdef JA2EDITOR
 
-#ifndef PRECOMPILEDHEADERS
 	//sgp
 	#include "Button System.h"
 	#include "Font Control.h"
@@ -22,7 +17,6 @@
 	#include "overhead types.h"
 	#include "local.h"
 	#include "Text.h"
-#endif
 
 //Category tabs of the editor buttons
 void InitEditorTerrainToolbar();

Editor/Editor Taskbar Utils.cpp

@@ -1,12 +1,7 @@
-#ifdef PRECOMPILEDHEADERS
-	#include "Editor All.h"
-#else
 	#include "builddefines.h"
-#endif
 
 #ifdef JA2EDITOR
 
-#ifndef PRECOMPILEDHEADERS
 	#include <stdio.h>
 	#include "types.h"
 	#include "mousesystem.h"
@@ -47,7 +42,6 @@
 	#include "Keys.h"
 	#include "InterfaceItemImages.h"
 	#include "renderworld.h"//dnl ch78 271113
-#endif
 
 void RenderEditorInfo();
 

Editor/Editor Undo.cpp

@@ -1,12 +1,7 @@
-#ifdef PRECOMPILEDHEADERS
-	#include "Editor All.h"
-#else
 	#include "builddefines.h"
-#endif
 
 #ifdef JA2EDITOR
 
-#ifndef PRECOMPILEDHEADERS
 	#include "worlddef.h"
 	#include "worldman.h"
 	#include "smooth.h"
@@ -23,7 +18,6 @@
 	#include "keys.h"
 	#include "EditorItems.h"
 	#include "EditorMapInfo.h"
-#endif
 
 /*
 Kris -- Notes on how the undo code works:

Editor/EditorBuildings.cpp

@@ -1,12 +1,7 @@
-#ifdef PRECOMPILEDHEADERS
-	#include "Editor All.h"
-#else
 	#include "builddefines.h"
-#endif
 
 #ifdef JA2EDITOR
 
-#ifndef PRECOMPILEDHEADERS
 	#include "tiledef.h"
 	#include "edit_sys.h"
 	#include "sysutil.h"
@@ -34,7 +29,6 @@
 	#include "editscreen.h"
 	#include "EditorItems.h"
 	#include "EditorMapInfo.h"
-#endif
 
 BOOLEAN fBuildingShowRoofs, fBuildingShowWalls, fBuildingShowRoomInfo;
 UINT16 usCurrentMode;

Editor/EditorItems.cpp

@@ -1,12 +1,7 @@
-#ifdef PRECOMPILEDHEADERS
-	#include "Editor All.h"
-#else
 	#include "builddefines.h"
-#endif
 
 #ifdef JA2EDITOR
 
-#ifndef PRECOMPILEDHEADERS
 	#include <windows.h>
 	#include "tiledef.h"
 	#include "edit_sys.h"
@@ -44,7 +39,6 @@
 	#include "keys.h"
 	#include "InterfaceItemImages.h"
 	#include "Editor Undo.h"//dnl ch86 220214
-#endif
 
 #include <vfs/Tools/vfs_log.h>
 

Editor/EditorMapInfo.cpp

@@ -1,12 +1,7 @@
-#ifdef PRECOMPILEDHEADERS
-	#include "Editor All.h"
-#else
 	#include "builddefines.h"
-#endif
 
 #ifdef JA2EDITOR
 
-#ifndef PRECOMPILEDHEADERS
 	#include <windows.h>
 	#include "tiledef.h"
 	#include "edit_sys.h"
@@ -57,7 +52,6 @@
 	#include "environment.h"
 	#include "Simple Render Utils.h"
 	#include "Text.h"
-#endif
 
 //forward declarations of common classes to eliminate includes
 class OBJECTTYPE;

Editor/EditorMercs.cpp

@@ -1,12 +1,7 @@
-#ifdef PRECOMPILEDHEADERS
-	#include "Editor All.h"
-#else
 	#include "builddefines.h"
-#endif
 
 #ifdef JA2EDITOR
 
-#ifndef PRECOMPILEDHEADERS
 	#include <windows.h>
 	#include "tiledef.h"
 	#include "edit_sys.h"
@@ -64,7 +59,6 @@
 	#include "message.h"
 	#include "InterfaceItemImages.h"
 	#include "english.h"
-#endif
 //forward declarations of common classes to eliminate includes
 class OBJECTTYPE;
 class SOLDIERTYPE;

Editor/EditorTerrain.cpp

@@ -1,12 +1,7 @@
-#ifdef PRECOMPILEDHEADERS
-	#include "Editor All.h"
-#else
 	#include "builddefines.h"
-#endif
 
 #ifdef JA2EDITOR
 
-#ifndef PRECOMPILEDHEADERS
 	#include <windows.h>
 	#include "tiledef.h"
 	#include "edit_sys.h"
@@ -32,7 +27,6 @@
 	#include "Editor Taskbar Utils.h"
 	#include "Cursor Modes.h"
 	#include "english.h"
-#endif
 
 BOOLEAN gfShowTerrainTileButtons;
 UINT8 ubTerrainTileButtonWeight[NUM_TERRAIN_TILE_REGIONS];

Editor/Editor_VS2005.vcproj

@@ -350,10 +350,6 @@
 				RelativePath=".\edit_sys.h"
 				>
 			</File>
-			<File
-				RelativePath=".\Editor All.h"
-				>
-			</File>
 			<File
 				RelativePath=".\Editor Callback Prototypes.h"
 				>

Editor/Editor_VS2008.vcproj

@@ -350,10 +350,6 @@
 				RelativePath="edit_sys.h"
 				>
 			</File>
-			<File
-				RelativePath="Editor All.h"
-				>
-			</File>
 			<File
 				RelativePath="Editor Callback Prototypes.h"
 				>

Editor/Editor_VS2010.vcxproj

@@ -25,7 +25,6 @@
   <ItemGroup>
     <ClInclude Include="Button Defines.h" />
     <ClInclude Include="Cursor Modes.h" />
-    <ClInclude Include="Editor All.h" />
     <ClInclude Include="Editor Callback Prototypes.h" />
     <ClInclude Include="Editor Modes.h" />
     <ClInclude Include="Editor Taskbar Creation.h" />

Editor/Editor_VS2010.vcxproj.filters

@@ -18,7 +18,6 @@
     <ClInclude Include="edit_sys.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Editor All.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="Editor Callback Prototypes.h">

Editor/Editor_VS2013.vcxproj

@@ -25,7 +25,6 @@
   <ItemGroup>
     <ClInclude Include="Button Defines.h" />
     <ClInclude Include="Cursor Modes.h" />
-    <ClInclude Include="Editor All.h" />
     <ClInclude Include="Editor Callback Prototypes.h" />
     <ClInclude Include="Editor Modes.h" />
     <ClInclude Include="Editor Taskbar Creation.h" />

Editor/Editor_VS2013.vcxproj.filters

@@ -18,7 +18,6 @@
     <ClInclude Include="edit_sys.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Editor All.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="Editor Callback Prototypes.h">

Editor/Editor_VS2017.vcxproj

@@ -25,7 +25,6 @@
   <ItemGroup>
     <ClInclude Include="Button Defines.h" />
     <ClInclude Include="Cursor Modes.h" />
-    <ClInclude Include="Editor All.h" />
     <ClInclude Include="Editor Callback Prototypes.h" />
     <ClInclude Include="Editor Modes.h" />
     <ClInclude Include="Editor Taskbar Creation.h" />

Editor/Editor_VS2019.vcxproj

@@ -45,7 +45,6 @@
   <ItemGroup>
     <ClInclude Include="Button Defines.h" />
     <ClInclude Include="Cursor Modes.h" />
-    <ClInclude Include="Editor All.h" />
     <ClInclude Include="Editor Callback Prototypes.h" />
     <ClInclude Include="Editor Modes.h" />
     <ClInclude Include="Editor Taskbar Creation.h" />

Editor/Item Statistics.cpp

@@ -1,12 +1,7 @@
-#ifdef PRECOMPILEDHEADERS
-	#include "Editor All.h"
-#else
 	#include "builddefines.h"
-#endif
 
 #ifdef JA2EDITOR
 
-#ifndef PRECOMPILEDHEADERS
 	#include <memory.h>
 	#include <stdio.h>
 	#include "types.h"
@@ -31,7 +26,6 @@
 	#include "PopupMenu.h"
 	#include "pits.h"
 	#include "Text.h"
-#endif
 
 #include "soldier profile type.h"
 #include "LuaInitNPCs.h"

Editor/LoadScreen.cpp

@@ -1,12 +1,7 @@
-#ifdef PRECOMPILEDHEADERS
-	#include "Editor All.h"
-#else
 	#include "builddefines.h"
-#endif
 
 #ifdef JA2EDITOR
 
-#ifndef PRECOMPILEDHEADERS
 	#include <stdio.h>
 	#include "Font Control.h" 
 	#include "renderworld.h"
@@ -45,7 +40,6 @@
 	#include "MessageBoxScreen.h"
 	#include <vfs/Core/vfs.h>//dnl ch37 110909
 	#include "Exit Grids.h"//dnl ch86 190214
-#endif
 
 //===========================================================================
 

Editor/Road Smoothing.cpp

@@ -1,19 +1,13 @@
-#ifdef PRECOMPILEDHEADERS
-	#include "Editor All.h"
-#else
 	#include "builddefines.h"
-#endif
 
 #ifdef JA2EDITOR
 
-#ifndef PRECOMPILEDHEADERS
 	#include "types.h"
 	#include "Road Smoothing.h"
 	#include "tiledat.h"
 	#include "worlddef.h"
 	#include "worldman.h"
 	#include "Editor Undo.h"
-#endif
 
 
 typedef struct MACROSTRUCT

Editor/Sector Summary.cpp

@@ -1,13 +1,8 @@
-#ifdef PRECOMPILEDHEADERS
-	#include "Editor All.h"
-#else
 	#include "builddefines.h"
-#endif
 
 #ifdef JA2EDITOR
 
 
-#ifndef PRECOMPILEDHEADERS
 	#include <stdio.h>
 	#include "types.h"
 	#include "Sector Summary.h"
@@ -42,7 +37,6 @@
 	#include "GameSettings.h"
 	#include "EditorTerrain.h"//dnl ch78 261113
 	#include "Render Dirty.h"//dnl ch78 271113
-#endif
 
 #include <vfs/Core/vfs.h>
 #include <vfs/Core/vfs_file_raii.h>

Editor/SmartMethod.cpp

@@ -1,18 +1,12 @@
-#ifdef PRECOMPILEDHEADERS
-	#include "Editor All.h"
-#else
 	#include "builddefines.h"
-#endif
 
 #ifdef JA2EDITOR
 
-#ifndef PRECOMPILEDHEADERS
 	#include "worlddef.h"	//LEVELNODE def
 	#include "worldman.h"	//ReplaceStructIndex
 	#include "SmartMethod.h"
 	#include "Smoothing Utils.h"
 	#include "Editor Undo.h"
-#endif
 
 UINT8 gubDoorUIValue = 0;
 UINT8 gubWindowUIValue = 0;

Editor/Smoothing Utils.cpp

@@ -1,12 +1,7 @@
-#ifdef PRECOMPILEDHEADERS
-	#include "Editor All.h"
-#else
 	#include "builddefines.h"
-#endif
 
 #ifdef JA2EDITOR
 
-#ifndef PRECOMPILEDHEADERS
 	#include <stdlib.h>
 	#include "worlddef.h"	//for LEVELNODE def
 	#include "worldman.h" //for RemoveXXXX()
@@ -17,7 +12,6 @@
 	#include "EditorDefines.h"
 	#include "edit_sys.h"
 	#include "environment.h"
-#endif
 
 extern UINT16 PickAWallPiece( UINT16 usWallPieceType );
 

Editor/XML_ActionItems.cpp

@@ -1,9 +1,3 @@
-#ifdef PRECOMPILEDHEADERS
-	#include "Tactical All.h"
-	#include "Editor All.h"
-	#include "LuaInitNPCs.h"
-#else
-	#include "Editor All.h"
 	#include "sgp.h"
 	#include "Debug Control.h"
 	#include "expat.h"
@@ -11,7 +5,6 @@
 	#include "Interface.h"
 	#include "Item Statistics.h"
 	#include "LuaInitNPCs.h"
-#endif
 
 #include "Action Items.h"
 

Editor/edit_sys.cpp

@@ -1,13 +1,8 @@
-#ifdef PRECOMPILEDHEADERS
-	#include "Editor All.h"
-#else
 	#include "builddefines.h"
-#endif
 
 
 #ifdef JA2EDITOR
 
-#ifndef PRECOMPILEDHEADERS
 	#include "worlddef.h"
 	#include "worldman.h"
 	#include "smooth.h"
@@ -32,7 +27,6 @@
 	#include "Keys.h"
 	#include "EditorMapInfo.h"
 	#include "EditorItems.h"
-#endif
 
 #include "input.h"
 

Editor/editscreen.cpp

@@ -1,12 +1,7 @@
-#ifdef PRECOMPILEDHEADERS
-	#include "Editor All.h"
-#else
 	#include "builddefines.h"
-#endif
 
 #ifdef JA2EDITOR
 
-#ifndef PRECOMPILEDHEADERS
 	#include "sgp.h"
 	#include "vobject.h"
 	#include "worlddef.h"
@@ -79,7 +74,6 @@
 	#include "Cursor Control.h"//dnl ch2 210909
 	#include "maputility.h"//dnl ch49 061009
 	#include "Text.h"
-#endif
 
 //forward declarations of common classes to eliminate includes
 class OBJECTTYPE;

Editor/messagebox.cpp

@@ -1,12 +1,7 @@
-#ifdef PRECOMPILEDHEADERS
-	#include "Editor All.h"
-#else
 	#include "builddefines.h"
-#endif
 
 #ifdef JA2EDITOR
 
-#ifndef PRECOMPILEDHEADERS
 	#include "vobject.h"
 	#include "video.h"
 	#include "font.h"
@@ -14,7 +9,6 @@
 	#include "messagebox.h"
 	#include "input.h"
 	#include "english.h"
-#endif
 
 //internal variables.
 INT32 iMsgBoxNum;

Editor/newsmooth.cpp

@@ -1,12 +1,7 @@
-#ifdef PRECOMPILEDHEADERS
-	#include "Editor All.h"
-#else
 	#include "builddefines.h"
-#endif
 
 #ifdef JA2EDITOR
 
-#ifndef PRECOMPILEDHEADERS
 	#include <stdlib.h>
 	#include "tiledef.h"
 	#include "worlddef.h"
@@ -21,7 +16,6 @@
 	#include "environment.h"
 	#include "Random.h"
 	#include "Render Fun.h"
-#endif
 
 
 BOOLEAN CaveAtGridNo( INT32 iMapIndex );

Editor/popupmenu.cpp

@@ -10,15 +10,10 @@
 //supported.  Just remove the commented line of code (search for UNCOMMENT), and it's fixed -- it is
 //currently disabled.
 
-#ifdef PRECOMPILEDHEADERS
-	#include "Editor All.h"
-#else
 	#include "builddefines.h"
-#endif
 
 #ifdef JA2EDITOR
 
-#ifndef PRECOMPILEDHEADERS
 	#include "tiledef.h"
 	#include "sysutil.h"
 	#include "font.h"
@@ -37,7 +32,6 @@
 	#include "Scheduling.h"
 	#include "english.h"
 	#include "Item Statistics.h"
-#endif
 
 CurrentPopupMenuInformation gPopupData;
 

Editor/selectwin.cpp

@@ -1,14 +1,9 @@
 // WANNE: EDITOR: todo
 
-#ifdef PRECOMPILEDHEADERS
-	#include "Editor All.h"
-#else
 	#include "builddefines.h"
-#endif
 
 #ifdef JA2EDITOR
 
-#ifndef PRECOMPILEDHEADERS
 	#include "tiledef.h"
 	#include "vsurface.h"
 	#include "worlddat.h"
@@ -18,7 +13,6 @@
 	#include "selectwin.h"
 	#include "EditorDefines.h"
 	#include "Editor Taskbar Utils.h"
-#endif
 
 #include "vobject_blitters.h"
 #include "Text.h"

Editor/smooth.cpp

@@ -1,12 +1,7 @@
-#ifdef PRECOMPILEDHEADERS
-	#include "Editor All.h"
-#else
 	#include "builddefines.h"
-#endif
 
 #ifdef JA2EDITOR
 
-#ifndef PRECOMPILEDHEADERS
 	#include "stdlib.h"
 	#include "FileMan.h"
 	#include "time.h"
@@ -21,7 +16,6 @@
 	#include "structure wrap.h"
 	#include "Exit Grids.h"
 	#include "Editor Undo.h"
-#endif
 
 INT16 gbSmoothStruct[] =
 

Fade Screen.cpp

@@ -1,6 +1,3 @@
-#ifdef PRECOMPILEDHEADERS
-	#include "JA2 All.h"
-#else
 	#include "sgp.h"
 	#include "screenids.h"
 	#include "Timer Control.h"
@@ -12,7 +9,6 @@
 	#include "music control.h"
 	#include "Render Dirty.h"
 	#include "gameloop.h"
-#endif
 
 #define	SQUARE_STEP			8
 

FeaturesScreen.cpp

@@ -1,6 +1,3 @@
-#ifdef PRECOMPILEDHEADERS
-#include "JA2 All.h"
-#else
 #include	"Types.h"
 #include	"FeaturesScreen.h"
 #include	"Video.h"
@@ -34,7 +31,6 @@
 #include	"Map Information.h"
 #include	"Sys Globals.h"
 #include	"insurance.h"
-#endif
 
 #include		"connect.h"
 #include		"WorldMan.h"

GameInitOptionsScreen.cpp

@@ -1,7 +1,3 @@
-#ifdef PRECOMPILEDHEADERS
-	#include "JA2 All.h"
-	#include "Intro.h"
-#else
 	#include "Types.h"
 	#include "GameInitOptionsScreen.h"
 	#include "GameSettings.h"
@@ -22,7 +18,6 @@
 	#include "Text.h"
 	#include "_Ja25EnglishText.h"
 	#include "Soldier Profile.h"
-#endif
 
 #include "gameloop.h"
 #include "connect.h"

GameSettings.cpp

@@ -1,10 +1,3 @@
-#ifdef PRECOMPILEDHEADERS
-	#include "JA2 All.h"
-	#include "HelpScreen.h"
-	#include "Campaign.h"
-	#include "Cheats.h"
-	#include "INIReader.h"
-#else
 	#include	"Types.h"
 	#include	"GameSettings.h"
 	#include	"FileMan.h"
@@ -36,7 +29,6 @@
 	#include "Init.h"
 	#include "InterfaceItemImages.h"
 	#include "DynamicDialogue.h"	// added by Flugente
-#endif
 
 #include "KeyMap.h"
 #include "Timer Control.h"

GameVersion.cpp

@@ -1,9 +1,5 @@
-#ifdef PRECOMPILEDHEADERS
-	#include "JA2 All.h"
-#else
 	#include "Types.h"
 	#include "GameVersion.h"
-#endif
  
 //
 //	Keeps track of the game version

HelpScreen.cpp

@@ -1,9 +1,3 @@
-#ifdef PRECOMPILEDHEADERS
-	#include "JA2 All.h"
-	#include "HelpScreen.h"
-	#include "HelpScreenText.h"
-	#include	"Line.h"
-#else
 	#include "sgp.h"
 	#include "sysutil.h"
 	#include "vobject_blitters.h"
@@ -28,7 +22,6 @@
 	#include "renderworld.h"
 	#include "Game Init.h"
 	#include "Overhead.h"
-#endif
 
 extern INT16 gsVIEWPORT_END_Y;
 extern void PrintDate( void );

Init.cpp

@@ -1,10 +1,3 @@
-#ifdef PRECOMPILEDHEADERS
-	#include "JA2 All.h"
-	#include "HelpScreen.h"
-	#include "Multilingual Text Code Generator.h"
-	#include "INIReader.h"
-
-#else
 	#include "builddefines.h"
 	#include <stdio.h>
 	#include "sgp.h"
@@ -58,7 +51,6 @@
 	#include "Multilingual Text Code Generator.h"
 	#include "editscreen.h"
 	#include "Arms Dealer Init.h"
-#endif
 #include "MPXmlTeams.hpp"
 #include "Strategic Mines LUA.h"
 #include "UndergroundInit.h"

Init.h

@@ -1,7 +1,6 @@
 #ifndef _INIT_H
 #define _INIT_H
 
-#ifndef PRECOMPILEDHEADERS
 #include "LogicalBodyTypes/BodyTypeDB.h"
 #include "LogicalBodyTypes/Layers.h"
 #include "LogicalBodyTypes/AbstractXMLLoader.h"
@@ -10,7 +9,6 @@
 #include "LogicalBodyTypes/EnumeratorDB.h"
 #include "LogicalBodyTypes/BodyTypeDB.h"
 #include "LogicalBodyTypes/PaletteDB.h"
-#endif
 
 #include <iostream>
 #include <fstream>

Intro.cpp

@@ -1,8 +1,3 @@
-#ifdef PRECOMPILEDHEADERS
-	#include "JA2 All.h"
-	#include "Intro.h"
-	#include "Cinematics.h"
-#else
 	#include "sgp.h"
 	#include "sysutil.h"
 	#include "vobject_blitters.h"
@@ -27,7 +22,6 @@
 	#include "Soldier Profile.h"
 	#include "Game Init.h"
 	#include "INIReader.h"
-#endif
 
 #include <vfs/Core/vfs.h>
 

JA2 All.h

@@ -1,172 +0,0 @@
-#ifndef __JA2_ALL_H
-#define __JA2_ALL_H
-
-#pragma message("GENERATED PCH FOR JA2 PROJECT.")
-
-#include "builddefines.h"
-
-#include <time.h>
-#include <stdio.h>
-#include <stdarg.h>
-#include "sgp.h"
-#include "gameloop.h"
-#include "himage.h"
-#include "vobject.h"
-#include "vobject_private.h"
-#include "vobject_blitters.h"
-#include "Types.h"
-#include "wcheck.h"
-#include "renderworld.h"
-#include "input.h"
-#include "screenids.h"
-#include "overhead.h"
-#include "Isometric Utils.h"
-#include "sysutil.h"
-#include "Radar Screen.h"
-#include "Soldier Control.h"
-#include "Animation Control.h"
-#include "Animation Data.h"
-#include "Event Pump.h"
-#include "Timer Control.h"
-#include "Render Dirty.h"
-#include "Sys Globals.h"
-#include "interface.h"
-#include "soldier ani.h"
-#include <wchar.h>
-#include <tchar.h>
-#include "english.h"
-#include "Fileman.h"
-#include "messageboxscreen.h"
-#include "sgp.h"
-#include "fade screen.h"
-#include "cursor control.h"
-#include "music control.h"
-#include "GameInitOptionsScreen.h"
-#include "GameSettings.h"
-#include "Utilities.h"
-#include "Font Control.h"
-#include "WordWrap.h"
-#include "Options Screen.h"
-#include "cursors.h"
-#include "Screens.h"
-#include "init.h"
-#include "laptop.h"
-#include "mapscreen.h"
-#include "Game Clock.h"
-#include "LibraryDataBase.h"
-#include "Map Screen Interface.h"
-#include "Tactical Save.h"
-#include "Interface Control.h"
-#include "text.h"
-#include "Handle UI.h"
-#include "Button System.h"
-#include "lighting.h"
-#include "environment.h"
-#include "bullets.h"
-#include "message.h"
-#include <string.h>
-#include "overhead map.h"
-#include "Strategic Exit GUI.h"
-#include "strategic movement.h"
-#include "Tactical Placement GUI.h"
-#include "Air raid.h"
-#include "game init.h"
-//DEF: Test Code
-#ifdef NETWORKED
-#include "Networking.h"
-#endif
-#include "physics.h"
-#include "dialogue control.h"
-#include "soldier macros.h"
-#include "faces.h"
-#include "strategicmap.h"
-#include "gamescreen.h"
-#include "strategic turns.h"
-#include "merc entering.h"
-#include "soldier create.h"
-#include "Soldier Init List.h"
-#include "interface panels.h"
-#include "Map Information.h"
-#include "Squads.h"
-#include "interface dialogue.h"
-#include "auto bandage.h"
-#include "meanwhile.h"
-#include "strategic ai.h"
-#include "Sound Control.h"
-#include "SaveLoadScreen.h"
-#include "GameVersion.h"
-#include "Debug.h"
-#include "Language Defines.h"
-#include "mousesystem.h"
-#include "worlddef.h"
-#include "video.h"
-#include "interface items.h"
-#include "Maputility.h"
-#include "strategic.h"
-#include "NPC.h"
-#include "MercTextBox.h"
-#include "tile cache.h"
-#include "Shade Table Util.h"
-#include "Exit Grids.h"
-#include "Summary Info.h"
-#include <time.h>
-#include "font.h"
-#include "timer.h"
-#include "tiledef.h"
-#include "editscreen.h"
-#include "jascreens.h"
-#include "animation cache.h"
-#include "mainmenuscreen.h"
-#include "Random.h"
-#include "Multi Language Graphic Utils.h"
-#include "SaveLoadGame.h"
-#include "Text Input.h"
-#include "Slider.h"
-#include "soundman.h"
-#include "Ambient Control.h"
-#include "Worlddat.h"
-#include "Gap.h"
-#include "Soldier Profile.h"
-#include "Keys.h"
-#include "finances.h"
-#include "History.h"
-#include "files.h"
-#include "Email.h"
-#include "Game Events.h"
-#include "LaptopSave.h"
-#include "Queen Command.h"
-#include "Quests.h"
-#include "opplist.h"
-#include "Merc Hiring.h"
-#include "Ai.h"
-#include "SmokeEffects.h"
-#include "Map Screen Interface Border.h"
-#include "Map Screen Interface Bottom.h"
-#include "Map Screen Helicopter.h"
-#include "Arms Dealer Init.h"
-#include "Strategic Mines.h"
-#include "Strategic Town Loyalty.h"
-#include "Vehicles.h"
-#include "Merc Contract.h"
-#include "Strategic Pathing.h"
-#include "TeamTurns.h"
-#include "explosion control.h"
-#include "Creature Spreading.h"
-#include "Strategic Status.h"
-#include "Boxing.h"
-#include "Map Screen Interface Map.h"
-#include "lighteffects.h"
-#include "JA2 Splash.h"
-#include "Scheduling.h"
-#include "_JA25EnglishText.h"
-#include "XML.h"
-#include "LogicalBodyTypes/BodyTypeDB.h"
-#include "LogicalBodyTypes/Layers.h"
-#include "LogicalBodyTypes/AbstractXMLLoader.h"
-#include "LogicalBodyTypes/PaletteDB.h"
-#include "LogicalBodyTypes/SurfaceDB.h"
-#include "LogicalBodyTypes/FilterDB.h"
-#include "LogicalBodyTypes/EnumeratorDB.h"
-#include "LogicalBodyTypes/BodyTypeDB.h"
-
-#endif

JA2 Splash.cpp

@@ -1,6 +1,3 @@
-#ifdef PRECOMPILEDHEADERS
-	#include "JA2 All.h"
-#else
 #include "Types.h"
 #include "vsurface.h"
 #include "mainmenuscreen.h"
@@ -8,7 +5,6 @@
 #include "Timer Control.h"
 #include "Multi Language Graphic Utils.h"
 #include <stdio.h>
-#endif
 
 UINT32 guiSplashFrameFade = 10;
 UINT32 guiSplashStartTime = 0;

Ja25Update.cpp

@@ -1,6 +1,3 @@
-#ifdef PRECOMPILEDHEADERS
-#include "Tactical All.h"
-#else
 #include "builddefines.h"
 #include <wchar.h>
 #include <stdio.h>
@@ -66,7 +63,6 @@
 #include "Strategic Status.h"
 #include "civ quotes.h"
 #include "Debug Control.h"
-#endif
 
 #ifdef JA2UB
 

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