diff --git a/build_wip.sh b/build_wip.sh
index 5034e3cde..20aef245c 100755
--- a/build_wip.sh
+++ b/build_wip.sh
@@ -23,8 +23,8 @@ BUILD_WEB=y
 PLUGINS_LINUXx86="qi ezhud xmpp irc"
 PLUGINS_LINUXx64="qi ezhud xmpp irc"
 PLUGINS_LINUXx32="qi ezhud xmpp irc"
-PLUGINS_WIN32="avplug ode qi ezhud xmpp irc"
-PLUGINS_WIN64="avplug ode qi ezhud xmpp irc"
+PLUGINS_WIN32="ffmpeg ode qi ezhud xmpp irc"
+PLUGINS_WIN64="ffmpeg ode qi ezhud xmpp irc"
 THREADS="-j 4"
 
 TARGETS_LINUX="qcc-rel rel dbg vk-rel plugins-rel plugins-dbg"
diff --git a/engine/client/m_options.c b/engine/client/m_options.c
index 0e7f279c2..b0edfe878 100644
--- a/engine/client/m_options.c
+++ b/engine/client/m_options.c
@@ -1305,7 +1305,9 @@ void M_Menu_Preset_f (void)
 #endif
 		MB_CONSOLECMDRETURN("^7vanilla  (softwarey)",	"fps_preset vanilla\n",		"This is for purists! Party like its 1995! No sanity spared!", presetoption[3]),
 			MB_CHECKBOXCVAR("anim snapping", r_nolerp, 1),
+#if defined(GLQUAKE)
 			MB_CHECKBOXCVAR("model swimming", gl_affinemodels, 0),
+#endif
 		MB_CONSOLECMDRETURN("^7normal    (faithful)",	"fps_preset normal\n",		"An updated but still faithful appearance, using content replacements where applicable", presetoption[4]),
 		MB_CONSOLECMDRETURN("^7nice       (dynamic)",	"fps_preset nice\n",		"For people who like nice things, but still want to actually play", presetoption[5]),
 			MB_COMBOCVAR("gen deluxemaps", r_deluxemapping_cvar, deluxeopts, NULL, NULL),
diff --git a/engine/common/com_bih.c b/engine/common/com_bih.c
index 37907af7f..cee913a73 100644
--- a/engine/common/com_bih.c
+++ b/engine/common/com_bih.c
@@ -549,7 +549,7 @@ static void BIH_TestToTriangle(struct bihtrace_s *fte_restrict tr, const struct
 	tr->trace.contents |= info->contents;
 }
 
-#ifdef Q2BSPS
+#if defined(Q2BSPS) || defined(Q3BSPS)
 static void BIH_ClipBoxToBrush (struct bihtrace_s *fte_restrict tr, const q2cbrush_t *brush)
 {
 	int			i, j;
@@ -838,7 +838,7 @@ static void BIH_RecursiveTrace (struct bihtrace_s *fte_restrict tr, const struct
 	//if the tree were 1d, we wouldn't need to be so careful with the bounds, but if the trace is long then we want to avoid hitting all surfaces within that entire-map-encompassing move aabb
 	switch(node->type)
 	{	//leaf
-#ifdef Q2BSPS
+#if defined(Q2BSPS) || defined(Q3BSPS)
 	case BIH_BRUSH:
 		if (node->data.contents & tr->hitcontents)
 		{
@@ -1108,7 +1108,7 @@ static void BIH_RecursiveTest (struct bihtrace_s *fte_restrict tr, const struct
 	//with BIH, its possible for a large child node to have a box larger than its sibling.
 	switch(node->type)
 	{
-#ifdef Q2BSPS
+#if defined(Q2BSPS) || defined(Q3BSPS)
 	case BIH_BRUSH:
 		if (node->data.contents & tr->hitcontents)
 		{
@@ -1384,7 +1384,7 @@ unsigned int BIH_TestContents (const struct bihnode_s *fte_restrict node, const
 restart:
 	switch(node->type)
 	{	//leaf
-#ifdef Q2BSPS
+#if defined(Q2BSPS) || defined(Q3BSPS)
 	case BIH_BRUSH:
 		{
 			q2cbrush_t *b = node->data.brush;
diff --git a/engine/common/com_bih.h b/engine/common/com_bih.h
index cae1edcfc..caa577663 100644
--- a/engine/common/com_bih.h
+++ b/engine/common/com_bih.h
@@ -63,7 +63,7 @@ enum bihtype_e
 
 
 	//leaf types
-#ifdef Q2BSPS
+#if defined(Q2BSPS) || defined(Q3BSPS)
 	BIH_BRUSH,
 #endif
 #ifdef Q3BSPS
@@ -76,7 +76,7 @@ struct bihdata_s
 {
 	unsigned int contents;
 	union {
-#ifdef Q2BSPS
+#if defined(Q2BSPS) || defined(Q3BSPS)
 		q2cbrush_t *brush;
 #endif
 #ifdef Q3BSPS