diff --git a/build_wip.sh b/build_wip.sh
index 4bd3191d..fd183f45 100755
--- a/build_wip.sh
+++ b/build_wip.sh
@@ -26,7 +26,7 @@ PLUGINS_WINDOWS="avplug ode qi ezhud xmpp irc"
 THREADS="-j 4"
 
 TARGETS_LINUX="qcc-rel rel dbg vk-rel plugins-rel plugins-dbg"
-TARGETS_WINDOWS="sv-rel gl-rel vk-rel mingl-rel m-rel d3d-rel qcc-rel qccgui-scintilla qccgui-dbg gl-dbg sv-dbg plugins-dbg plugins-rel"
+TARGETS_WINDOWS="sv-rel m-rel qcc-rel qccgui-scintilla qccgui-dbg m-dbg sv-dbg plugins-dbg plugins-rel"
 TARGETS_WEB="gl-rel"
 
 ########### NaCL stuff
diff --git a/engine/client/cl_screen.c b/engine/client/cl_screen.c
index 24583897..d267108a 100644
--- a/engine/client/cl_screen.c
+++ b/engine/client/cl_screen.c
@@ -2503,8 +2503,10 @@ void *SCR_ScreenShot_Capture(int fbwidth, int fbheight, int *stride, enum upload
 
 	if (fbwidth == vid.fbpwidth && fbheight == vid.fbpheight && qrenderer != QR_VULKAN)
 		usefbo = false;
+#ifdef GLQUAKE
 	else if (qrenderer == QR_OPENGL && gl_config.ext_framebuffer_objects)
 		usefbo = true;
+#endif
 	else
 		return NULL;
 
diff --git a/engine/client/image.c b/engine/client/image.c
index 4a323943..9388c840 100644
--- a/engine/client/image.c
+++ b/engine/client/image.c
@@ -134,17 +134,17 @@ char *r_defaultimageextensions =
 	#endif
 #endif
 
-#ifdef IMAGEFMT_GIF
+#if defined(IMAGEFMT_GIF) && !defined(FTE_TARGET_WEB)
 	#pragma message("IMAGEFMT_GIF requires AVAIL_STBI")
 	#undef IMAGEFMT_GIF
 #endif
-#if defined(IMAGEFMT_PNG) && !defined(AVAIL_PNGLIB)
+#if defined(IMAGEFMT_PNG) && !defined(AVAIL_PNGLIB) && !defined(FTE_TARGET_WEB)
 	#pragma message("IMAGEFMT_PNG requires AVAIL_PNGLIB or AVAIL_STBI")
 	#undef IMAGEFMT_PNG
 #elif defined(AVAIL_PNGLIB)
 	#undef AVAIL_PNGLIB
 #endif
-#if defined(IMAGEFMT_JPG) && !defined(AVAIL_JPEGLIB)
+#if defined(IMAGEFMT_JPG) && !defined(AVAIL_JPEGLIB) && !defined(FTE_TARGET_WEB)
 	#pragma message("IMAGEFMT_JPG requires AVAIL_JPEGLIB or AVAIL_STBI")
 	#undef IMAGEFMT_JPG
 #elif defined(AVAIL_JPEGLIB)
diff --git a/engine/client/pr_menu.c b/engine/client/pr_menu.c
index d6cc602f..38a2e971 100644
--- a/engine/client/pr_menu.c
+++ b/engine/client/pr_menu.c
@@ -1470,7 +1470,10 @@ void QCBUILTIN PF_clientstate (pubprogfuncs_t *prinst, struct globalvars_s *pr_g
 		G_FLOAT(OFS_RETURN) = 0/*nq ca_dedicated*/;
 	else if (	cls.state >= ca_connected	//we're on a server
 			||	CL_TryingToConnect()		//or we're trying to connect (avoids bugs with certain menuqc mods)
-			||	sv_state>=ss_loading	)	//or we're going to connect to ourselves once we get our act together
+#ifndef CLIENTONLY
+			||	sv.state>=ss_loading
+#endif
+				)	//or we're going to connect to ourselves once we get our act together
 		G_FLOAT(OFS_RETURN) = 2/*nq ca_connected*/;
 	else
 		G_FLOAT(OFS_RETURN) = 1/*nq ca_disconnected*/;
diff --git a/engine/common/common.c b/engine/common/common.c
index bab88f98..fd80c356 100644
--- a/engine/common/common.c
+++ b/engine/common/common.c
@@ -44,46 +44,23 @@ fte_inlinebody float M_LinearToSRGB(float x, float mag);
 // These 4 libraries required for the version command
 
 #if defined(MINGW)
-	#if defined(AVAIL_PNGLIB)  && !defined(SERVERONLY)
-		#include "./mingw-libs/png.h"
-	#endif
 	#ifdef AVAIL_ZLIB
 		#include "./mingw-libs/zlib.h"
 	#endif
-	#if defined(AVAIL_JPEGLIB) && !defined(SERVERONLY)
-		#define JPEG_API VARGS
-		//#include "./mingw-libs/jversion.h"
-		#include "./mingw-libs/jpeglib.h"
-	#endif
 	#ifdef FTE_SDL
 		#include <SDL.h>
 	#endif
 #elif defined(_WIN32)
-	#if defined(AVAIL_PNGLIB)  && !defined(SERVERONLY)
-		#include "png.h"
-	#endif
 	#ifdef AVAIL_ZLIB
 		#include "zlib.h"
 	#endif
-	#if defined(AVAIL_JPEGLIB) && !defined(SERVERONLY)
-		#define JPEG_API VARGS
-		//#include "jversion.h"
-		#include "jpeglib.h"
-	#endif
 	#ifdef FTE_SDL
 		#include <SDL.h>
 	#endif
 #else
-	#if defined(AVAIL_PNGLIB) && !defined(SERVERONLY)
-		#include <png.h>
-	#endif
 	#ifdef AVAIL_ZLIB
 		#include <zlib.h>
 	#endif
-	#if defined(AVAIL_JPEGLIB) && !defined(SERVERONLY)
-		//#include <jversion.h>
-		#include <jpeglib.h>
-	#endif
 	#ifdef FTE_SDL
 		#include <SDL.h>
 	#endif
diff --git a/engine/qclib/initlib.c b/engine/qclib/initlib.c
index 70053b55..7c775e0b 100644
--- a/engine/qclib/initlib.c
+++ b/engine/qclib/initlib.c
@@ -1336,8 +1336,6 @@ static void PR_FreeAllTemps			(progfuncs_t *progfuncs)
 
 #elif defined(QCGC)
 
-#include "quakedef.h"
-
 pbool PR_RunGC			(progfuncs_t *progfuncs)
 {
 	unsigned int p;