diff --git a/src/gs-entbase/client/env_sound.qc b/src/gs-entbase/client/env_sound.qc
index 57085a0a..b8e121e4 100644
--- a/src/gs-entbase/client/env_sound.qc
+++ b/src/gs-entbase/client/env_sound.qc
@@ -32,7 +32,7 @@ This works only with the OpenAL sound backend.
 This entity was introduced in Half-Life (1998).
 */
 
-string g_hlefx[] = {
+static string g_hlefx[] = {
 	"default",
 	"gs_generic",
 	"gs_metal_s",
diff --git a/src/gs-entbase/server.src b/src/gs-entbase/server.src
index 86a7ee78..3429b5e0 100644
--- a/src/gs-entbase/server.src
+++ b/src/gs-entbase/server.src
@@ -13,7 +13,6 @@ server/info_hint.qc
 server/button_target.qc
 server/cycler.qc
 server/cycler_sprite.qc
-server/env_beam.qc
 server/env_fade.qc
 server/env_hudhint.qc
 server/env_spark.qc
diff --git a/src/gs-entbase/shared.src b/src/gs-entbase/shared.src
index 93824deb..90ab460c 100644
--- a/src/gs-entbase/shared.src
+++ b/src/gs-entbase/shared.src
@@ -6,6 +6,7 @@
 shared/ambient_generic.qc
 shared/decals.qc
 shared/func_friction.qc
+shared/env_beam.qc
 shared/env_sprite.qc
 shared/env_bubbles.qc
 shared/env_projectedtexture.qc
diff --git a/src/gs-entbase/server/env_beam.qc b/src/gs-entbase/shared/env_beam.qc
similarity index 100%
rename from src/gs-entbase/server/env_beam.qc
rename to src/gs-entbase/shared/env_beam.qc