diff --git a/include/Makemodule.am b/include/Makemodule.am
index 645a820bf..0755ed1b5 100644
--- a/include/Makemodule.am
+++ b/include/Makemodule.am
@@ -11,7 +11,6 @@ EXTRA_DIST += \
 	include/block16.h \
 	include/block8.h \
 	include/buildnum.h \
-	include/clview.h \
 	include/compat.h \
 	include/context_sdl.h \
 	include/context_x11.h \
@@ -80,6 +79,7 @@ EXTRA_DIST += \
 	include/client/entities.h \
 	include/client/temp_entities.h \
 	include/client/locs.h \
+	include/client/view.h \
 	include/qw/bothdefs.h \
 	include/qw/msg_backbuf.h \
 	include/qw/msg_ucmd.h \
diff --git a/include/clview.h b/include/client/view.h
similarity index 85%
rename from include/clview.h
rename to include/client/view.h
index 2b2cbffb2..756eb1d21 100644
--- a/include/clview.h
+++ b/include/client/view.h
@@ -1,5 +1,5 @@
 /*
-	clview.h
+	view.h
 
 	(description)
 
@@ -26,8 +26,8 @@
 */
 // view.h
 
-#ifndef __clview_h_
-#define __clview_h_
+#ifndef __client_view_h_
+#define __client_view_h_
 
 #include "QF/mathlib.h"
 #include "QF/simd/types.h"
@@ -41,14 +41,9 @@ void V_Init (void);
 void V_Init_Cvars (void);
 void V_RenderView (void);
 float V_CalcRoll (const vec3_t angles, vec4f_t velocity);
-void V_UpdatePalette (void);
 void V_StartPitchDrift (void);
 void V_StopPitchDrift (void);
 
-void V_RenderView (void);
-void V_UpdatePalette (void);
-void V_Register (void);
 void V_SetContentsColor (int contents);
-void V_CalcBlend (void);
 
-#endif // __clview_h_
+#endif // __client_view_h_
diff --git a/libs/video/renderer/sw32/draw.c b/libs/video/renderer/sw32/draw.c
index 13454c437..fdb24e2c5 100644
--- a/libs/video/renderer/sw32/draw.c
+++ b/libs/video/renderer/sw32/draw.c
@@ -1362,6 +1362,7 @@ sw32_Draw_BlendScreen (quat_t color)
 	}
 	break;
 	default:
-		Sys_Error("V_UpdatePalette: unsupported r_pixbytes %i", sw32_r_pixbytes);
+		Sys_Error("sw32_Draw_BlendScreen: unsupported r_pixbytes %i",
+				  sw32_r_pixbytes);
 	}
 }
diff --git a/nq/source/cl_main.c b/nq/source/cl_main.c
index 25ff7bd39..e2c222713 100644
--- a/nq/source/cl_main.c
+++ b/nq/source/cl_main.c
@@ -49,10 +49,10 @@
 #include "QF/plugin/vid_render.h"
 
 #include "compat.h"
-#include "clview.h"
 #include "sbar.h"
 
 #include "client/temp_entities.h"
+#include "client/view.h"
 
 #include "nq/include/chase.h"
 #include "nq/include/cl_skin.h"
diff --git a/nq/source/cl_view.c b/nq/source/cl_view.c
index fa62de0fd..1ccf06d98 100644
--- a/nq/source/cl_view.c
+++ b/nq/source/cl_view.c
@@ -38,7 +38,8 @@
 #include "QF/plugin/vid_render.h"
 
 #include "compat.h"
-#include "clview.h"
+
+#include "client/view.h"
 
 #include "nq/include/chase.h"
 #include "nq/include/client.h"
@@ -393,7 +394,7 @@ V_CalcPowerupCshift (void)
   LordHavoc made this a real, true alpha blend.  Cleaned it up
   a bit, but otherwise this is his code.  --KB
 */
-void
+static void
 V_CalcBlend (void)
 {
 	float       a2, a3;
diff --git a/qw/source/cl_entparse.c b/qw/source/cl_entparse.c
index a7716b729..60c8cf2c4 100644
--- a/qw/source/cl_entparse.c
+++ b/qw/source/cl_entparse.c
@@ -42,9 +42,9 @@
 #include "QF/sys.h"
 
 #include "compat.h"
-#include "clview.h"
 
 #include "client/temp_entities.h"
+#include "client/view.h"
 
 #include "qw/msg_ucmd.h"
 #include "qw/pmove.h"
diff --git a/qw/source/cl_ents.c b/qw/source/cl_ents.c
index 606fc1ce8..b70b143cc 100644
--- a/qw/source/cl_ents.c
+++ b/qw/source/cl_ents.c
@@ -43,12 +43,12 @@
 #include "QF/sys.h"
 
 #include "compat.h"
-#include "clview.h"
 #include "d_iface.h"
 
 #include "client/effects.h"
 #include "client/locs.h"
 #include "client/temp_entities.h"
+#include "client/view.h"
 
 #include "qw/bothdefs.h"
 #include "qw/msg_ucmd.h"
diff --git a/qw/source/cl_input.c b/qw/source/cl_input.c
index 55ef38f5d..5a2fe2b6e 100644
--- a/qw/source/cl_input.c
+++ b/qw/source/cl_input.c
@@ -46,7 +46,8 @@
 #include "QF/va.h"
 
 #include "compat.h"
-#include "clview.h"
+
+#include "client/view.h"
 
 #include "qw/msg_ucmd.h"
 
diff --git a/qw/source/cl_main.c b/qw/source/cl_main.c
index ea143c9ae..be73db0e7 100644
--- a/qw/source/cl_main.c
+++ b/qw/source/cl_main.c
@@ -92,11 +92,11 @@
 #include "QF/plugin/console.h"
 
 #include "buildnum.h"
-#include "clview.h"
 #include "compat.h"
 #include "sbar.h"
 
 #include "client/temp_entities.h"
+#include "client/view.h"
 
 #include "qw/bothdefs.h"
 #include "qw/pmove.h"
diff --git a/qw/source/cl_parse.c b/qw/source/cl_parse.c
index bfd1fa5a2..b75355fa1 100644
--- a/qw/source/cl_parse.c
+++ b/qw/source/cl_parse.c
@@ -62,11 +62,11 @@
 #include "QF/va.h"
 
 #include "compat.h"
-#include "clview.h"
 #include "sbar.h"
 
 #include "client/effects.h"
 #include "client/temp_entities.h"
+#include "client/view.h"
 
 #include "qw/bothdefs.h"
 #include "qw/pmove.h"
diff --git a/qw/source/cl_screen.c b/qw/source/cl_screen.c
index 7827c30db..22c8b5b96 100644
--- a/qw/source/cl_screen.c
+++ b/qw/source/cl_screen.c
@@ -44,9 +44,10 @@
 #include "QF/pcx.h"
 #include "QF/screen.h"
 
-#include "clview.h"
 #include "sbar.h"
 
+#include "client/view.h"
+
 #include "qw/include/client.h"
 
 static qpic_t  *scr_net;
diff --git a/qw/source/cl_view.c b/qw/source/cl_view.c
index 9497e3ef9..f20d5747a 100644
--- a/qw/source/cl_view.c
+++ b/qw/source/cl_view.c
@@ -36,7 +36,8 @@
 #include "QF/simd/vec4f.h"
 
 #include "compat.h"
-#include "clview.h"
+
+#include "client/view.h"
 
 #include "qw/bothdefs.h"
 
@@ -95,7 +96,7 @@ cshift_t    cshift_bonus = { {215, 186, 60}, 50};
 #define sqr(x) ((x) * (x))
 
 float
-V_CalcRoll (const vec3_t angles, const vec4f_t velocity)
+V_CalcRoll (const vec3_t angles, vec4f_t velocity)
 {
 	float       side, sign, value;
 	vec3_t      forward, right, up;
@@ -399,7 +400,7 @@ V_CalcPowerupCshift (void)
   LordHavoc made this a real, true alpha blend.  Cleaned it up
   a bit, but otherwise this is his code.  --KB
 */
-void
+static void
 V_CalcBlend (void)
 {
 	float       a2, a3;