diff --git a/src/client/cstrike/progs.src b/src/client/cstrike/progs.src
index fe1c9854..c791068f 100755
--- a/src/client/cstrike/progs.src
+++ b/src/client/cstrike/progs.src
@@ -57,7 +57,16 @@ defs.h
 
 ../../shared/valve/player.cpp
 ../../shared/pmove.c
+
+../sky.c
+../fade.cpp
+../sprite.cpp
+../titles.cpp
+../text.cpp
+../sentences.cpp
+
 ../../gs-entbase/client.src
+
 ../../shared/decals.c
 ../../shared/effects.c
 ../../shared/spraylogo.cpp
diff --git a/src/gs-entbase/client/fade.cpp b/src/client/fade.cpp
similarity index 100%
rename from src/gs-entbase/client/fade.cpp
rename to src/client/fade.cpp
diff --git a/src/client/gearbox/progs.src b/src/client/gearbox/progs.src
index 19f957bd..c46c4965 100644
--- a/src/client/gearbox/progs.src
+++ b/src/client/gearbox/progs.src
@@ -17,6 +17,13 @@
 ../defs.h
 ../../vgui/include.src
 ../util.c
+../sky.c
+../fade.cpp
+../sprite.cpp
+../titles.cpp
+../text.cpp
+../sentences.cpp
+
 ../../gs-entbase/client.src
 ../sound.c
 ../text.c
diff --git a/src/client/rewolf/progs.src b/src/client/rewolf/progs.src
index 2354552d..d2209e8f 100755
--- a/src/client/rewolf/progs.src
+++ b/src/client/rewolf/progs.src
@@ -21,6 +21,13 @@
 ../util.c
 init.c
 
+../sky.c
+../fade.cpp
+../sprite.cpp
+../titles.cpp
+../text.cpp
+../sentences.cpp
+
 ../../gs-entbase/client.src
 
 decore.cpp
diff --git a/src/client/scihunt/progs.src b/src/client/scihunt/progs.src
index 8d4d54af..d49633ca 100644
--- a/src/client/scihunt/progs.src
+++ b/src/client/scihunt/progs.src
@@ -19,6 +19,13 @@
 
 ../util.c
 
+../sky.c
+../fade.cpp
+../sprite.cpp
+../titles.cpp
+../text.cpp
+../sentences.cpp
+
 ../../gs-entbase/client.src
 
 ../sound.c
diff --git a/src/gs-entbase/client/sentences.cpp b/src/client/sentences.cpp
similarity index 100%
rename from src/gs-entbase/client/sentences.cpp
rename to src/client/sentences.cpp
diff --git a/src/gs-entbase/client/sky.c b/src/client/sky.c
similarity index 100%
rename from src/gs-entbase/client/sky.c
rename to src/client/sky.c
diff --git a/src/gs-entbase/client/sprite.cpp b/src/client/sprite.cpp
similarity index 100%
rename from src/gs-entbase/client/sprite.cpp
rename to src/client/sprite.cpp
diff --git a/src/gs-entbase/client/text.cpp b/src/client/text.cpp
similarity index 100%
rename from src/gs-entbase/client/text.cpp
rename to src/client/text.cpp
diff --git a/src/client/tfc/progs.src b/src/client/tfc/progs.src
index ea3d8cf2..09ba6ef5 100755
--- a/src/client/tfc/progs.src
+++ b/src/client/tfc/progs.src
@@ -22,6 +22,13 @@ vgui_chooseteam.cpp
 ../util.c
 init.c
 
+../sky.c
+../fade.cpp
+../sprite.cpp
+../titles.cpp
+../text.cpp
+../sentences.cpp
+
 ../../gs-entbase/client.src
 
 ../sound.c
diff --git a/src/gs-entbase/client/titles.cpp b/src/client/titles.cpp
similarity index 100%
rename from src/gs-entbase/client/titles.cpp
rename to src/client/titles.cpp
diff --git a/src/client/valve/progs.src b/src/client/valve/progs.src
index c3c61562..e7e44c66 100755
--- a/src/client/valve/progs.src
+++ b/src/client/valve/progs.src
@@ -20,6 +20,13 @@ particles.h
 ../util.c
 init.c
 
+../sky.c
+../fade.cpp
+../sprite.cpp
+../titles.cpp
+../text.cpp
+../sentences.cpp
+
 ../../gs-entbase/client.src
 
 ../sound.c
diff --git a/src/client/voice.c b/src/client/voice.c
index 904acc7c..64e78e22 100644
--- a/src/client/voice.c
+++ b/src/client/voice.c
@@ -25,19 +25,38 @@ void Voice_DrawHUD(void) {
 	vector pos = video_mins + [video_res[0] - 160, video_res[1] - 136];
 
 	for (int i = -1; i > -32; i--) {
-		if (getplayerkeyfloat(i, INFOKEY_P_VOIPSPEAKING) == 1) {
-			drawfill(pos, [144,24], [0,0,0], 0.5f);
-			drawfill(pos, [144, 1], UI_MAINCOLOR, 1.0f);
-			drawfill([pos[0], pos[1] + 23], [144, 1], UI_MAINCOLOR, 1.0f);
-			drawfill(pos, [1, 24], UI_MAINCOLOR, 1.0f);
-			drawfill([pos[0] + 143, pos[1]], [1, 24], UI_MAINCOLOR, 1.0f);
-
-			drawfont = FONT_CON;
-			drawstring([pos[0] + 28, pos[1] + 8], getplayerkeyvalue(i, "name"), [12,12], [1,1,1], 1.0f, DRAWFLAG_NORMAL);
-
-			drawpic(pos + [2,0], "gfx/vgui/icntlk_sv.tga", [24,24], UI_MAINCOLOR, 1, DRAWFLAG_NORMAL);
-			pos[1] -= 32;
+		if (getplayerkeyfloat(i, INFOKEY_P_VOIPSPEAKING) != 1) {
+			continue;
 		}
+
+		/* borders */
+		drawfill(pos, [144,24], [0,0,0], 0.5f);
+		drawfill(pos, [144, 1], UI_MAINCOLOR, 1.0f);
+		drawfill([pos[0], pos[1] + 23], [144, 1], UI_MAINCOLOR, 1.0f);
+		drawfill(pos, [1, 24], UI_MAINCOLOR, 1.0f);
+		drawfill([pos[0] + 143, pos[1]], [1, 24], UI_MAINCOLOR, 1.0f);
+
+		/* icon */
+		drawpic(
+			pos + [2,0],
+			"gfx/vgui/icntlk_sv.tga",
+			[24,24],
+			UI_MAINCOLOR,
+			1.0f,
+			DRAWFLAG_NORMAL
+		);
+
+		/* speaker name */
+		drawfont = FONT_CON;
+		drawstring(
+			[pos[0] + 28, pos[1] + 8],
+			getplayerkeyvalue(i, "name"),
+			[12,12],
+			[1,1,1],
+			1.0f,
+			DRAWFLAG_NORMAL
+		);
+		pos[1] -= 32;
 	}
 }
 
diff --git a/src/gs-entbase/client.src b/src/gs-entbase/client.src
index 80e1e94b..23798752 100644
--- a/src/gs-entbase/client.src
+++ b/src/gs-entbase/client.src
@@ -1,12 +1,6 @@
 #includelist
 materials.h
-client/sky.c
 client/baseentity.cpp
-client/fade.cpp
-client/sprite.cpp
-client/titles.cpp
-client/text.cpp
-client/sentences.cpp
 client/env_cubemap.cpp
 client/env_glow.cpp
 client/env_sound.cpp