Debloated g_local.h include files

code/cgame/cg_local.h

@@ -23,7 +23,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "../qcommon/q_shared.h"
 #include "../renderercommon/tr_types.h"
 #include "../game/bg_public.h"
-#include "../qcommon/tiki_local.h"
 #include "cg_public.h"
 
 

code/cgame/cg_public.h

@@ -24,6 +24,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #ifndef __CG_PUBLIC_H__
 #define __CG_PUBLIC_H__
 
+#include "qcommon.h"
 #include <tiki.h>
 
 #define	CMD_BACKUP			128

code/game/VehicleCollisionEntity.cpp

@@ -22,6 +22,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // VehicleCollisionEntity.cpp : MOHAA Vehicle Collision
 
 #include "VehicleCollisionEntity.h"
+#include "g_phys.h"
 
 CLASS_DECLARATION( Entity, VehicleCollisionEntity, NULL )
 {

code/game/actor.cpp

@@ -41,6 +41,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "bg_local.h"
 #include "weapturret.h"
 #include "sentient.h"
+#include "g_phys.h"
+#include "debuglines.h"
+#include "scriptexception.h"
 #include <parm.h>
 #include <tiki.h>
 

code/game/actor_balcony.cpp

@@ -23,6 +23,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // actor_balcony.cpp
 
 #include "actor.h"
+#include "scriptexception.h"
 
 void Actor::InitBalconyIdle
 	(

code/game/actorenemy.h

@@ -26,6 +26,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #define __ACTORENEMY_H__
 
 #include "g_local.h"
+#include "class.h"
+#include "archive.h"
 
 class Actor;
 class Sentient;

code/game/animate.cpp

@@ -22,8 +22,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // animate.cpp : Animate Class
 
 #include "animate.h"
-#include "../game/player.h"
-#include "../qcommon/qfiles.h"
+#include "player.h"
+#include "qfiles.h"
+#include "scriptexception.h"
 #include <tiki.h>
 
 // Leg Animation events

code/game/archive.h

@@ -25,9 +25,10 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #ifndef __ARCHIVE_H__
 #define __ARCHIVE_H__
 
-#include "glb_local.h"
+#include "g_local.h"
 #include "class.h"
 #include "str.h"
+#include "vector.h"
 
 #define ARCHIVE_NULL_POINTER ( -654321 )
 #define ARCHIVE_POINTER_VALID ( 0 )

code/game/barrels.cpp

@@ -25,6 +25,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "barrels.h"
 #include "weaputils.h"
 #include "level.h"
+#include "g_phys.h"
 
 /*****************************************************************************
 /*QUAKED func_barrel (0 0.25 0.5) ? INDESTRUCTABLE

code/game/body.cpp

@@ -24,6 +24,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "animate.h"
 #include "body.h"
+#include "g_phys.h"
 
 CLASS_DECLARATION( Animate, Body, NULL )
 {

code/game/bspline.cpp

@@ -26,6 +26,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "g_local.h"
 #include "bspline.h"
 #include "game.h"
+#include "debuglines.h"
+#include "g_phys.h"
+#include "scriptexception.h"
 
 void BSpline::Set
 	(

code/game/camera.cpp

@@ -30,6 +30,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "bspline.h"
 #include "player.h"
 #include "camera.h"
+#include "debuglines.h"
+#include "scriptexception.h"
+#include "g_phys.h"
 
 #define CAMERA_PATHFILE_VERSION 1
 

code/game/crateobject.cpp

@@ -24,6 +24,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "crateobject.h"
 #include "player.h"
+#include "g_phys.h"
 
 /*****************************************************************************
 /*QUAKED func_crate (0 0.25 0.5) ? INDESTRUCTABLE NOTSTACKEDON

code/game/dm_manager.cpp

@@ -25,6 +25,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "dm_manager.h"
 #include "dm_team.h"
 #include "playerstart.h"
+#include "scriptexception.h"
 
 cvar_t *g_tempaxisscore;
 cvar_t *g_tempaxiswinsinrow;

code/game/doors.cpp

@@ -25,12 +25,14 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
 #include "g_local.h"
+#include "g_phys.h"
 #include "entity.h"
 #include "trigger.h"
 #include "mover.h"
 #include "doors.h"
 #include "sentient.h"
 #include "scriptmaster.h"
+#include "scriptexception.h"
 #include "item.h"
 #include "actor.h"
 #include "player.h"

code/game/entity.cpp

@@ -52,8 +52,11 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "player.h"
 #include "weaputils.h"
 #include "soundman.h"
-#include "../qcommon/qfiles.h"
+#include "scriptexception.h"
+#include "qfiles.h"
 #include "g_spawn.h"
+#include "g_phys.h"
+#include "debuglines.h"
 #include <tiki.h>
 
 // Generic entity events

code/game/explosion.cpp

@@ -27,6 +27,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
 #include "g_local.h"
+#include "g_phys.h"
 #include "actor.h"
 #include "entity.h"
 #include "trigger.h"

code/game/g_local.h

@@ -75,15 +75,12 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "g_main.h"
 
-#ifdef __cplusplus
-#include <Linklist.h>
-#include <mem_blockalloc.h>
-#include <vector.h>
-#include <str.h>
-#include <container.h>
-#endif
-
+class str;
+class Vector;
+class Archiver;
 class Entity;
+template<typename T>
+class Container;
 
 typedef enum {
 	SPECTATOR_NOT,
@@ -577,20 +574,4 @@ void BotTestAAS(vec3_t origin);
 extern gentity_t *g_entities;
 #define	FOFS(x) ((size_t)&(((gentity_t *)0)->x))
 
-#ifdef __cplusplus
-#include "const_str.h"
-#include <short3.h>
-#include <con_set.h>
-#include <con_arrayset.h>
-#include <scriptexception.h>
-#include <class.h>
-#include <containerclass.h>
-#include <listener.h>
-#include <g_spawn.h>
-#include "archive.h"
-#include "debuglines.h"
-#endif
-
-#include "g_phys.h"
-
 #endif /* g_local.h */

code/game/g_main.cpp

@@ -22,12 +22,15 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
 #include "g_local.h"
+#include "g_spawn.h"
+#include "g_phys.h"
 #include "debuglines.h"
 #include "entity.h"
 #include "gamecmds.h"
 #include "dm_manager.h"
 #include "player.h"
 #include "scriptmaster.h"
+#include "scriptexception.h"
 #include "lightstyleclass.h"
 #include "lodthing.h"
 #include "viewthing.h"

code/game/g_phys.cpp

@@ -23,7 +23,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // g_phys.cpp
 //
 
-#include "g_local.h"
+#include "g_phys.h"
 #include "animate.h"
 #include "sentient.h"
 #include "actor.h"

code/game/g_phys.h

@@ -26,6 +26,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #define __G_PHYS_H__
 
 #include "g_local.h"
+#include "vector.h"
 
 class Entity;
 

code/game/g_spawn.h

@@ -22,10 +22,10 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 // g_spawn.h : spawner for scripts.
 
-#ifndef __G_SPAWN_H__
-#define __G_SPAWN_H__
+#pragma once
 
-#include "glb_local.h"
+#include "class.h"
+#include "container.h"
 
 // spawnflags
 // these are set with checkboxes on each entity in the map editor
@@ -77,5 +77,3 @@ ClassDef			*FindClass( const char *name, qboolean *isModel );
 #ifdef GAME_DLL
 void				G_InitClientPersistant( gclient_t *client );
 #endif
-
-#endif

code/game/g_utils.cpp

@@ -26,6 +26,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "actor.h"
 #include "player.h"
 #include "playerbot.h"
+#include "debuglines.h"
 #include <tiki.h>
 
 typedef struct {

code/game/gamescript.cpp

@@ -28,6 +28,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "scriptmaster.h"
 #include "scriptthread.h"
 #include "scriptclass.h"
+#include "scriptexception.h"
 #include "level.h"
 
 static unsigned char *current_progBuffer = NULL;

code/game/gamescript.h

@@ -31,6 +31,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 class Listener;
 class ScriptThread;
+class ScriptVariable;
 class GameScript;
 
 typedef struct {

code/game/gibs.cpp

@@ -25,6 +25,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "gibs.h"
 #include "decals.h"
 #include "level.h"
+#include "g_phys.h"
 
 Event EV_ThrowGib
 	(

code/game/gravpath.cpp

@@ -29,6 +29,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "navigate.h"
 #include "misc.h"
 #include "player.h"
+#include "g_phys.h"
+#include "debuglines.h"
 
 GravPathManager gravPathManager;
 

code/game/grenadehint.h

@@ -26,7 +26,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #define __GRENADEHINT_H__
 
 #include "g_local.h"
-#include <simpleentity.h>
+#include "archive.h"
+#include "simpleentity.h"
 
 class GrenadeHint : public SimpleArchivedEntity {
 public:

code/game/hud.cpp

@@ -40,6 +40,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "game.h"
 #include "level.h"
+#include "scriptexception.h"
 
 Container< Hud * > hudElements;
 int lastNumberRemoved = -1;

code/game/item.cpp

@@ -24,6 +24,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
 #include "g_local.h"
+#include "g_phys.h"
 #include "entity.h"
 #include "trigger.h"
 #include "item.h"

code/game/level.cpp

@@ -22,21 +22,20 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 // level.cpp : Global Level Info.
 
-#include "glb_local.h"
+#include "g_local.h"
+#include "g_spawn.h"
 #include "level.h"
 #include "parm.h"
-#include "../game/navigate.h"
-#include "../game/gravpath.h"
-
-#if defined( GAME_DLL )
-#include "../game/entity.h"
-#include "../game/dm_manager.h"
-#include "../game/player.h"
-#endif
+#include "navigate.h"
+#include "gravpath.h"
+#include "entity.h"
+#include "dm_manager.h"
+#include "player.h"
 
 #include "scriptmaster.h"
 #include "scriptthread.h"
 #include "scriptvariable.h"
+#include "scriptexception.h"
 
 Level level;
 

code/game/lightstyleclass.cpp

@@ -1,6 +1,7 @@
 #include "lightstyleclass.h"
 
 #include "g_local.h"
+#include "archive.h"
 
 ////////////////////////
 //

code/game/lodthing.cpp

@@ -24,6 +24,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "lodthing.h"
 #include "player.h"
+#include "scriptexception.h"
 
 Event EV_LODTool_Spawn
 (

code/game/misc.cpp

@@ -36,7 +36,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "specialfx.h"
 #include "player.h"
 #include "weaputils.h"
-#include <g_spawn.h>
+#include "g_spawn.h"
+#include "g_phys.h"
 
 /*****************************************************************************/
 /*QUAKED detail (0.5 0 1.0) ?

code/game/mover.cpp

@@ -30,6 +30,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "trigger.h"
 #include "mover.h"
 #include "level.h"
+#include "g_phys.h"
 
 #define MOVE_ANGLES 1
 #define MOVE_ORIGIN 2

code/game/navigate.cpp

@@ -29,6 +29,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "doors.h"
 #include "actor.h"
 #include "player.h"
+#include "debuglines.h"
+#include "scriptexception.h"
 
 #define PATHFILE_VERSION 103
 

code/game/player.cpp

@@ -23,12 +23,15 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "g_local.h"
 #include "bg_local.h"
+#include "g_spawn.h"
+#include "g_phys.h"
 #include "entity.h"
 #include "player.h"
 #include "world.h"
 #include "weapon.h"
 #include "trigger.h"
 #include "scriptmaster.h"
+#include "scriptexception.h"
 #include "navigate.h"
 #include "misc.h"
 #include "earthquake.h"
@@ -41,7 +44,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "characterstate.h"
 #include "weaputils.h"
 #include "dm_manager.h"
-#include <parm.h>
+#include "parm.h"
 #include "body.h"
 #include "playerstart.h"
 #include "weapturret.h"

code/game/player_util.cpp

@@ -25,7 +25,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "player.h"
 #include "object.h"
-#include <g_spawn.h>
+#include "g_spawn.h"
+#include "scriptexception.h"
+
 extern Event EV_Entity_Start;
 //====================
 //Player::ActorInfo

code/game/playerbot.cpp

@@ -25,6 +25,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "actor.h"
 #include "playerbot.h"
 #include "consoleevent.h"
+#include "debuglines.h"
+#include "scriptexception.h"
 
 // We assume that we have limited access to the server-side
 // and that most logic come from the playerstate_s structure

code/game/scriptmaster.cpp

@@ -32,6 +32,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "object.h"
 #include "world.h"
 #include "scriptcompiler.h"
+#include "scriptexception.h"
 
 #ifdef WIN32
 #include <direct.h>

code/game/scriptslave.cpp

@@ -30,16 +30,19 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
 #include "g_local.h"
+#include "g_phys.h"
 #include "class.h"
 #include "mover.h"
 #include "scriptmaster.h"
 #include "scriptthread.h"
 #include "scriptslave.h"
+#include "scriptexception.h"
 #include "sentient.h"
 #include "weapon.h"
 #include "gibs.h"
 #include "explosion.h"
 #include "game.h"
+#include "debuglines.h"
 
 /*****************************************************************************/
 /*QUAKED script_object (0 0.5 1) ? NOT_SOLID

code/game/scriptthread.cpp

@@ -2,7 +2,9 @@
 #include "scriptmaster.h"
 #include "scriptclass.h"
 #include "scriptvariable.h"
+#include "scriptexception.h"
 
+#include "g_spawn.h"
 #include "level.h"
 #include "game.h"
 #include "camera.h"

code/game/sentient.cpp

@@ -24,11 +24,13 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
 #include "g_local.h"
+#include "g_phys.h"
 #include "entity.h"
 #include "sentient.h"
 #include "weapon.h"
 #include "weaputils.h"
 #include "scriptmaster.h"
+#include "scriptexception.h"
 #include "ammo.h"
 #include "armor.h"
 #include "misc.h"
@@ -36,7 +38,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "player.h"
 #include "actor.h"
 #include "decals.h"
-#include <g_spawn.h>
+#include "g_spawn.h"
 
 // FIXME
 // remove this when actor gets checked back in

code/game/simpleactor.cpp

@@ -24,6 +24,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "actor.h"
 #include "bg_local.h"
+#include "scriptexception.h"
 #include <tiki.h>
 
 CLASS_DECLARATION( Sentient, SimpleActor, NULL )

code/game/soundman.cpp

@@ -24,6 +24,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
 #include "g_local.h"
+#include "debuglines.h"
 #include "entity.h"
 #include "trigger.h"
 #include "player.h"

code/game/spawners.cpp

@@ -34,6 +34,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "spawners.h"
 #include "game.h"
+#include "g_phys.h"
+#include "g_spawn.h"
 
 Event EV_Spawn_ModelName
 	( 

code/game/spawners.h

@@ -22,12 +22,13 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 // spawners.h: Various spawning entities
 
-#ifndef __SPAWNWERS_H__
-#define __SPAWNWERS_H__
+#pragma once
 
 #include "g_local.h"
 #include "scriptslave.h"
 
+class SpawnArgs;
+
 class Spawn : public ScriptSlave
 	{
    private:
@@ -129,5 +130,3 @@ class SpawnChain : public Spawn
  	public:
       CLASS_PROTOTYPE( SpawnChain );
 	};
-
-#endif //__SPAWNWERS_H__

code/game/specialfx.cpp

@@ -24,6 +24,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
 #include "g_local.h"
+#include "g_phys.h"
+#include "g_spawn.h"
 #include "specialfx.h"
 #include "level.h"
 

code/game/trigger.cpp

@@ -23,20 +23,20 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // trigger.cpp: Environment based triggers.
 //
 
-#include "glb_local.h"
-
-#if defined ( GAME_DLL )
-#include "../game/entity.h"
-#include "../game/misc.h"
-#include "../game/specialfx.h"
-#include "../game/sentient.h"
-#include "../game/item.h"
-#include "../game/player.h"
-#include "../game/camera.h"
-#include "../game/actor.h"
-#include "../game/weaputils.h"
-#include "../game/VehicleCollisionEntity.h"
-#endif
+#include "g_local.h"
+#include "g_phys.h"
+#include "g_spawn.h"
+#include "entity.h"
+#include "misc.h"
+#include "specialfx.h"
+#include "sentient.h"
+#include "item.h"
+#include "player.h"
+#include "camera.h"
+#include "actor.h"
+#include "weaputils.h"
+#include "VehicleCollisionEntity.h"
+#include "scriptexception.h"
 
 #include "trigger.h"
 #include "scriptmaster.h"

code/game/vehicle.cpp

@@ -24,6 +24,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
 #include "g_local.h"
+#include "g_phys.h"
 #include "scriptslave.h"
 #include "vehicle.h"
 #include "player.h"
@@ -32,6 +33,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "earthquake.h"
 #include "gibs.h"
 #include "vehicleturret.h"
+#include "scriptexception.h"
+#include "debuglines.h"
 
 Event EV_Vehicle_Start
 	(

code/game/vehicleturret.cpp

@@ -23,11 +23,12 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // vehicleturret.cpp: Vehicle Turret.
 //
 
+#include "g_phys.h"
 #include "vehicleturret.h"
 #include "player.h"
 #include "explosion.h"
 #include "gibs.h"
-
+#include "scriptexception.h"
 
 Event EV_VehicleTurretGun_SetBaseEntity
 	(

code/game/viewthing.cpp

@@ -27,6 +27,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "viewthing.h"
 #include "game.h"
 #include "level.h"
+#include "scriptexception.h"
 
 Event EV_ViewThing_Think
    (

code/game/weapon.cpp

@@ -26,6 +26,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
 #include "g_local.h"
+#include "g_phys.h"
 #include "entity.h"
 #include "item.h"
 #include "weapon.h"
@@ -37,6 +38,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "weaputils.h"
 #include "player.h"
 #include "vehicleturret.h"
+#include "debuglines.h"
 
 Event EV_Weapon_Shoot
    (

code/game/weapturret.cpp

@@ -23,6 +23,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110EV_DEFAULT301  U
 // weapturret.cpp: MOH Turret. Usable by sentients and monsters.
 //
 
+#include "g_phys.h"
 #include "weapturret.h"
 #include "player.h"
 

code/game/weaputils.cpp

@@ -22,6 +22,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 // weaputils.cpp: General Weapon Utility Functions
 
+#include "g_phys.h"
+#include "g_spawn.h"
 #include "weaputils.h"
 #include "specialfx.h"
 #include "sentient.h"
@@ -33,7 +35,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "weapturret.h"
 #include "vehicleturret.h"
 #include "earthquake.h"
-#include <trigger.h>
+#include "trigger.h"
+#include "debuglines.h"
 
 static void FlashPlayers
    (

code/game/windows.cpp

@@ -23,6 +23,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // windows.cpp: Window class
 //
 
+#include "g_phys.h"
 #include "windows.h"
 #include "game.h"
 

code/game/world.cpp

@@ -22,9 +22,11 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 // world.cpp : Holds the target list, and general info (fog and such).
 
+#include "g_phys.h"
 #include "world.h"
 #include "level.h"
-#include <scriptmaster.h>
+#include "scriptmaster.h"
+#include "scriptexception.h"
 
 #ifdef GAME_DLL
 #include "../game/soundman.h"

code/parser/parsetree.h

@@ -22,8 +22,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 // parsetree.h: Abstract Syntax Layer for Lexer/Parser
 
-#ifndef __PARSETREE_H__
-#define __PARSETREE_H__
+#pragma once
+
+#include "str.h"
 
 #if defined ( GAME_DLL )
 #define showopcodes g_showopcodes
@@ -143,5 +144,3 @@ struct yyparsedata {
 };
 
 extern yyparsedata parsedata;
-
-#endif

code/qcommon/container.h

@@ -22,30 +22,37 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 // container.h: C++ Container
 
-#ifndef __CONTAINER_H__
-#define __CONTAINER_H__
+#pragma once
 
-#ifdef GAME_DLL
-#ifdef WIN32
-#define glbprintf(text) gi.Printf(text)
-#else
-#define glbprintf(text)
-#endif
-#elif defined CGAME_DLL
-#define glbprintf(text) cgi.Printf(text)
-#else
-#define glbprintf(text) printf(text)
-#endif
+#if defined(GAME_DLL)
+//
+// game dll specific defines
+//
+#include "g_local.h"
+
+#define CONTAINER_Error          gi.Error
+#define CONTAINER_DPrintf        gi.DPrintf
+#define CONTAINER_WDPrintf(text) gi.DPrintf(text)
+
+#elif defined(CGAME_DLL)
+//
+// cgame dll specific defines
+//
+#include "cg_local.h"
+
+#define CONTAINER_Error             cgi.Error
+#define CONTAINER_DPrintf           cgi.DPrintf
+#define CONTAINER_WDPrintf(text)    cgi.DPrintf(text)
 
-#ifdef _DEBUG
-#define CONTAINER_Error(id, text) \
-    glbprintf(text);              \
-    assert(0);
 #else
-#define CONTAINER_Error(id, text) throw(text) // gi.Error
+
+//
+// client specific defines
+//
+#define CONTAINER_Error             Com_Error
+#define CONTAINER_DPrintf           Com_DPrintf
+#define CONTAINER_WDPrintf(text)    Com_DPrintf(text)
 #endif
-#define CONTAINER_DPrintf(text)  glbprintf(text)
-#define CONTAINER_WDPrintf(text) glbprintf(text)
 
 class Archiver;
 
@@ -483,5 +490,3 @@ Container<Type>& Container<Type>::operator=(const Container<Type>& container)
 
     return *this;
 }
-
-#endif /* __CONTAINER_H__ */

code/qcommon/containerclass.h

@@ -24,6 +24,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #pragma once
 
+#include "class.h"
 #include "container.h"
 
 template<class Type>

code/qcommon/msg.cpp

@@ -1792,6 +1792,7 @@ int MSG_PackCoord(float coord)
 {
 	unsigned int packed = (unsigned int)round(coord * 4.0 + MAX_PACKED_COORD_HALF);
 	coordstats[packed]++;
+
 	return packed;
 }
 

code/script/scriptclass.cpp

@@ -1,6 +1,7 @@
 #include "scriptclass.h"
 #include "scriptmaster.h"
 #include "scriptthread.h"
+#include "scriptexception.h"
 
 //====================
 // ScriptClass

code/script/scriptcompiler.cpp

@@ -31,6 +31,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "scriptmaster.h"
 #include "scriptthread.h"
 #include "scriptclass.h"
+#include "scriptexception.h"
 #include "parsetree.h"
 #include "yyParser.h"
 #include "yyLexer.h"

code/script/scriptcompiler.h

@@ -30,6 +30,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include <gamescript.h>
 #include "parsetree.h"
 
+class ScriptVariable;
+
 enum
 {
 	method_game,

code/script/scriptopcodes.cpp

@@ -22,8 +22,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 // scriptopcodes.cpp
 
-#include "glb_local.h"
 #include "scriptopcodes.h"
+#include "short3.h"
+#include "vector.h"
 
 static opcode_t OpcodeInfo[] =
 {

code/script/scriptopcodes.h

@@ -24,6 +24,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #pragma once
 
+#include "q_shared.h"
+
 /** Should stay a 8-byte value. */
 using opval_t = uint8_t;
 /** Store an index in the string table. */

code/script/scriptvm.cpp

@@ -22,12 +22,13 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 // scriptvm.cpp : Script virtual machine, interprets and execute scripts
 
-#include "glb_local.h"
+#include "g_local.h"
 #include "scriptmaster.h"
 #include "scriptthread.h"
 #include "scriptclass.h"
 #include "scriptvm.h"
 #include "scriptcompiler.h"
+#include "scriptexception.h"
 #include "game.h"
 #include "level.h"
 #include "parm.h"

code/script/scriptvm.h

@@ -48,6 +48,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #define THREAD_SUSPENDED				2		// Suspended
 #define THREAD_CONTEXT_SWITCH			3		// Resume from context switch
 
+class ScriptException;
 class ScriptThread;
 class ScriptVM;