diff --git a/include/winquake.h b/include/winquake.h
index 2ede0ac49..40b5a5851 100644
--- a/include/winquake.h
+++ b/include/winquake.h
@@ -132,24 +132,19 @@ void DSOUND_Restore(void);
 
 void VID_SetDefaultMode (void);
 
-int (PASCAL FAR *pWSAStartup)(WORD wVersionRequired, LPWSADATA lpWSAData);
-int (PASCAL FAR *pWSACleanup)(void);
-int (PASCAL FAR *pWSAGetLastError)(void);
-SOCKET (PASCAL FAR *psocket)(int af, int type, int protocol);
-int (PASCAL FAR *pioctlsocket)(SOCKET s, long cmd, u_long FAR *argp);
-int (PASCAL FAR *psetsockopt)(SOCKET s, int level, int optname,
-							  const char FAR * optval, int optlen);
-int (PASCAL FAR *precvfrom)(SOCKET s, char FAR * buf, int len, int flags,
-							struct sockaddr FAR *from, int FAR * fromlen);
-int (PASCAL FAR *psendto)(SOCKET s, const char FAR * buf, int len, int flags,
-						  const struct sockaddr FAR *to, int tolen);
-int (PASCAL FAR *pclosesocket)(SOCKET s);
-int (PASCAL FAR *pgethostname)(char FAR * name, int namelen);
-struct hostent FAR * (PASCAL FAR *pgethostbyname)(const char FAR * name);
-struct hostent FAR * (PASCAL FAR *pgethostbyaddr)(const char FAR * addr,
-												  int len, int type);
-int (PASCAL FAR *pgetsockname)(SOCKET s, struct sockaddr FAR *name,
-							   int FAR * namelen);
+extern int (PASCAL FAR *pWSAStartup)(WORD wVersionRequired, LPWSADATA lpWSAData);
+extern int (PASCAL FAR *pWSACleanup)(void);
+extern int (PASCAL FAR *pWSAGetLastError)(void);
+extern SOCKET (PASCAL FAR *psocket)(int af, int type, int protocol);
+extern int (PASCAL FAR *pioctlsocket)(SOCKET s, long cmd, u_long FAR *argp);
+extern int (PASCAL FAR *psetsockopt)(SOCKET s, int level, int optname, const char FAR * optval, int optlen);
+extern int (PASCAL FAR *precvfrom)(SOCKET s, char FAR * buf, int len, int flags, struct sockaddr FAR *from, int FAR * fromlen);
+extern int (PASCAL FAR *psendto)(SOCKET s, const char FAR * buf, int len, int flags, const struct sockaddr FAR *to, int tolen);
+extern int (PASCAL FAR *pclosesocket)(SOCKET s);
+extern int (PASCAL FAR *pgethostname)(char FAR * name, int namelen);
+extern struct hostent FAR * (PASCAL FAR *pgethostbyname)(const char FAR * name);
+extern struct hostent FAR * (PASCAL FAR *pgethostbyaddr)(const char FAR * addr, int len, int type);
+extern int (PASCAL FAR *pgetsockname)(SOCKET s, struct sockaddr FAR *name, int FAR * namelen);
 #endif /* _WIN32 */
 
 #endif /* _WINQUAKE_H */
diff --git a/libs/video/targets/joy_win.c b/libs/video/targets/joy_win.c
index eda2bad47..e1e342022 100644
--- a/libs/video/targets/joy_win.c
+++ b/libs/video/targets/joy_win.c
@@ -50,8 +50,6 @@ static const char rcsid[] =
 #include "compat.h"
 
 // Joystick variables and structures
-cvar_t     *joy_device;					// Joystick device name
-cvar_t     *joy_enable;					// Joystick enabling flag
 cvar_t     *joy_sensitivity;			// Joystick sensitivity
 
 // joystick defines and variables
diff --git a/libs/video/targets/vid_mgl.c b/libs/video/targets/vid_mgl.c
index 9f563d3a3..7c0b06e36 100644
--- a/libs/video/targets/vid_mgl.c
+++ b/libs/video/targets/vid_mgl.c
@@ -110,12 +110,13 @@ cvar_t     *vid_nopageflip;
 cvar_t     *vid_config_x;
 cvar_t     *vid_config_y;
 cvar_t     *vid_stretch_by_2;
-cvar_t     *in_grab;
 cvar_t     *vid_windowed_mode;
 cvar_t     *block_switch;
 cvar_t     *vid_window_x;
 cvar_t     *vid_window_y;
 
+extern cvar_t *in_grab;
+
 typedef struct {
 	int         width;
 	int         height;
diff --git a/libs/video/targets/vid_wgl.c b/libs/video/targets/vid_wgl.c
index 8beae4e60..de032907e 100644
--- a/libs/video/targets/vid_wgl.c
+++ b/libs/video/targets/vid_wgl.c
@@ -146,7 +146,7 @@ LONG	CDAudio_MessageHandler (HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 
 extern viddef_t vid;					// global video state
 
-float       gldepthmin, gldepthmax;
+extern float gldepthmin, gldepthmax;
 
 modestate_t modestate = MS_UNINIT;
 
@@ -159,8 +159,7 @@ void        GL_Init (void);
 
 //====================================
 
-cvar_t     *in_grab;
-cvar_t     *vid_use8bit;
+extern cvar_t *in_grab;
 
 int         window_center_x, window_center_y, window_x, window_y, window_width,
 			window_height;