diff --git a/include/quakefs.h b/include/quakefs.h
index 157f3fa..9a1f763 100644
--- a/include/quakefs.h
+++ b/include/quakefs.h
@@ -33,11 +33,15 @@
 
 #include "qtypes.h"
 #include "quakeio.h"
+#include "cvar.h"
 
 //============================================================================
 
 #define	MAX_OSPATH	128		// max length of a filesystem pathname
 
+extern cvar_t *fs_userpath;
+extern cvar_t *fs_sharepath;
+
 extern int com_filesize;
 struct cache_user_s;
 
diff --git a/source/cl_main.c b/source/cl_main.c
index e8bdfd5..131c153 100644
--- a/source/cl_main.c
+++ b/source/cl_main.c
@@ -67,8 +67,7 @@
 #endif
 #include <cl_slist.h>
 
-extern cvar_t *fs_userpath;
-extern cvar_t *fs_sharepath;
+
 // we need to declare some mouse variables here, because the menu system
 // references them even when on a unix system.
 
diff --git a/source/cl_slist.c b/source/cl_slist.c
index 591f31e..3260caa 100644
--- a/source/cl_slist.c
+++ b/source/cl_slist.c
@@ -38,9 +38,9 @@
 #include "console.h"
 #include "commdef.h"
 #include "zone.h"
+#include "quakefs.h"
 #include <string.h>
 
-extern cvar_t *fs_userpath;
 server_entry_t	*slist;
   
 server_entry_t *Server_List_Add (server_entry_t *start, char *ip, char *desc) {