diff --git a/Makefile b/Makefile
index 7d9117c..a724587 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@ CC=gcc
 BASE_CFLAGS=-Dstricmp=strcasecmp
 
 #use these cflags to optimize it
-CFLAGS=$(BASE_CFLAGS) -O3 -ffast-math -DLINUX -DBSPC
+CFLAGS=$(BASE_CFLAGS) -Ideps -O3 -ffast-math -DLINUX -DBSPC
 #use these when debugging 
 #CFLAGS=$(BASE_CFLAGS) -g
 
diff --git a/aas_areamerging.c b/aas_areamerging.c
index f9de65f..04055cd 100644
--- a/aas_areamerging.c
+++ b/aas_areamerging.c
@@ -21,7 +21,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
 #include "qbsp.h"
-#include "../botlib/aasfile.h"
+#include "botlib/aasfile.h"
 #include "aas_create.h"
 #include "aas_store.h"
 
diff --git a/aas_cfg.c b/aas_cfg.c
index b805176..79ccf10 100644
--- a/aas_cfg.c
+++ b/aas_cfg.c
@@ -22,12 +22,12 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "qbsp.h"
 #include "float.h"
-#include "../botlib/aasfile.h"
+#include "botlib/aasfile.h"
 #include "aas_store.h"
 #include "aas_cfg.h"
-#include "../botlib/l_precomp.h"
-#include "../botlib/l_struct.h"
-#include "../botlib/l_libvar.h"
+#include "botlib/l_precomp.h"
+#include "botlib/l_struct.h"
+#include "botlib/l_libvar.h"
 
 //structure field offsets
 #define BBOX_OFS(x) (int)&(((aas_bbox_t *)0)->x)
diff --git a/aas_create.c b/aas_create.c
index 1705362..fca4bd6 100644
--- a/aas_create.c
+++ b/aas_create.c
@@ -21,7 +21,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
 #include "qbsp.h"
-#include "../botlib/aasfile.h"
+#include "botlib/aasfile.h"
 #include "aas_create.h"
 #include "aas_store.h"
 #include "aas_gsubdiv.h"
@@ -30,7 +30,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "aas_edgemelting.h"
 #include "aas_prunenodes.h"
 #include "aas_cfg.h"
-#include "../game/surfaceflags.h"
+#include "qcommon/surfaceflags.h"
 
 //#define AW_DEBUG
 //#define L_DEBUG
diff --git a/aas_edgemelting.c b/aas_edgemelting.c
index e59f4f9..0cd6701 100644
--- a/aas_edgemelting.c
+++ b/aas_edgemelting.c
@@ -21,7 +21,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
 #include "qbsp.h"
-#include "../botlib/aasfile.h"
+#include "botlib/aasfile.h"
 #include "aas_create.h"
 
 //===========================================================================
diff --git a/aas_facemerging.c b/aas_facemerging.c
index 2fb2903..b6ac76d 100644
--- a/aas_facemerging.c
+++ b/aas_facemerging.c
@@ -21,7 +21,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
 #include "qbsp.h"
-#include "../botlib/aasfile.h"
+#include "botlib/aasfile.h"
 #include "aas_create.h"
 
 //===========================================================================
diff --git a/aas_file.c b/aas_file.c
index 9dc6b12..9e745d6 100644
--- a/aas_file.c
+++ b/aas_file.c
@@ -21,7 +21,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
 #include "qbsp.h"
-#include "../botlib/aasfile.h"
+#include "botlib/aasfile.h"
 #include "aas_file.h"
 #include "aas_store.h"
 #include "aas_create.h"
diff --git a/aas_gsubdiv.c b/aas_gsubdiv.c
index 4cfb194..d3cf222 100644
--- a/aas_gsubdiv.c
+++ b/aas_gsubdiv.c
@@ -21,7 +21,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
 #include "qbsp.h"
-#include "../botlib/aasfile.h"
+#include "botlib/aasfile.h"
 #include "aas_create.h"
 #include "aas_store.h"
 #include "aas_cfg.h"
diff --git a/aas_map.c b/aas_map.c
index 10c616a..5fb49a3 100644
--- a/aas_map.c
+++ b/aas_map.c
@@ -22,10 +22,10 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "qbsp.h"
 #include "l_mem.h"
-#include "../botlib/aasfile.h"		//aas_bbox_t
+#include "botlib/aasfile.h"		//aas_bbox_t
 #include "aas_store.h"				//AAS_MAX_BBOXES
 #include "aas_cfg.h"
-#include "../game/surfaceflags.h"
+#include "qcommon/surfaceflags.h"
 
 #define SPAWNFLAG_NOT_EASY			0x00000100
 #define SPAWNFLAG_NOT_MEDIUM		0x00000200
diff --git a/aas_prunenodes.c b/aas_prunenodes.c
index 1ba292a..522fa3d 100644
--- a/aas_prunenodes.c
+++ b/aas_prunenodes.c
@@ -21,7 +21,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
 #include "qbsp.h"
-#include "../botlib/aasfile.h"
+#include "botlib/aasfile.h"
 #include "aas_create.h"
 
 int c_numprunes;
diff --git a/aas_store.c b/aas_store.c
index d549ab7..17556b8 100644
--- a/aas_store.c
+++ b/aas_store.c
@@ -21,7 +21,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
 #include "qbsp.h"
-#include "../botlib/aasfile.h"
+#include "botlib/aasfile.h"
 #include "aas_file.h"
 #include "aas_store.h"
 #include "aas_create.h"
diff --git a/aas_store.h b/aas_store.h
index 063adbe..d915b18 100644
--- a/aas_store.h
+++ b/aas_store.h
@@ -36,8 +36,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #define AAS_MAX_CLUSTERS					65536
 
 #define BSPCINCLUDE
-#include "../game/be_aas.h"
-#include "../botlib/be_aas_def.h"
+#include "botlib/be_aas.h"
+#include "botlib/be_aas_def.h"
 
 /*
 typedef struct bspc_aas_s
diff --git a/be_aas_bspc.c b/be_aas_bspc.c
index 9473287..f53a01f 100644
--- a/be_aas_bspc.c
+++ b/be_aas_bspc.c
@@ -20,18 +20,18 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
-#include "../game/q_shared.h"
-#include "../bspc/l_log.h"
-#include "../bspc/l_qfiles.h"
-#include "../botlib/l_memory.h"
-#include "../botlib/l_script.h"
-#include "../botlib/l_precomp.h"
-#include "../botlib/l_struct.h"
-#include "../botlib/aasfile.h"
-#include "../game/botlib.h"
-#include "../game/be_aas.h"
-#include "../botlib/be_aas_def.h"
-#include "../qcommon/cm_public.h"
+#include "qcommon/q_shared.h"
+#include "bspc/l_log.h"
+#include "bspc/l_qfiles.h"
+#include "botlib/l_memory.h"
+#include "botlib/l_script.h"
+#include "botlib/l_precomp.h"
+#include "botlib/l_struct.h"
+#include "botlib/aasfile.h"
+#include "botlib/botlib.h"
+#include "botlib/be_aas.h"
+#include "botlib/be_aas_def.h"
+#include "qcommon/cm_public.h"
 
 //#define BSPC
 
diff --git a/brushbsp.c b/brushbsp.c
index d8accec..24b21cc 100644
--- a/brushbsp.c
+++ b/brushbsp.c
@@ -22,7 +22,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "qbsp.h"
 #include "l_mem.h"
-#include "../botlib/aasfile.h"
+#include "botlib/aasfile.h"
 #include "aas_store.h"
 #include "aas_cfg.h"
 
diff --git a/bspc.c b/bspc.c
index e19076e..6b3bb9b 100644
--- a/bspc.c
+++ b/bspc.c
@@ -33,9 +33,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #endif
 #include "qbsp.h"
 #include "l_mem.h"
-#include "../botlib/aasfile.h"
-#include "../botlib/be_aas_cluster.h"
-#include "../botlib/be_aas_optimize.h"
+#include "botlib/aasfile.h"
+#include "botlib/be_aas_cluster.h"
+#include "botlib/be_aas_optimize.h"
 #include "aas_create.h"
 #include "aas_store.h"
 #include "aas_file.h"
diff --git a/l_bsp_ent.c b/l_bsp_ent.c
index 0cc8f8e..4811958 100644
--- a/l_bsp_ent.c
+++ b/l_bsp_ent.c
@@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "l_math.h"
 #include "l_mem.h"
 #include "l_log.h"
-#include "../botlib/l_script.h"
+#include "botlib/l_script.h"
 #include "l_bsp_ent.h"
 
 #define	MAX_KEY		32
diff --git a/l_bsp_hl.c b/l_bsp_hl.c
index 48cb7e8..daf62d5 100644
--- a/l_bsp_hl.c
+++ b/l_bsp_hl.c
@@ -23,7 +23,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "l_math.h"
 #include "l_mem.h"
 #include "l_log.h"
-#include "../botlib/l_script.h"
+#include "botlib/l_script.h"
 #include "l_bsp_hl.h"
 #include "l_bsp_ent.h"
 
diff --git a/l_bsp_q1.c b/l_bsp_q1.c
index 7ac1553..8907855 100644
--- a/l_bsp_q1.c
+++ b/l_bsp_q1.c
@@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "l_math.h"
 #include "l_mem.h"
 #include "l_log.h"
-#include "../botlib/l_script.h"
+#include "botlib/l_script.h"
 #include "l_bsp_q1.h"
 #include "l_bsp_ent.h"
 
diff --git a/l_bsp_q2.c b/l_bsp_q2.c
index 2d97579..83b81c1 100644
--- a/l_bsp_q2.c
+++ b/l_bsp_q2.c
@@ -25,7 +25,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "l_mem.h"
 #include "l_log.h"
 #include "l_poly.h"
-#include "../botlib/l_script.h"
+#include "botlib/l_script.h"
 #include "q2files.h"
 #include "l_bsp_q2.h"
 #include "l_bsp_ent.h"
diff --git a/l_bsp_q3.c b/l_bsp_q3.c
index 24bb766..158e154 100644
--- a/l_bsp_q3.c
+++ b/l_bsp_q3.c
@@ -25,7 +25,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "l_mem.h"
 #include "l_log.h"
 #include "l_poly.h"
-#include "../botlib/l_script.h"
+#include "botlib/l_script.h"
 #include "l_qfiles.h"
 #include "l_bsp_q3.h"
 #include "l_bsp_ent.h"
diff --git a/l_bsp_sin.c b/l_bsp_sin.c
index 2c3c223..3ae7677 100644
--- a/l_bsp_sin.c
+++ b/l_bsp_sin.c
@@ -25,7 +25,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "l_mem.h"
 #include "l_log.h"
 #include "l_poly.h"
-#include "../botlib/l_script.h"
+#include "botlib/l_script.h"
 #include "l_bsp_ent.h"
 #include "l_bsp_sin.h"
 
diff --git a/l_qfiles.h b/l_qfiles.h
index 0f79e7f..54d77c2 100644
--- a/l_qfiles.h
+++ b/l_qfiles.h
@@ -20,7 +20,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
-#include "../qcommon/unzip.h"
+#include "qcommon/unzip.h"
 
 #define QFILETYPE_UNKNOWN			0x8000
 #define QFILETYPE_PAK				0x0001
diff --git a/map.c b/map.c
index e156d3a..0aa32e0 100644
--- a/map.c
+++ b/map.c
@@ -27,7 +27,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "l_bsp_q3.h"
 #include "l_bsp_sin.h"
 #include "l_mem.h"
-#include "../botlib/aasfile.h"		//aas_bbox_t
+#include "botlib/aasfile.h"		//aas_bbox_t
 #include "aas_store.h"		//AAS_MAX_BBOXES
 #include "aas_cfg.h"
 
diff --git a/map_q2.c b/map_q2.c
index a91e78a..2792109 100644
--- a/map_q2.c
+++ b/map_q2.c
@@ -27,7 +27,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "qbsp.h"
 #include "l_mem.h"
-#include "../botlib/aasfile.h"			//aas_bbox_t
+#include "botlib/aasfile.h"			//aas_bbox_t
 #include "aas_store.h"		//AAS_MAX_BBOXES
 #include "aas_cfg.h"
 #include "aas_map.h"			//AAS_CreateMapBrushes
diff --git a/map_q3.c b/map_q3.c
index 375100c..e839143 100644
--- a/map_q3.c
+++ b/map_q3.c
@@ -22,13 +22,13 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "qbsp.h"
 #include "l_mem.h"
-#include "../botlib/aasfile.h"	//aas_bbox_t
+#include "botlib/aasfile.h"	//aas_bbox_t
 #include "aas_store.h"			//AAS_MAX_BBOXES
 #include "aas_cfg.h"
 #include "aas_map.h"			//AAS_CreateMapBrushes
 #include "l_bsp_q3.h"
-#include "../qcommon/cm_patch.h"
-#include "../game/surfaceflags.h"
+#include "qcommon/cm_patch.h"
+#include "qcommon/surfaceflags.h"
 
 #define NODESTACKSIZE		1024
 
diff --git a/qbsp.h b/qbsp.h
index dd57200..58ea756 100644
--- a/qbsp.h
+++ b/qbsp.h
@@ -29,7 +29,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "l_math.h"
 #include "l_poly.h"
 #include "l_threads.h"
-#include "../botlib/l_script.h"
+#include "botlib/l_script.h"
 #include "l_bsp_ent.h"
 #include "q2files.h"
 #include "l_mem.h"
diff --git a/tetrahedron.c b/tetrahedron.c
index 4c4d251..51a0c3a 100644
--- a/tetrahedron.c
+++ b/tetrahedron.c
@@ -22,7 +22,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "qbsp.h"
 #include "l_mem.h"
-#include "../botlib/aasfile.h"
+#include "botlib/aasfile.h"
 #include "aas_store.h"
 #include "aas_cfg.h"
 #include "aas_file.h"