diff --git a/include/va.h b/include/va.h
new file mode 100644
index 0000000..3aacee9
--- /dev/null
+++ b/include/va.h
@@ -0,0 +1,42 @@
+/*
+	va.h
+
+	Definitions common to client and server.
+
+	Copyright (C) 1996-1997  Id Software, Inc.
+	Copyright (C) 2000  Marcus Sundberg <mackan@stacken.kth.se>
+
+	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:
+
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
+
+	$Id$
+*/
+
+#ifndef __va_h
+#define __va_h
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include "gcc_attr.h"
+
+char	*va(char *format, ...) __attribute__((format(printf,1,2)));
+// does a varargs printf into a temp buffer
+
+#endif // __va_h
diff --git a/source/vid.c b/source/vid.c
index 6e980ac..50d0c2e 100644
--- a/source/vid.c
+++ b/source/vid.c
@@ -29,52 +29,16 @@
 
 	$Id$
 */
-
 #define _BSD
-#include <config.h>
-
-#include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-#include <ctype.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
+#ifdef HAVE_CONFIG_H
+#include "config.h"
 #endif
-#include <sys/ipc.h>
-#include <sys/shm.h>
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-#include <X11/Xatom.h>
-#include <X11/keysym.h>
-#include <X11/extensions/XShm.h>
 
-#include "qendian.h"
-#include "qargs.h"
-#include "quakedef.h"
-#include "d_local.h"
-#include "keys.h"
 #include "cvar.h"
-#include "menu.h"
+#include "vid.h"
+#include "va.h"
+#include "qargs.h"
 #include "sys.h"
-#include "cmd.h"
-#include "input.h"
-#include "draw.h"
-#include "console.h"
-#include "client.h"
-#include "input.h"
-#include "context_x11.h"
-#ifdef HAVE_VIDMODE
-# include <X11/extensions/xf86vmode.h>
-#endif
-#include "dga_check.h"
-
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
 
 extern viddef_t        vid; // global video state