diff -ru quakeforge-0.5.5.orig/include/QF/console.h quakeforge-0.5.5/include/QF/console.h
--- quakeforge-0.5.5.orig/include/QF/console.h	2003-07-25 15:21:42.000000000 -0700
+++ quakeforge-0.5.5/include/QF/console.h	2008-06-04 12:04:54.000000000 -0700
@@ -141,6 +141,4 @@
 void Menu_Enter (void);
 void Menu_Leave (void);
 
-extern struct cvar_s *con_size;
-
 #endif // __console_h
diff -ru quakeforge-0.5.5.orig/include/QF/sound.h quakeforge-0.5.5/include/QF/sound.h
--- quakeforge-0.5.5.orig/include/QF/sound.h	2004-01-20 18:52:07.000000000 -0800
+++ quakeforge-0.5.5/include/QF/sound.h	2008-06-04 12:02:27.000000000 -0700
@@ -112,32 +112,15 @@
 // number of times S_Update() is called per second.
 //
 
-extern qboolean 		fakedma;
 extern int 			fakedma_updates;
 extern unsigned paintedtime;
-extern unsigned soundtime;
-extern vec3_t listener_origin;
-extern vec3_t listener_forward;
-extern vec3_t listener_right;
-extern vec3_t listener_up;
-extern vec_t sound_nominal_clip_dist;
 
 extern	struct cvar_s *snd_loadas8bit;
-extern	struct cvar_s *bgmvolume;
 extern	struct cvar_s *volume;
 
-extern	struct cvar_s *snd_mixahead;
-extern	struct cvar_s	*snd_device;
-extern	struct cvar_s	*snd_rate;
-extern	struct cvar_s	*snd_bits;
-extern	struct cvar_s	*snd_stereo;
 extern	struct cvar_s	*snd_interp;
 extern	struct cvar_s *snd_stereo_phase_separation;
 
-extern qboolean	snd_initialized;
-
-extern int		snd_blocked;
-
 void S_LocalSound (const char *s);
 
 void S_AmbientOff (void);
diff -ru quakeforge-0.5.5.orig/include/context_x11.h quakeforge-0.5.5/include/context_x11.h
--- quakeforge-0.5.5.orig/include/context_x11.h	2004-03-20 21:39:59.000000000 -0800
+++ quakeforge-0.5.5/include/context_x11.h	2008-06-04 11:59:44.000000000 -0700
@@ -51,12 +51,10 @@
 extern Window	x_root;
 extern Window	x_win;
 extern XVisualInfo *x_visinfo;
-extern vec3_t	x_gamma;
 extern int		x_screen;
 extern int		x_shmeventtype;
 extern Time		x_time;
 extern Time		x_mouse_time;
-extern qboolean doShm;
 extern qboolean oktodraw;
 extern qboolean x_have_focus;
 
diff -ru quakeforge-0.5.5.orig/libs/console/server.c quakeforge-0.5.5/libs/console/server.c
--- quakeforge-0.5.5.orig/libs/console/server.c	2004-01-26 21:23:36.000000000 -0800
+++ quakeforge-0.5.5/libs/console/server.c	2008-06-04 12:04:13.000000000 -0700
@@ -70,7 +70,7 @@
 
 #include "compat.h"
 
-static console_data_t con_data;
+static console_data_t pcon_data;
 
 static QFile  *log_file;
 static cvar_t *sv_logfile;
@@ -225,7 +225,7 @@
 {
 	if (line[0] == '/')
 		line++;
-	Cbuf_AddText (con_data.cbuf, line);
+	Cbuf_AddText (pcon_data.cbuf, line);
 }
 
 static void
@@ -533,7 +533,7 @@
 	&plugin_info_general_data,
 	0,
 	0,
-	&con_data,
+	&pcon_data,
 };
 
 static plugin_t plugin_info = {
diff -ru quakeforge-0.5.5.orig/libs/gib/gib_classes.c quakeforge-0.5.5/libs/gib/gib_classes.c
--- quakeforge-0.5.5.orig/libs/gib/gib_classes.c	2003-11-28 18:01:31.000000000 -0800
+++ quakeforge-0.5.5/libs/gib/gib_classes.c	2008-06-04 11:59:51.000000000 -0700
@@ -192,7 +192,7 @@
 	unsigned int size;
 	unsigned int i = 0;
 	
-	static qboolean
+	qboolean
 	iterator (gib_class_t *class, void *unused)
 	{
 		reply[i++] = class->name;
@@ -610,13 +610,13 @@
 	gib_classdesc_t desc;
 	enum {CLASS, INSTANCE} mode = INSTANCE;
 	
-	static void
+	void
 	mtabfree (void *mtab, void *unused)
 	{
 		free (mtab);
 	}
 
-	static const char *
+	const char *
 	fname (const char *str)
 	{
 		if (mode == INSTANCE)
diff -ru quakeforge-0.5.5.orig/libs/gib/gib_function.c quakeforge-0.5.5/libs/gib/gib_function.c
--- quakeforge-0.5.5.orig/libs/gib/gib_function.c	2004-04-09 11:18:19.000000000 -0700
+++ quakeforge-0.5.5/libs/gib/gib_function.c	2008-06-04 11:59:48.000000000 -0700
@@ -169,7 +169,7 @@
 	gib_var_t  *var;
 	static char argss[] = "args";
 
-	static qboolean 
+	qboolean 
 	iterate (char *arg, llist_node_t *node)
 	{	
 		var = GIB_Var_Get_Complex (&GIB_DATA(cbuf)->locals, &zero,
@@ -207,7 +207,7 @@
 	gib_var_t  *var;
 	static char argss[] = "args";
 
-	static qboolean 
+	qboolean 
 	iterate (char *arg, llist_node_t *node)
 	{	
 		var = GIB_Var_Get_Complex (&GIB_DATA(cbuf)->locals, &zero,
diff -ru quakeforge-0.5.5.orig/libs/gib/gib_thread.c quakeforge-0.5.5/libs/gib/gib_thread.c
--- quakeforge-0.5.5.orig/libs/gib/gib_thread.c	2003-09-10 23:03:10.000000000 -0700
+++ quakeforge-0.5.5/libs/gib/gib_thread.c	2008-06-04 11:59:46.000000000 -0700
@@ -89,7 +89,7 @@
 void
 GIB_Thread_Execute (void)
 {
-	static qboolean iterator (cbuf_t *cbuf, llist_node_t *node)
+	qboolean iterator (cbuf_t *cbuf, llist_node_t *node)
 	{
 		if (GIB_DATA(cbuf)->program)
 			Cbuf_Execute_Stack (cbuf);
diff -ru quakeforge-0.5.5.orig/qw/source/cl_chat.c quakeforge-0.5.5/qw/source/cl_chat.c
--- quakeforge-0.5.5.orig/qw/source/cl_chat.c	2003-07-17 23:27:26.000000000 -0700
+++ quakeforge-0.5.5/qw/source/cl_chat.c	2008-06-04 11:59:40.000000000 -0700
@@ -66,7 +66,7 @@
 static void
 CL_Ignore_Sanity_Check (void)
 {
-	static qboolean iterator (ignore_t *ig, llist_node_t *node)
+	qboolean iterator (ignore_t *ig, llist_node_t *node)
 	{
 		if (cl.players[ig->slot].userid != ig->uid) // We got out of sync somehow
 			llist_remove (node);
@@ -80,12 +80,12 @@
 {
 	CL_Ignore_Sanity_Check ();
 	if (Cmd_Argc () == 1) {
-		static qboolean live_iterator (ignore_t *ig, llist_node_t *node)
+		qboolean live_iterator (ignore_t *ig, llist_node_t *node)
 		{
 			Sys_Printf ("%5i - %s\n", ig->uid, Info_ValueForKey (cl.players[ig->slot].userinfo, "name"));
 			return true;
 		}
-		static qboolean dead_iterator (ignore_t *ig, llist_node_t *node)
+		qboolean dead_iterator (ignore_t *ig, llist_node_t *node)
 		{
 			Sys_Printf ("%s\n", ig->lastname);
 			return true;
@@ -145,7 +145,7 @@
 	dstring_t *test = dstring_newstr ();
 	qboolean allowed = true;
 
-	static qboolean iterator (ignore_t *ig, llist_node_t *node)
+	qboolean iterator (ignore_t *ig, llist_node_t *node)
 	{
 		if (cl.players[ig->slot].userid != ig->uid) { // We got out of sync somehow
 			llist_remove (node);
@@ -183,7 +183,7 @@
 {
 	ignore_t *found = 0;
 
-	static qboolean iterator (ignore_t *ig, llist_node_t *node)
+	qboolean iterator (ignore_t *ig, llist_node_t *node)
 	{
 		if (!strcmp (ig->lastname, name)) {
 			found = ig;
diff -ru quakeforge-0.5.5.orig/tools/qfcc/include/method.h quakeforge-0.5.5/tools/qfcc/include/method.h
--- quakeforge-0.5.5.orig/tools/qfcc/include/method.h	2004-02-03 20:49:46.000000000 -0800
+++ quakeforge-0.5.5/tools/qfcc/include/method.h	2008-06-04 11:59:26.000000000 -0700
@@ -99,6 +99,4 @@
 
 struct expr_s *method_check_params (method_t *method, struct expr_s *args);
 
-extern struct hashtab_s *known_methods;
-
 #endif//__method_h
--- /home/phil/x/quakeforge-0.5.5.orig/nq/source/cl_main.c	2004-03-14 16:32:49.000000000 -0800
+++ quakeforge-0.5.5/nq/source/cl_main.c	2008-06-05 12:53:32.000000000 -0700
@@ -88,6 +88,13 @@
 cl_entity_state_t    cl_baselines[MAX_EDICTS];
 entity_t    cl_static_entities[MAX_STATIC_ENTITIES];
 
+void
+Bring_in_more_symbols__(void)
+{
+	char *p = (char*)&Key_Progs_Init; /* Bring cl_keys.o into main exe */
+	char *q = (char*)&R_Progs_Init; /* Bring r_progs.o into main exe */
+	*p=*q;
+}
 
 void
 CL_InitCvars (void)
--- quakeforge-0.5.5/qw/source/cl_main.c.orig	2008-06-05 17:35:53.000000000 -0700
+++ quakeforge-0.5.5/qw/source/cl_main.c	2008-06-05 17:35:22.000000000 -0700
@@ -231,6 +231,14 @@
 extern cvar_t *hud_scoreboard_uid;
 static netadr_t cl_cmd_packet_address;
 
+void
+Bring_in_more_symbols__(void)
+{
+       char *p = (char*)&Key_Progs_Init; /* Bring cl_keys.o into main exe */
+       char *q = (char*)&R_Progs_Init; /* Bring r_progs.o into main exe */
+       *p=*q;
+}
+
 static void
 CL_Quit_f (void)
 {