diff --git a/ref/soft/r_beams.c b/ref/soft/r_beams.c
index 0e69868d..5c8dd8f5 100644
--- a/ref/soft/r_beams.c
+++ b/ref/soft/r_beams.c
@@ -19,9 +19,8 @@ GNU General Public License for more details.
 #include "entity_types.h"
 #include "triangleapi.h"
 #include "customentity.h"
-#include "cl_tent.h"
 #include "pm_local.h"
-
+#include "triangleapi.h"
 #include "studio.h"
 
 #define NOISE_DIVISIONS	64	// don't touch - many tripmines cause the crash when it equal 128
diff --git a/ref/soft/r_decals.c b/ref/soft/r_decals.c
index 49fa6111..e3d4805a 100644
--- a/ref/soft/r_decals.c
+++ b/ref/soft/r_decals.c
@@ -14,7 +14,6 @@ GNU General Public License for more details.
 */
 
 #include "r_local.h"
-//#include "cl_tent.h"
 
 #define DECAL_OVERLAP_DISTANCE	2
 #define DECAL_DISTANCE		4	// too big values produce more clipped polygons
diff --git a/ref/soft/r_glblit.c b/ref/soft/r_glblit.c
index 6f73b7f2..99d609b1 100644
--- a/ref/soft/r_glblit.c
+++ b/ref/soft/r_glblit.c
@@ -1,6 +1,6 @@
 #include "r_local.h"
 #define APIENTRY_LINKAGE static
-#include "../ref_gl/gl_export.h"
+#include "../gl/gl_export.h"
 
 struct swblit_s
 {
diff --git a/ref/soft/r_local.h b/ref/soft/r_local.h
index 4546544a..3ee559cc 100644
--- a/ref/soft/r_local.h
+++ b/ref/soft/r_local.h
@@ -670,6 +670,7 @@ void TriEnd( void );
 void TriTexCoord2f( float u, float v );
 void TriVertex3fv( const float *v );
 void TriVertex3f( float x, float y, float z );
+void TriColor4f( float r, float g, float b, float a );
 void _TriColor4f( float r, float g, float b, float a );
 void TriColor4ub( byte r, byte g, byte b, byte a );
 void _TriColor4ub( byte r, byte g, byte b, byte a );
diff --git a/ref/soft/r_part.c b/ref/soft/r_part.c
index c71cb7bf..790b843e 100644
--- a/ref/soft/r_part.c
+++ b/ref/soft/r_part.c
@@ -19,7 +19,6 @@ GNU General Public License for more details.
 #include "entity_types.h"
 #include "triangleapi.h"
 #include "pm_local.h"
-#include "cl_tent.h"
 #include "studio.h"
 
 static float gTracerSize[11] = { 1.5f, 0.5f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f };
diff --git a/ref/soft/r_sprite.c b/ref/soft/r_sprite.c
index adb063a3..5aa0f74d 100644
--- a/ref/soft/r_sprite.c
+++ b/ref/soft/r_sprite.c
@@ -18,7 +18,6 @@ GNU General Public License for more details.
 #include "sprite.h"
 #include "studio.h"
 #include "entity_types.h"
-//#include "cl_tent.h"
 
 // it's a Valve default value for LoadMapSprite (probably must be power of two)
 #define MAPSPRITE_SIZE	128
diff --git a/ref/soft/r_studio.c b/ref/soft/r_studio.c
index 0a68035a..aa413bae 100644
--- a/ref/soft/r_studio.c
+++ b/ref/soft/r_studio.c
@@ -20,8 +20,6 @@ GNU General Public License for more details.
 #include "triangleapi.h"
 #include "studio.h"
 #include "pm_local.h"
-//#include "cl_tent.h"
-//#include "client.h"
 #include "pmtrace.h"
 
 #define EVENT_CLIENT	5000	// less than this value it's a server-side studio events