diff --git a/include/winquake.h b/include/winquake.h
index fac1fc5..3c83f3e 100644
--- a/include/winquake.h
+++ b/include/winquake.h
@@ -23,21 +23,15 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #pragma warning( disable : 4229 )  // mgraph gets this
 
 #include <windows.h>
-#define WM_MOUSEWHEEL                   0x020A
-
-#ifndef SERVERONLY
 #include <ddraw.h>
 #include <dsound.h>
-#ifndef GLQUAKE
-#include <mgraph.h>
-#endif
-#endif
+#include <mgraph.h> // Was #ifdef GLQUAKE
+
+#define WM_MOUSEWHEEL                   0x020A
 
 extern	HINSTANCE	global_hInstance;
 extern	int			global_nCmdShow;
 
-#ifndef SERVERONLY
-
 extern LPDIRECTDRAW		lpDD;
 extern qboolean			DDActive;
 extern LPDIRECTDRAWSURFACE	lpPrimary;
@@ -48,13 +42,9 @@ extern LPDIRECTSOUND pDS;
 extern LPDIRECTSOUNDBUFFER pDSBuf;
 
 extern DWORD gSndBufSize;
-//#define SNDBUFSIZE 65536
-
 void	VID_LockBuffer (void);
 void	VID_UnlockBuffer (void);
 
-#endif
-
 typedef enum {MS_WINDOWED, MS_FULLSCREEN, MS_FULLDIB, MS_UNINIT} modestate_t;
 
 extern modestate_t	modestate;