diff --git a/codemp/RMG/RM_Path.h b/codemp/RMG/RM_Path.h
index a08fcf0..ab29391 100644
--- a/codemp/RMG/RM_Path.h
+++ b/codemp/RMG/RM_Path.h
@@ -18,6 +18,8 @@
 #include "../qcommon/cm_randomterrain.h"
 #endif
 
+#include <string>
+
 class CRMPathManager;
 
 // directions you can proceed from cells 
@@ -220,4 +222,4 @@ public:
 	void		GenerateRivers  ( );
 };
 
-#endif
\ No newline at end of file
+#endif
diff --git a/codemp/cgame/cg_consolecmds.c b/codemp/cgame/cg_consolecmds.c
index d852383..a40c33c 100644
--- a/codemp/cgame/cg_consolecmds.c
+++ b/codemp/cgame/cg_consolecmds.c
@@ -5,7 +5,7 @@
 
 #include "cg_local.h"
 #include "../ui/ui_shared.h"
-#include "bg_saga.h"
+#include "../game/bg_saga.h"
 extern menuDef_t *menuScoreboard;
 
 
diff --git a/codemp/cgame/cg_draw.c b/codemp/cgame/cg_draw.c
index 91aecd0..2829842 100644
--- a/codemp/cgame/cg_draw.c
+++ b/codemp/cgame/cg_draw.c
@@ -5,7 +5,7 @@
 
 #include "cg_local.h"
 
-#include "bg_saga.h"
+#include "../game/bg_saga.h"
 
 #include "../ui/ui_shared.h"
 #include "../ui/ui_public.h"
diff --git a/codemp/cgame/cg_ents.c b/codemp/cgame/cg_ents.c
index ba61750..4b8262c 100644
--- a/codemp/cgame/cg_ents.c
+++ b/codemp/cgame/cg_ents.c
@@ -7,7 +7,7 @@
 Ghoul2 Insert Start
 */
 #include "../game/q_shared.h"
-#include "../ghoul2/g2.h"
+#include "../ghoul2/G2.h"
 /*
 Ghoul2 Insert end
 */
diff --git a/codemp/cgame/cg_players.c b/codemp/cgame/cg_players.c
index b8e3c73..de38e1a 100644
--- a/codemp/cgame/cg_players.c
+++ b/codemp/cgame/cg_players.c
@@ -2,8 +2,8 @@
 //
 // cg_players.c -- handle the media and animation for player entities
 #include "cg_local.h"
-#include "../ghoul2/g2.h"
-#include "bg_saga.h"
+#include "../ghoul2/G2.h"
+#include "../game/bg_saga.h"
 
 extern vmCvar_t	cg_thirdPersonAlpha;
 
diff --git a/codemp/cgame/cg_saga.c b/codemp/cgame/cg_saga.c
index 12aeca4..8e89045 100644
--- a/codemp/cgame/cg_saga.c
+++ b/codemp/cgame/cg_saga.c
@@ -10,7 +10,7 @@
  *
  *****************************************************************************/
 #include "cg_local.h"
-#include "bg_saga.h"
+#include "../game/bg_saga.h"
 
 int cgSiegeRoundState = 0;
 int cgSiegeRoundTime = 0;
diff --git a/codemp/cgame/cg_servercmds.c b/codemp/cgame/cg_servercmds.c
index b30e9f4..eac7d37 100644
--- a/codemp/cgame/cg_servercmds.c
+++ b/codemp/cgame/cg_servercmds.c
@@ -9,7 +9,7 @@
 #if !defined(CL_LIGHT_H_INC)
 	#include "cg_lights.h"
 #endif
-#include "../ghoul2/g2.h"
+#include "../ghoul2/G2.h"
 #include "../ui/ui_public.h"
 
 /*
diff --git a/codemp/cgame/cg_turret.c b/codemp/cgame/cg_turret.c
index 076ffad..ab2b0b2 100644
--- a/codemp/cgame/cg_turret.c
+++ b/codemp/cgame/cg_turret.c
@@ -1,6 +1,6 @@
 #include "cg_local.h"
 #include "../game/q_shared.h"
-#include "../ghoul2/g2.h"
+#include "../ghoul2/G2.h"
 
 //rww - The turret is heavily dependant on bone angles. We can't happily set that on the server, so it is done client-only.
 
diff --git a/codemp/cgame/cg_view.c b/codemp/cgame/cg_view.c
index 0986a1f..b9e7633 100644
--- a/codemp/cgame/cg_view.c
+++ b/codemp/cgame/cg_view.c
@@ -4,7 +4,7 @@
 // for a 3D rendering
 #include "cg_local.h"
 
-#include "bg_saga.h"
+#include "../game/bg_saga.h"
 
 #if !defined(CL_LIGHT_H_INC)
 	#include "cg_lights.h"
diff --git a/codemp/client/FXExport.cpp b/codemp/client/FXExport.cpp
index 79252d7..0e59039 100644
--- a/codemp/client/FXExport.cpp
+++ b/codemp/client/FXExport.cpp
@@ -2,7 +2,7 @@
 #include "../qcommon/exe_headers.h"
 
 #include "client.h"
-#include "FXScheduler.h"
+#include "FxScheduler.h"
 
 //#define __FXCHECKER
  
diff --git a/codemp/client/cl_cgame.cpp b/codemp/client/cl_cgame.cpp
index 6180af9..f869bcd 100644
--- a/codemp/client/cl_cgame.cpp
+++ b/codemp/client/cl_cgame.cpp
@@ -14,17 +14,17 @@
 	#include "FXExport.h"
 #endif
 
-#include "FXutil.h"
+#include "FxUtil.h"
 
 #if !defined(CROFFSYSTEM_H_INC)
-	#include "../qcommon/ROFFSystem.h"
+	#include "../qcommon/RoffSystem.h"
 #endif
 
 #ifdef _DONETPROFILE_
 #include "../qcommon/INetProfile.h"
 #endif
 
-#include "../renderer/tr_worldeffects.h"
+#include "../renderer/tr_WorldEffects.h"
 
 #ifdef VV_LIGHTING
 #include "../renderer/tr_lightmanager.h"
diff --git a/codemp/client/cl_main.cpp b/codemp/client/cl_main.cpp
index fd7d621..1dac58c 100644
--- a/codemp/client/cl_main.cpp
+++ b/codemp/client/cl_main.cpp
@@ -23,7 +23,7 @@
 #endif
 
 #if !defined (MINIHEAP_H_INC)
-#include "../qcommon/miniheap.h"
+#include "../qcommon/MiniHeap.h"
 #endif
 
 #ifdef _DONETPROFILE_
diff --git a/codemp/client/cl_parse.cpp b/codemp/client/cl_parse.cpp
index 52dee66..c3e883e 100644
--- a/codemp/client/cl_parse.cpp
+++ b/codemp/client/cl_parse.cpp
@@ -5,7 +5,7 @@
 
 #include "client.h"
 #include "../qcommon/stringed_ingame.h"
-#include "../ghoul2/g2_local.h"
+#include "../ghoul2/G2_local.h"
 #ifdef _DONETPROFILE_
 #include "../qcommon/INetProfile.h"
 #endif
diff --git a/codemp/client/snd_dma.cpp b/codemp/client/snd_dma.cpp
index 47e1850..da1472e 100644
--- a/codemp/client/snd_dma.cpp
+++ b/codemp/client/snd_dma.cpp
@@ -12,6 +12,7 @@
 #include "snd_mp3.h"
 #include "snd_music.h"
 #include "client.h"
+#include "../qcommon/platform.h"
 
 qboolean s_shutUp = qfalse;
 
diff --git a/codemp/client/snd_local.h b/codemp/client/snd_local.h
index f728a3f..9e0b45b 100644
--- a/codemp/client/snd_local.h
+++ b/codemp/client/snd_local.h
@@ -9,10 +9,16 @@
 #include "../mp3code/mp3struct.h"
 
 // Open AL Specific
+#ifdef _WIN32
 #include "openal/al.h"
 #include "openal/alc.h"
+#define HAVE_EAX
 #include "eax/eax.h"
 #include "eax/eaxman.h"
+#else
+#include <AL/al.h>
+#include <AL/alc.h>
+#endif
 
 // Added for Open AL to know when to mute all sounds (e.g when app. loses focus)
 void S_AL_MuteAllSounds(sboolean bMute);
diff --git a/codemp/client/snd_mem.cpp b/codemp/client/snd_mem.cpp
index 2736d5c..5cef22c 100644
--- a/codemp/client/snd_mem.cpp
+++ b/codemp/client/snd_mem.cpp
@@ -7,6 +7,8 @@
 #include "snd_mp3.h"
 #include "snd_ambient.h"
 
+#include <string>
+
 // Open AL
 void S_PreProcessLipSync(sfx_t *sfx);
 extern int s_UseOpenAL;
diff --git a/codemp/client/snd_music.cpp b/codemp/client/snd_music.cpp
index 90e9b86..2f58f18 100644
--- a/codemp/client/snd_music.cpp
+++ b/codemp/client/snd_music.cpp
@@ -8,6 +8,7 @@
 
 #include "../game/q_shared.h"
 #include "../qcommon/sstring.h"
+#include "../qcommon/platform.h"
 
 #pragma warning ( disable : 4663 )	//spcialize class
 #pragma warning( push, 3 )
@@ -22,6 +23,8 @@
 //#include "snd_mp3.h"
 #endif
 
+#include <string>
+
 //
 #include "snd_music.h"
 #include "snd_ambient.h"
diff --git a/codemp/icarus/taskmanager.h b/codemp/icarus/taskmanager.h
index 17d0a8b..9594c43 100644
--- a/codemp/icarus/taskmanager.h
+++ b/codemp/icarus/taskmanager.h
@@ -4,6 +4,7 @@
 #define __TASK_MANAGER__
 
 #include <map>
+#include <string>
 
 #include "sequencer.h"
 class CSequencer;
diff --git a/codemp/jpeg-6/jinclude.h b/codemp/jpeg-6/jinclude.h
index eadcd19..f0a859b 100644
--- a/codemp/jpeg-6/jinclude.h
+++ b/codemp/jpeg-6/jinclude.h
@@ -70,6 +70,11 @@
 
 #include <stdio.h>
 
+#ifndef WIN32
+#include <stdint.h>
+typedef int32_t INT32;
+#endif
+
 /*
  * We need memory copying and zeroing functions, plus strncpy().
  * ANSI and System V implementations declare these in <string.h>.
diff --git a/codemp/mp3code/mp3struct.h b/codemp/mp3code/mp3struct.h
index 6431442..4494d50 100644
--- a/codemp/mp3code/mp3struct.h
+++ b/codemp/mp3code/mp3struct.h
@@ -10,6 +10,10 @@
 
 #include "small_header.h"	// for SAMPLE and IN_OUT
 
+#ifndef byte
+typedef unsigned char byte;
+#endif
+
 typedef void (*SBT_FUNCTION) (float *sample, short *pcm, int n);
 typedef void (*XFORM_FUNCTION) (void *pcm, int igr);
 typedef IN_OUT(*DECODE_FUNCTION) (unsigned char *bs, unsigned char *pcm);
diff --git a/codemp/mp3code/towave.c b/codemp/mp3code/towave.c
index 1c7e8f5..8558561 100644
--- a/codemp/mp3code/towave.c
+++ b/codemp/mp3code/towave.c
@@ -151,13 +151,6 @@ decode (standard decoder) reduction_code:
 #include "mp3struct.h"
 #include <assert.h>
 
-
-#ifndef byte
-typedef unsigned char byte;
-#endif
-
-
-
 typedef struct id3v1_1 {
     char id[3];
     char title[30];		// <file basename>
diff --git a/codemp/qcommon/cm_draw.h b/codemp/qcommon/cm_draw.h
index 647bc5b..67bf860 100644
--- a/codemp/qcommon/cm_draw.h
+++ b/codemp/qcommon/cm_draw.h
@@ -36,6 +36,13 @@
 #define CEILING(a) \
 ((a)==(int)(a) ? (a) : (a)>0 ? 1+(int)(a) : -(1+(int)(-a)))
 
+#ifndef WIN32
+typedef struct {
+	int x;
+	int y;
+} POINT;
+#endif
+
 #include <stdlib.h>
 #endif
 
diff --git a/codemp/renderer/tr_arioche.cpp b/codemp/renderer/tr_arioche.cpp
index df6d11c..232c97d 100644
--- a/codemp/renderer/tr_arioche.cpp
+++ b/codemp/renderer/tr_arioche.cpp
@@ -2,7 +2,7 @@
 #include "../qcommon/exe_headers.h"
 
 #include "tr_local.h"
-#include "tr_worldeffects.h"
+#include "tr_WorldEffects.h"
 
 // Patches up the loaded map to handle the parameters passed from the UI
 
diff --git a/codemp/renderer/tr_ghoul2.cpp b/codemp/renderer/tr_ghoul2.cpp
index b1684bc..4082729 100644
--- a/codemp/renderer/tr_ghoul2.cpp
+++ b/codemp/renderer/tr_ghoul2.cpp
@@ -7,7 +7,7 @@
 #include "../client/client.h"	//FIXME!! EVIL - just include the definitions needed 
 
 #ifdef _XBOX
-#include "../qcommon/miniheap.h"
+#include "../qcommon/MiniHeap.h"
 #endif
 						  
 #if !defined(TR_LOCAL_H)
diff --git a/codemp/renderer/tr_image.cpp b/codemp/renderer/tr_image.cpp
index 6b96f6b..41bbfde 100644
--- a/codemp/renderer/tr_image.cpp
+++ b/codemp/renderer/tr_image.cpp
@@ -7,6 +7,8 @@
 #include "glext.h"
 #endif
 
+#include "../qcommon/platform.h"
+
 #pragma warning (push, 3)	//go back down to 3 for the stl include
 #include <map>
 #pragma warning (pop)
diff --git a/codemp/renderer/tr_model.cpp b/codemp/renderer/tr_model.cpp
index 2bfcf6f..cbe0582 100644
--- a/codemp/renderer/tr_model.cpp
+++ b/codemp/renderer/tr_model.cpp
@@ -7,6 +7,7 @@
 
 
 #include "../qcommon/disablewarnings.h"
+#include "../qcommon/platform.h"
 
 #pragma warning (push, 3)	//go back down to 3 for the stl include
 #include "../qcommon/sstring.h"	// #include <string>
diff --git a/codemp/renderer/tr_quicksprite.cpp b/codemp/renderer/tr_quicksprite.cpp
index 1ab7d41..9fe9517 100644
--- a/codemp/renderer/tr_quicksprite.cpp
+++ b/codemp/renderer/tr_quicksprite.cpp
@@ -7,7 +7,7 @@
 //#include "../server/exe_headers.h"
 #include "tr_local.h"
 
-#include "tr_QuickSprite.h"
+#include "tr_quicksprite.h"
 
 void R_BindAnimatedImage( textureBundle_t *bundle );
 
diff --git a/codemp/renderer/tr_scene.cpp b/codemp/renderer/tr_scene.cpp
index e1cd86e..e8718d5 100644
--- a/codemp/renderer/tr_scene.cpp
+++ b/codemp/renderer/tr_scene.cpp
@@ -7,7 +7,7 @@
 	#include "../ghoul2/G2.h"
 #endif
 #include "../ghoul2/G2_local.h"
-#include "MatComp.h"
+#include "matcomp.h"
 
 #ifdef VV_LIGHTING
 #include "tr_lightmanager.h"
diff --git a/codemp/renderer/tr_shade.cpp b/codemp/renderer/tr_shade.cpp
index c0bd714..f100646 100644
--- a/codemp/renderer/tr_shade.cpp
+++ b/codemp/renderer/tr_shade.cpp
@@ -11,7 +11,7 @@
 #include "../win32/win_lighteffects.h"
 #endif
 
-#include "tr_QuickSprite.h"
+#include "tr_quicksprite.h"
 
 /*
 
diff --git a/codemp/renderer/tr_surfacesprites.cpp b/codemp/renderer/tr_surfacesprites.cpp
index 24b5d64..0b5fad7 100644
--- a/codemp/renderer/tr_surfacesprites.cpp
+++ b/codemp/renderer/tr_surfacesprites.cpp
@@ -5,7 +5,7 @@
 
 #include "tr_local.h"
 
-#include "tr_QuickSprite.h"
+#include "tr_quicksprite.h"
 #include "tr_WorldEffects.h"