diff --git a/config.d/build_control.m4 b/config.d/build_control.m4
index b10681e05..4ef42e5b0 100644
--- a/config.d/build_control.m4
+++ b/config.d/build_control.m4
@@ -548,7 +548,7 @@ QF_DEPS(BSP2IMG,
 )
 QF_DEPS(QFBSP,
 	[-I$(top_srcdir)/tools/qfbsp/include],
-	[$(top_builddir)/libs/util/libQFutil.la $(top_builddir)/libs/models/libQFmodels.la],
+	[$(top_builddir)/libs/models/libQFmodels.la $(top_builddir)/libs/image/libQFimage.la $(top_builddir)/libs/util/libQFutil.la],
 	[$(WIN32_LIBS)],
 )
 QF_DEPS(QFCC,
diff --git a/libs/audio/Makefile.am b/libs/audio/Makefile.am
index 95c3ad7ac..6b9874624 100644
--- a/libs/audio/Makefile.am
+++ b/libs/audio/Makefile.am
@@ -43,12 +43,22 @@ cd_xmms_la_LIBADD=	$(XMMS_LIBS) $(top_builddir)/libs/util/libQFutil.la
 cd_xmms_la_CFLAGS=	$(XMMS_CFLAGS)
 cd_xmms_la_SOURCES=	cd_xmms.c
 
+sound_libs= \
+	@SND_PLUGIN_STATIC_LIBS@ \
+	@SND_REND_STATIC_LIBS@ \
+	$(top_builddir)/libs/gamecode/engine/libQFgamecode.la \
+	$(top_builddir)/libs/util/libQFutil.la
+
+cd_libs= \
+	@CD_PLUGIN_STATIC_LIBS@ \
+	$(top_builddir)/libs/util/libQFutil.la
+
 libQFsound_la_LDFLAGS=	-version-info $(QUAKE_LIBRARY_VERSION_INFO) -rpath $(libdir)
-libQFsound_la_LIBADD=	@SND_PLUGIN_STATIC_LIBS@ @SND_REND_STATIC_LIBS@ $(top_builddir)/libs/util/libQFutil.la $(top_builddir)/libs/gamecode/engine/libQFgamecode.la
+libQFsound_la_LIBADD=	$(sound_libs)
 libQFsound_la_SOURCES=	snd.c snd_progs.c
-libQFsound_la_DEPENDENCIES=	@SND_PLUGIN_STATIC_LIBS@ @SND_REND_STATIC_LIBS@
+libQFsound_la_DEPENDENCIES=	$(sound_libs)
 
 libQFcd_la_LDFLAGS=	-version-info $(QUAKE_LIBRARY_VERSION_INFO) -rpath $(libdir)
-libQFcd_la_LIBADD=		@CD_PLUGIN_STATIC_LIBS@ $(top_builddir)/libs/util/libQFutil.la
+libQFcd_la_LIBADD=		$(cd_libs)
 libQFcd_la_SOURCES=		cd.c
-libQFcd_la_DEPENDENCIES= @CD_PLUGIN_STATIC_LIBS@
+libQFcd_la_DEPENDENCIES= $(cd_libs)
diff --git a/libs/audio/test/Makefile.am b/libs/audio/test/Makefile.am
index 532aef98f..e68edc679 100644
--- a/libs/audio/test/Makefile.am
+++ b/libs/audio/test/Makefile.am
@@ -7,5 +7,5 @@ noinst_PROGRAMS= @AUDIO_TARGETS@
 EXTRA_PROGRAMS= testsound
 
 testsound_SOURCES= testsound.c
-testsound_LDADD= $(top_builddir)/libs/audio/libQFsound.la $(top_builddir)/libs/util/libQFutil.la
+testsound_LDADD= $(top_builddir)/libs/audio/libQFsound.la $(top_builddir)/libs/gamecode/engine/libQFgamecode.la $(top_builddir)/libs/util/libQFutil.la
 testsound_DEPENDENCIES= $(top_builddir)/libs/audio/libQFsound.la $(top_builddir)/libs/util/libQFutil.la
diff --git a/libs/models/Makefile.am b/libs/models/Makefile.am
index 835da5d8f..e4b63277c 100644
--- a/libs/models/Makefile.am
+++ b/libs/models/Makefile.am
@@ -9,7 +9,9 @@ EXTRA_LTLIBRARIES=	libQFmodels_gl.la libQFmodels_glsl.la libQFmodels_sw.la
 
 models_sources = clip_hull.c model.c portal.c skin.c trace.c winding.c
 
-models_libs = $(top_builddir)/libs/image/libQFimage.la $(top_builddir)/libs/util/libQFutil.la
+models_libs = \
+	$(top_builddir)/libs/image/libQFimage.la \
+	$(top_builddir)/libs/util/libQFutil.la
 
 libQFmodels_la_LDFLAGS= 	-version-info $(QUAKE_LIBRARY_VERSION_INFO) -no-undefined
 libQFmodels_la_LIBADD=		brush/libbrush.la $(models_libs)
@@ -17,21 +19,27 @@ libQFmodels_la_SOURCES= 	$(models_sources) null_model.c
 libQFmodels_la_DEPENDENCIES=	brush/libbrush.la $(models_libs)
 
 gl_LIBS= \
-	alias/libalias_gl.la brush/libbrush_gl.la sprite/libsprite_gl.la
+	alias/libalias_gl.la \
+	brush/libbrush_gl.la \
+	sprite/libsprite_gl.la
 libQFmodels_gl_la_LDFLAGS=	-version-info $(QUAKE_LIBRARY_VERSION_INFO) -rpath $(libdir)
 libQFmodels_gl_la_LIBADD=	$(gl_LIBS) $(models_libs)
 libQFmodels_gl_la_SOURCES=	$(models_sources) gl_model_fullbright.c gl_skin.c
 libQFmodels_gl_la_DEPENDENCIES= $(gl_LIBS) $(models_libs)
 
 glsl_LIBS= \
-	alias/libalias_glsl.la brush/libbrush_glsl.la sprite/libsprite_glsl.la
+	alias/libalias_glsl.la \
+	brush/libbrush_glsl.la \
+	sprite/libsprite_glsl.la
 libQFmodels_glsl_la_LDFLAGS=	-version-info $(QUAKE_LIBRARY_VERSION_INFO) -rpath $(libdir)
 libQFmodels_glsl_la_LIBADD=	$(glsl_LIBS) $(models_libs)
 libQFmodels_glsl_la_SOURCES=	$(models_sources) glsl_skin.c
 libQFmodels_glsl_la_DEPENDENCIES= $(glsl_LIBS) $(models_libs)
 
 sw_LIBS= \
-	alias/libalias_sw.la brush/libbrush_sw.la sprite/libsprite_sw.la
+	alias/libalias_sw.la \
+	brush/libbrush_sw.la \
+	sprite/libsprite_sw.la
 libQFmodels_sw_la_LDFLAGS=	-version-info $(QUAKE_LIBRARY_VERSION_INFO) -rpath $(libdir) -no-undefined
 libQFmodels_sw_la_LIBADD=	$(sw_LIBS) $(models_libs)
 libQFmodels_sw_la_SOURCES=	$(models_sources) sw_skin.c
diff --git a/qw/source/Makefile.am b/qw/source/Makefile.am
index d7e6105ed..2ff9a8cf4 100644
--- a/qw/source/Makefile.am
+++ b/qw/source/Makefile.am
@@ -73,6 +73,7 @@ qw_server_LIBS= \
 		$(top_builddir)/libs/net/libnet_chan.la \
 		$(top_builddir)/libs/ruamoko/libQFruamoko.la \
 		$(top_builddir)/libs/models/libQFmodels.la \
+		$(top_builddir)/libs/image/libQFimage.la \
 		$(top_builddir)/libs/gamecode/engine/libQFgamecode.la \
 		$(top_builddir)/libs/console/libQFconsole.la \
 		$(top_builddir)/libs/gib/libQFgib.la \