diff --git a/qw_common/screen.h b/common/screen.h
similarity index 88%
rename from qw_common/screen.h
rename to common/screen.h
index 03f9006..f77905b 100644
--- a/qw_common/screen.h
+++ b/common/screen.h
@@ -36,6 +36,9 @@ void SCR_SizeDown (void);
 void SCR_BringDownConsole (void);
 void SCR_CenterPrint (char *str);
 
+void SCR_BeginLoadingPlaque (void);
+void SCR_EndLoadingPlaque (void);
+
 int SCR_ModalMessage (char *text);
 
 extern	float		scr_con_current;
@@ -46,16 +49,18 @@ extern	int			sb_lines;
 
 extern	int			clearnotify;	// set to 0 whenever notify text is drawn
 extern	qboolean	scr_disabled_for_loading;
+extern	qboolean	scr_skipupdate;
 
 extern	cvar_t		*scr_viewsize;
 
-
 // only the refresh window will be updated unless these variables are flagged 
 extern	int			scr_copytop;
 extern	int			scr_copyeverything;
 
-qboolean	scr_skipupdate;
+extern qboolean	scr_skipupdate;
 
-qboolean	block_drawing;
+extern qboolean	block_drawing;
+
+void SCR_UpdateWholeScreen (void);
 
 #endif // _SCREEN_H
diff --git a/uquake/screen.h b/uquake/screen.h
deleted file mode 100644
index 27ea465..0000000
--- a/uquake/screen.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
-Copyright (C) 1996-1997 Id Software, Inc.
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
-
-See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-*/
-// screen.h
-
-void SCR_InitCvars (void);
-void SCR_Init (void);
-
-void SCR_UpdateScreen (void);
-
-
-void SCR_SizeUp (void);
-void SCR_SizeDown (void);
-void SCR_BringDownConsole (void);
-void SCR_CenterPrint (char *str);
-
-void SCR_BeginLoadingPlaque (void);
-void SCR_EndLoadingPlaque (void);
-
-int SCR_ModalMessage (char *text);
-
-extern	float		scr_con_current;
-extern	float		scr_conlines;		// lines of console to display
-
-extern	int			scr_fullupdate;	// set to 0 to force full redraw
-extern	int			sb_lines;
-
-extern	int			clearnotify;	// set to 0 whenever notify text is drawn
-extern	qboolean	scr_disabled_for_loading;
-extern	qboolean	scr_skipupdate;
-
-extern	cvar_t		*scr_viewsize;
-
-// only the refresh window will be updated unless these variables are flagged 
-extern	int			scr_copytop;
-extern	int			scr_copyeverything;
-
-extern qboolean		block_drawing;
-
-void SCR_UpdateWholeScreen (void);