Reworked file inclusion (using relative path)

code/client/cl_cgame.cpp

@@ -23,8 +23,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "client.h"
 #include "cl_ui.h"
-#include "tiki.h"
-#include <localization.h>
+#include "../qcommon/tiki.h"
+#include "../qcommon/localization.h"
 
 extern qboolean loadCamera(const char *name);
 extern void startCamera(int time);

code/client/cl_consolecmds.cpp

@@ -23,7 +23,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // cl_consolecmds.cpp : New client console commands.
 
 #include "client.h"
-#include "listener.h"
+#include "../qcommon/listener.h"
 
 /*
 ===============

code/client/cl_main.cpp

@@ -22,17 +22,18 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // cl_main.c  -- client main loop
 
 #include "client.h"
-#include "server.h"
+#include "../server/server.h"
 #include "cl_ui.h"
-#include "tiki.h"
-#include <cm_terrain.h>
+#include "../qcommon/tiki.h"
+#include "../qcommon/cm_terrain.h"
 #include "../sys/sys_local.h"
-#include <limits.h>
 #ifdef USE_RENDERER_DLL
 #include "../sys/sys_loadlib.h"
 #endif
 
-#include "gcdkeyc.h"
+#include "../gamespy/gcdkey/gcdkeyc.h"
+
+#include <climits>
 
 cvar_t	*cl_nodelta;
 cvar_t	*cl_debugMove;

code/client/cl_ui.cpp

@@ -23,9 +23,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "client.h"
 
 #include "../server/server.h"
-#include "../renderer/tr_public.h"
-#include "tiki.h"
-#include <localization.h>
+#include "../renderercommon/tr_public.h"
+#include "../qcommon/tiki.h"
+#include "../qcommon/localization.h"
 
 #include "cl_ui.h"
 

code/client/cl_ui.h

@@ -23,8 +23,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #ifndef __CL_UI_H__
 #define __CL_UI_H__
 
-#include "ui_extern.h"
-#include "uiwidget.h"
+#include "../uilib/ui_extern.h"
+#include "../uilib/uiwidget.h"
 
 typedef struct {
 	UIReggedMaterial *loading;

code/client/cl_uistd.cpp

@@ -21,7 +21,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110EV_DEFAULT301  U
 */
 
 #include "cl_ui.h"
-#include <localization.h>
+#include "../qcommon/localization.h"
 
 Event EV_Layout_PlayerStat
 	(

code/client/keys.h

@@ -39,6 +39,7 @@ extern	qboolean	chat_team;
 extern	int			chat_playerNum;
 
 #if defined(APP_MODULE)
+
 int Key_StringToKeynum( const char *str );
 void Key_WriteBindings( fileHandle_t f );
 void Key_SetBinding( int keynum, const char *binding );
@@ -49,6 +50,7 @@ void Key_SetOverstrikeMode( qboolean state );
 void Key_ClearStates( void );
 int Key_GetKey(const char *binding);
 const char* Key_GetKeynameForCommand(const char* command);
+
 #endif
 
 #ifdef __cplusplus

code/client/usignal.cpp

@@ -20,7 +20,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
-#include "ui_local.h"
+#include "../uilib/ui_local.h"
 
 UConnection::UConnection()
 {

code/fgame/actor.cpp

@@ -44,8 +44,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "g_phys.h"
 #include "debuglines.h"
 #include "scriptexception.h"
-#include <parm.h>
-#include <tiki.h>
+#include "parm.h"
+#include "../qcommon/tiki.h"
 
 #include <cmath>
 

code/fgame/actor.h

@@ -30,10 +30,10 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "actorenemy.h"
 #include "level.h"
 #include "game.h"
-#include <gamescript.h>
-#include <scriptmaster.h>
+#include "gamescript.h"
+#include "scriptmaster.h"
 #include "grenadehint.h"
-#include <parm.h>
+#include "parm.h"
 
 extern Event EV_Actor_Start;
 extern Event EV_Actor_Dead;

code/fgame/body.h

@@ -25,7 +25,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #ifndef __BODY_H__
 #define __BODY_H__
 
-#include <animate.h>
+#include "animate.h"
 
 //=============================================================
 //class Body

code/fgame/entity.h

@@ -947,7 +947,7 @@ inline int Entity::CurrentAnim
 	return 0;
 	}
 
-#include <world.h>
+#include "world.h"
 
 #endif
 

code/fgame/g_client.cpp

@@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "player.h"
 #include "playerbot.h"
 #include "playerstart.h"
-#include <scriptmaster.h>
+#include "scriptmaster.h"
 
 // g_client.c -- client functions that don't happen every frame
 

code/fgame/g_spawn.cpp

@@ -24,9 +24,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "glb_local.h"
 #include "g_spawn.h"
-#include <scriptvariable.h>
-#include <object.h>
-#include <tiki.h>
+#include "../script/scriptvariable.h"
+#include "object.h"
+#include "../qcommon/tiki.h"
 
 #ifdef GAME_DLL
 #include "../fgame/entity.h"

code/fgame/item.h

@@ -30,7 +30,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "entity.h"
 #include "trigger.h"
 #include "sentient.h"
-#include <gamescript.h>
+#include "gamescript.h"
 
 extern Event EV_Item_Pickup;
 extern Event EV_Item_DropToFloor;

code/fgame/movegrid.h

@@ -27,8 +27,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #define __MOVEGRID_H__
 
 #include "g_local.h"
-#include <class.h>
-#include <archive.h>
+#include "../qcommon/class.h"
+#include "../fgame/archive.h"
 
 typedef struct vehicleState_s {
 	float origin[ 3 ];

code/fgame/scriptmaster.cpp

@@ -50,15 +50,15 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #elif defined ( GAME_DLL )
 
-#include <hud.h>
+#include "hud.h"
 
-#include "../fgame/dm_team.h"
-#include "../fgame/player.h"
-#include "../fgame/entity.h"
-#include "../fgame/huddraw.h"
-#include "../fgame/weaputils.h"
-#include "../fgame/camera.h"
-#include "../fgame/consoleevent.h"
+#include "dm_team.h"
+#include "player.h"
+#include "entity.h"
+#include "huddraw.h"
+#include "weaputils.h"
+#include "camera.h"
+#include "consoleevent.h"
 
 #define SCRIPT_Printf gi.Printf
 #define SCRIPT_DPrintf gi.DPrintf

code/fgame/scriptthread.cpp

@@ -21,7 +21,7 @@
 
 #include "slre.h"
 
-#include <md5.h>
+#include "md5.h"
 
 #ifdef WIN32
 #include <direct.h>

code/fgame/weapon.h

@@ -33,7 +33,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "ammo.h"
 #include "queue.h"
 #include "sentient.h"
-#include <scriptmaster.h>
+#include "../fgame/scriptmaster.h"
 
 extern Event EV_Weapon_GiveStartingAmmo;
 extern Event EV_Weapon_SetAmmoInClip;

code/fgame/world.h

@@ -34,7 +34,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "simpleentity.h"
 #endif
 
-#include <gamescript.h>
+#include "gamescript.h"
 
 #define WORLD_CINEMATIC		1
 

code/gamespy/sv_gamespy.c

@@ -20,11 +20,11 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
-#include "q_shared.h"
-#include "server.h"
+#include "../qcommon/q_shared.h"
+#include "../server/server.h"
 #include "sv_gqueryreporting.h"
 
-#include <gcdkey/gcdkeys.h>
+#include "gcdkey/gcdkeys.h"
 
 static char gamemode[128];
 static qboolean gcdInitialized = qfalse;

code/gamespy/sv_gqueryreporting.c

@@ -22,9 +22,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "sv_gqueryreporting.h"
 
-#include <common/gsPlatformSocket.h>
-#include <common/gsPlatformUtil.h>
-#include <gutil.h>
+#include "common/gsPlatformSocket.h"
+#include "common/gsPlatformUtil.h"
+#include "gutil.h"
 
 static char* queries[] =
 {

code/gamespy/sv_gqueryreporting.h

@@ -20,7 +20,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
-#include <common/gsPlatformSocket.h>
+#include "common/gsPlatformSocket.h"
 
 typedef void (*qr_querycallback_t) (char* outbuf, int maxlen, void* userdata);
 typedef void (*qr_custom_handler_t) (const char* query, struct sockaddr* sender);

code/parser/parsetree.cpp

@@ -22,9 +22,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 // parsetree.cpp: Abstract Syntax Layer for Lexer/Parser
 
-#include "glb_local.h"
 #include "parsetree.h"
-#include <mem_tempalloc.h>
+#include "../fgame/gamecvars.h"
+#include "../qcommon/mem_tempalloc.h"
 
 MEM_TempAlloc			parsetree_allocator;
 
@@ -79,9 +79,9 @@ void parsetree_freeall()
 {
 	parsetree_allocator.FreeAll();
 
-	if (showopcodes->integer)
+	if (g_showopcodes->integer)
 	{
-		glbs.DPrintf("%d bytes freed\n", parsedata.total_length);
+		gi.DPrintf("%d bytes freed\n", parsedata.total_length);
 	}
 }
 

code/parser/yyLexer.cpp

@@ -889,7 +889,7 @@ void fprintf2( FILE *f, const char *format, ... )
 	vsprintf( buffer, format, va );
 	va_end( va );
 
-	glbs.Printf( buffer );
+	gi.Printf( buffer );
 }
 
 #define fprintf fprintf2
@@ -906,7 +906,7 @@ extern yyparsedata parsedata;
 
 void yylexerror( const char *msg )
 {
-	glbs.Printf( "%s\n%s", msg, yytext );
+	gi.Printf( "%s\n%s", msg, yytext );
 	assert( 0 );
 }
 

code/qcommon/alias.h

@@ -20,8 +20,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
-#ifndef __ALIAS_H__
-#define __ALIAS_H__
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -70,6 +69,7 @@ typedef struct AliasList_s
 } AliasList_t;
 
 #if defined(APP_MODULE)
+
 const char* Alias_Find(const char* alias);
 qboolean Alias_Add(const char* alias, const char* name, const char* parameters);
 qboolean Alias_Delete(const char* alias);
@@ -80,6 +80,7 @@ AliasList_t* Alias_GetGlobalList();
 
 int S_ChannelNameToNum( const char *pszName );
 const char *S_ChannelNumToName( int iChannel );
+
 #endif
 
 //
@@ -118,5 +119,3 @@ float randweight(void);
 #ifdef __cplusplus
 }
 #endif
-
-#endif /* alias.h */

code/qcommon/class.cpp

@@ -24,11 +24,11 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "class.h"
 #include "listener.h"
-#include <q_shared.h>
+#include "q_shared.h"
 
 #if defined (GAME_DLL)
 
-#include "g_local.h"
+#include "../fgame/g_local.h"
 
 #define CLASS_Printf gi.Printf
 #define CLASS_DPrintf gi.DPrintf
@@ -36,7 +36,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #elif defined(CGAME_DLL)
 
-#include "cg_local.h"
+#include "../cgame/cg_local.h"
 
 #define CLASS_Printf cgi.Printf
 #define CLASS_DPrintf cgi.DPrintf
@@ -53,7 +53,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #ifdef WITH_SCRIPT_ENGINE
 
-#include "scriptmaster.h"
+#include "../fgame/scriptmaster.h"
 
 #endif
 

code/qcommon/cm_trace_lbd.cpp

@@ -21,7 +21,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
 #include "cm_local.h"
-#include "server.h"
+#include "../server/server.h"
 #include "../client/client.h"
 #include "tiki.h"
 

code/qcommon/common.cpp

@@ -34,7 +34,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // FPS
 #include <chrono>
 
-#include <tiki.h>
+#include "tiki.h"
 
 qboolean CL_FinishedIntro(void);
 void UI_PrintConsole(const char* msg);

code/qcommon/con_set.h

@@ -25,7 +25,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #ifndef __CON_SET_H__
 #define __CON_SET_H__
 
-#include <mem_blockalloc.h>
+#include "mem_blockalloc.h"
 
 class Class;
 class Archiver;

code/qcommon/con_timer.cpp

@@ -1,7 +1,7 @@
 #include "con_timer.h"
 
 #if defined (ARCHIVE_SUPPORTED)
-#include "archive.h"
+#include "../fgame/archive.h"
 #endif
 
 con_timer::con_timer(void)

code/qcommon/container.h

@@ -28,7 +28,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 // game dll specific defines
 //
-#include "g_local.h"
+#include "../fgame/g_local.h"
 
 #define CONTAINER_Error          gi.Error
 #define CONTAINER_DPrintf        gi.DPrintf
@@ -38,7 +38,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 // cgame dll specific defines
 //
-#include "cg_local.h"
+#include "../cgame/cg_local.h"
 
 #define CONTAINER_Error             cgi.Error
 #define CONTAINER_DPrintf           cgi.DPrintf

code/qcommon/cvar.c

@@ -1641,7 +1641,7 @@ void Cvar_Init (void)
 }
 
 #ifndef STANDALONE
-#include "server.h"
+#include "../server/server.h"
 #endif
 
 static void Cvar_FlagsCheck(int flags) {

code/qcommon/listener.cpp

@@ -22,22 +22,22 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 // listener.cpp : Listener.
 
-#include "scriptvariable.h"
-#include "scriptexception.h"
+#include "../script/scriptvariable.h"
+#include "../script/scriptexception.h"
 #include "Linklist.h"
 
 #ifdef WITH_SCRIPT_ENGINE
-#include "archive.h"
-#include "scriptmaster.h"
-#include "scriptthread.h"
-#include "scriptclass.h"
+#include "../fgame/archive.h"
+#include "../fgame/scriptmaster.h"
+#include "../fgame/scriptthread.h"
+#include "../script/scriptclass.h"
 #endif
 
 #if defined( GAME_DLL )
 
 #include "../fgame/player.h"
 #include "../fgame/consoleevent.h"
-#include "animate.h"
+#include "../fgame/animate.h"
 
 #define LISTENER_Cvar_Get gi.Cvar_Get
 

code/qcommon/mem_blockalloc.cpp

@@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #if defined(GAME_DLL)
 
-#include "g_local.h"
+#include "../fgame/g_local.h"
 
 void* MEM_Alloc(int size) { return gi.Malloc(size); }
 
@@ -32,7 +32,7 @@ void MEM_Free(void* ptr) { return gi.Free(ptr); }
 
 #elif defined(CGAME_DLL)
 
-#include "cg_local.h"
+#include "../cgame/cg_local.h"
 
 void* MEM_Alloc(int size) { return cgi.Malloc(size); }
 

code/qcommon/mem_tempalloc.cpp

@@ -22,17 +22,17 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 // mem_tempalloc.cpp: Fast temporary memory manager
 
-#include <mem_tempalloc.h>
+#include "mem_tempalloc.h"
 
 #ifdef GAME_DLL
-#include "g_local.h"
+#include "../fgame/g_local.h"
 
 #define MEM_TempAllocate(x) gi.Malloc(x)
 #define MEM_TempFree(x)     gi.Free(x)
 
 #elif defined(CGAME_DLL)
 
-#include "cg_local.h"
+#include "../cgame/cg_local.h"
 
 #define MEM_TempAllocate(x) cgi.Malloc(x)
 #define MEM_TempFree(x)     cgi.Free(x)

code/qcommon/memory.c

@@ -22,8 +22,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 // memory.c: Memory manager
 
-#include <q_shared.h>
-#include <qcommon.h>
+#include "q_shared.h"
+#include "qcommon.h"
 
 #ifdef WIN32
 #include <Windows.h>

code/qcommon/script.cpp

@@ -34,7 +34,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #if defined(GAME_DLL)
 
-#include "g_local.h"
+#include "../fgame/g_local.h"
 
 #define FILE_FS_FreeFile       gi.FS_FreeFile
 #define FILE_FS_ReadFile(a, b) gi.FS_ReadFile(a, b, true)

code/qcommon/script.h

@@ -30,7 +30,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "str.h"
 
 #if defined(ARCHIVE_SUPPORTED)
-#include "archive.h"
+#include "../fgame/archive.h"
 #endif
 
 #define TOKENCOMMENT  (';')

code/qcommon/tiki.h

@@ -30,9 +30,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #ifdef __cplusplus
 class Archiver;
-#include <mem_blockalloc.h>
-#include <con_set.h>
-#include <str.h>
+#include "../qcommon/mem_blockalloc.h"
+#include "../qcommon/con_set.h"
+#include "../qcommon/str.h"
 #endif
 
 typedef struct AliasList_s AliasList_t;
@@ -114,7 +114,7 @@ typedef struct {
 
 typedef struct dloaddef_s dloaddef_t;
 
-#include <tiki_script.h>
+#include "tiki_script.h"
 
 #ifdef __cplusplus
 

code/qcommon/tiki_main.cpp

@@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "q_shared.h"
 #include "qcommon.h"
-#include <tiki.h>
+#include "tiki.h"
 #include "../tiki/tiki_shared.h"
 
 int cache_numskel = 0;

code/qcommon/tiki_script.cpp

@@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "q_shared.h"
 #include "qcommon.h"
-#include <tiki.h>
+#include "tiki.h"
 
 TikiScript *TikiScript::currentScript;
 

code/qcommon/vector.h

@@ -27,7 +27,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include <cmath>
 #include <cstdio>
-#include <qcommon.h>
+#include "qcommon.h"
 
 //#define X 0
 //#define Y 1

code/script/scriptclass.cpp

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

code/script/scriptcompiler.cpp

@@ -22,19 +22,18 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 // compiler.cpp : Parse, then compile to op-codes.
 
-#include "glb_local.h"
 #include "scriptcompiler.h"
 #include "scriptvm.h"
-#include "level.h"
-#include "parm.h"
-#include "game.h"
-#include "scriptmaster.h"
-#include "scriptthread.h"
+#include "../fgame/level.h"
+#include "../fgame/parm.h"
+#include "../fgame/game.h"
+#include "../fgame/scriptmaster.h"
+#include "../fgame/scriptthread.h"
 #include "scriptclass.h"
 #include "scriptexception.h"
-#include "parsetree.h"
-#include "yyParser.h"
-#include "yyLexer.h"
+#include "../parser/parsetree.h"
+#include "../parser/yyParser.h"
+#include "../parser/yyLexer.h"
 
 ScriptCompiler Compiler;
 int ScriptCompiler::current_label;

code/script/scriptcompiler.h

@@ -25,10 +25,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #ifndef __COMPILER_H__
 #define __COMPILER_H__
 
-#include "glb_local.h"
-#include <scriptopcodes.h>
-#include <gamescript.h>
-#include "parsetree.h"
+#include "../script/scriptopcodes.h"
+#include "../fgame/gamescript.h"
+#include "../parser/parsetree.h"
 
 class ScriptVariable;
 

code/script/scriptexception.h

@@ -25,7 +25,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #ifndef __EXCEPT_H__
 #define __EXCEPT_H__
 
-#include "str.h"
+#include "../qcommon/str.h"
 
 class ScriptException
 {

code/script/scriptvariable.cpp

@@ -24,18 +24,18 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "scriptvariable.h"
 #include "scriptexception.h"
-#include "str.h"
+#include "../qcommon/str.h"
 
 #ifdef GAME_DLL
-#include "archive.h"
-#include "g_local.h"
+#include "../fgame/archive.h"
+#include "../fgame/g_local.h"
 #include "../fgame/navigate.h"
 #endif
 
 #ifdef WITH_SCRIPT_ENGINE
-#include "world.h"
-#include "scriptmaster.h"
-#include "simpleentity.h"
+#include "../fgame/world.h"
+#include "../fgame/scriptmaster.h"
+#include "../fgame/simpleentity.h"
 #endif
 
 #include <utility>

code/script/scriptvariable.h

@@ -25,11 +25,11 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #ifndef __SCRIPTVARIABLE_H__
 #define __SCRIPTVARIABLE_H__
 
-#include "listener.h"
-#include "short3.h"
+#include "../qcommon/listener.h"
+#include "../qcommon/short3.h"
 
 #ifdef GAME_DLL
-#include "misc.h"
+#include "../fgame/misc.h"
 #endif
 
 enum variabletype

code/script/scriptvm.cpp

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

code/script/scriptvm.h

@@ -27,11 +27,11 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "listener.h"
 
-#include <gamescript.h>
+#include "../fgame/gamescript.h"
 
 #include "scriptvariable.h"
 #include "scriptopcodes.h"
-#include "con_set.h"
+#include "../qcommon/con_set.h"
 
 #define	MAX_STACK_DEPTH		20		// 9 in mohaa
 //#define	LOCALSTACK_SIZE		255		// pre-allocated localstack size for each VM

code/server/sv_game.c

@@ -25,9 +25,10 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "../client/snd_public.h"
 #include "../client/client.h"
-#include "tiki.h"
-#include <localization.h>
-#include <crc.h>
+#include "../qcommon/tiki.h"
+#include "../qcommon/localization.h"
+#include "../qcommon/crc.h"
+#include "../qcommon/alias.h"
 
 debugline_t *DebugLines;
 int numDebugLines;

code/server/sv_init.c

@@ -22,7 +22,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "server.h"
 #include "../client/client.h"
-#include "tiki.h"
+#include "../qcommon/tiki.h"
 
 static char last_mapname[ MAX_QPATH ];
 static int g_iSvsTimeFixupCount;

code/server/sv_world.c

@@ -22,7 +22,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // world.c -- world query functions
 
 #include "server.h"
-#include <tiki.h>
+#include "../qcommon/tiki.h"
 
 /*
 ================

code/skeletor/bonetable.cpp

@@ -23,7 +23,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // bonetable.cpp : Bone table
 
 #include "q_shared.h"
-#include <tiki.h>
+#include "tiki.h"
 
 void ChannelNameTable::CopyChannel( ChannelName_t *dest, const ChannelName_t *source )
 {

code/sys/win_localization.h

@@ -27,7 +27,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "q_shared.h"
 #include "qcommon.h"
-#include "localization.h"
+#include "../qcommon/localization.h"
 
 #ifdef __cplusplus
 #include "str.h"

code/tiki/tiki_files.h

@@ -25,7 +25,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #ifndef __TIKI_FILES_H__
 #define __TIKI_FILES_H__
 
-#include <tiki.h>
+#include "../qcommon/tiki.h"
 
 #ifdef __cplusplus
 extern "C" {

code/uilib/ui_extern.h

@@ -26,8 +26,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "../qcommon/q_shared.h"
 #include "../qcommon/qcommon.h"
 
-#include <listener.h>
-#include <script.h>
+#include "../qcommon/listener.h"
+#include "../qcommon/script.h"
 #include "../client/client.h"
 #include "ui_public.h"
 

code/uilib/uibutton.cpp

@@ -21,7 +21,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
 #include "ui_local.h"
-#include "localization.h"
+#include "../qcommon/localization.h"
 
 Event W_Button_Pressed
 (

code/uilib/uilabel.cpp

@@ -21,7 +21,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
 #include "ui_local.h"
-#include <localization.h>
+#include "../qcommon/localization.h"
 
 Event EV_UILabel_LinkString
 	(

code/uilib/uilayout.cpp

@@ -21,7 +21,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
 #include "ui_local.h"
-#include "scriptexception.h"
+#include "../script/scriptexception.h"
 
 Event EV_Layout_Menu
 	(

code/uilib/uilistctrl.cpp

@@ -21,7 +21,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
 #include "ui_local.h"
-#include "localization.h"
+#include "../qcommon/localization.h"
 
 static UISize2D s_columnpadding;
 

code/uilib/uimenu.h

@@ -23,8 +23,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #ifndef __UIMENU_H__
 #define __UIMENU_H__
 
-#include "listener.h"
-#include "stack.h"
+#include "../qcommon/listener.h"
+#include "../qcommon/stack.h"
 
 class Menu : public Listener {
 	qboolean m_fullscreen;

code/uilib/uistatus.cpp

@@ -21,7 +21,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
 #include "ui_local.h"
-#include "localization.h"
+#include "../qcommon/localization.h"
 
 CLASS_DECLARATION( UIWidget, UIWindowSizer, NULL )
 {

code/uilib/uivertscroll.cpp

@@ -21,7 +21,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
 #include "ui_local.h"
-#include "localization.h"
+#include "../qcommon/localization.h"
 
 Event W_Scrollbar_Positioned
 (

code/uilib/uiwidget.cpp

@@ -21,7 +21,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
 #include "ui_local.h"
-#include <localization.h>
+#include "../qcommon/localization.h"
 
 Event W_Destroyed
 	(