diff --git a/include/r_screen.h b/include/r_screen.h
index 54252114f..8d3b08e91 100644
--- a/include/r_screen.h
+++ b/include/r_screen.h
@@ -47,7 +47,6 @@ void SCR_DrawStringToSnap (const char *s, struct tex_s *tex, int x, int y);
 
 
 extern int         scr_copytop;
-extern int         scr_copyeverything;
 
 extern float       scr_con_current;
 extern float       scr_conlines;				// lines of console to display
@@ -62,8 +61,6 @@ extern struct qpic_s *scr_ram;
 extern struct qpic_s *scr_net;
 extern struct qpic_s *scr_turtle;
 
-extern int         scr_fullupdate;
-
 extern int         clearconsole;
 extern int         clearnotify;
 
diff --git a/libs/video/renderer/gl/gl_screen.c b/libs/video/renderer/gl/gl_screen.c
index c9334b377..8f0aeb8ef 100644
--- a/libs/video/renderer/gl/gl_screen.c
+++ b/libs/video/renderer/gl/gl_screen.c
@@ -213,7 +213,7 @@ gl_SCR_UpdateScreen (double realtime, SCR_Func scr_3dfunc, SCR_Func *scr_funcs)
 	vid.numpages = 2 + gl_triplebuffer->int_val;
 
 	scr_copytop = 0;
-	scr_copyeverything = 0;
+	vr_data.scr_copyeverything = 0;
 
 	if (!scr_initialized)
 		return;							// not initialized yet
diff --git a/libs/video/renderer/r_screen.c b/libs/video/renderer/r_screen.c
index 47b881329..46c84c2ae 100644
--- a/libs/video/renderer/r_screen.c
+++ b/libs/video/renderer/r_screen.c
@@ -92,7 +92,6 @@
 
 // only the refresh window will be updated unless these variables are flagged
 int         scr_copytop;
-int         scr_copyeverything;
 byte       *draw_chars;					// 8*8 graphic characters FIXME location
 
 float       oldfov;
@@ -103,8 +102,6 @@ qboolean    scr_initialized;			// ready to draw
 qpic_t     *scr_ram;
 qpic_t     *scr_turtle;
 
-int         scr_fullupdate;
-
 int         clearconsole;
 
 viddef_t    vid;						// global video state
@@ -154,7 +151,7 @@ SCR_CalcRefdef (void)
 	refdef_t   *refdef = r_data->refdef;
 
 	// force a background redraw
-	scr_fullupdate = 0;
+	vr_data.scr_fullupdate = 0;
 	vid.recalc_refdef = 0;
 
 	// bound field of view
diff --git a/libs/video/renderer/sw/screen.c b/libs/video/renderer/sw/screen.c
index 87f4ec40b..d425f6549 100644
--- a/libs/video/renderer/sw/screen.c
+++ b/libs/video/renderer/sw/screen.c
@@ -197,7 +197,7 @@ SCR_UpdateScreen (double realtime, SCR_Func scr_3dfunc, SCR_Func *scr_funcs)
 	vr_data.realtime = realtime;
 
 	scr_copytop = 0;
-	scr_copyeverything = 0;
+	vr_data.scr_copyeverything = 0;
 
 	if (!scr_initialized)
 		return;							// not initialized yet
@@ -214,8 +214,8 @@ SCR_UpdateScreen (double realtime, SCR_Func scr_3dfunc, SCR_Func *scr_funcs)
 	D_EnableBackBufferAccess ();		// of all overlay stuff if drawing
 										// directly
 
-	if (scr_fullupdate++ < vid.numpages) {	// clear the entire screen
-		scr_copyeverything = 1;
+	if (vr_data.scr_fullupdate++ < vid.numpages) {	// clear the entire screen
+		vr_data.scr_copyeverything = 1;
 		Draw_TileClear (0, 0, vid.width, vid.height);
 	}
 
@@ -244,7 +244,7 @@ SCR_UpdateScreen (double realtime, SCR_Func scr_3dfunc, SCR_Func *scr_funcs)
 	}
 
 	// update one of three areas
-	if (scr_copyeverything) {
+	if (vr_data.scr_copyeverything) {
 		vrect.x = 0;
 		vrect.y = 0;
 		vrect.width = vid.width;
diff --git a/libs/video/renderer/sw32/screen.c b/libs/video/renderer/sw32/screen.c
index b77325904..63f0ce6e1 100644
--- a/libs/video/renderer/sw32/screen.c
+++ b/libs/video/renderer/sw32/screen.c
@@ -155,7 +155,7 @@ sw32_SCR_UpdateScreen (double realtime, SCR_Func scr_3dfunc, SCR_Func *scr_funcs
 	vr_data.realtime = realtime;
 
 	scr_copytop = 0;
-	scr_copyeverything = 0;
+	vr_data.scr_copyeverything = 0;
 
 	if (!scr_initialized)
 		return;							// not initialized yet
@@ -172,8 +172,8 @@ sw32_SCR_UpdateScreen (double realtime, SCR_Func scr_3dfunc, SCR_Func *scr_funcs
 	sw32_D_EnableBackBufferAccess ();		// of all overlay stuff if drawing
 										// directly
 
-	if (scr_fullupdate++ < vid.numpages) {	// clear the entire screen
-		scr_copyeverything = 1;
+	if (vr_data.scr_fullupdate++ < vid.numpages) {	// clear the entire screen
+		vr_data.scr_copyeverything = 1;
 		sw32_Draw_TileClear (0, 0, vid.width, vid.height);
 	}
 
@@ -202,7 +202,7 @@ sw32_SCR_UpdateScreen (double realtime, SCR_Func scr_3dfunc, SCR_Func *scr_funcs
 	}
 
 	// update one of three areas
-	if (scr_copyeverything) {
+	if (vr_data.scr_copyeverything) {
 		vrect.x = 0;
 		vrect.y = 0;
 		vrect.width = vid.width;