diff --git a/c/Makefile.am b/c/Makefile.am
index 54f9bfada..16e6457c3 100644
--- a/c/Makefile.am
+++ b/c/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS=		lib cli stream input mapping output containers dsls experimental tools . unit_test reg_test
+SUBDIRS=		lib cli stream input mapping containers output dsls experimental tools . unit_test reg_test
 
 AM_CPPFLAGS=		-I${srcdir}
 AM_CFLAGS=		-Wall -std=gnu99
diff --git a/c/output/Makefile.am b/c/output/Makefile.am
index 982b79bd5..d25ea29f2 100644
--- a/c/output/Makefile.am
+++ b/c/output/Makefile.am
@@ -16,6 +16,8 @@ liboutput_la_SOURCES=	\
 			multi_lrec_writer.h \
 			multi_out.c \
 			multi_out.h
-liboutput_la_LIBADD=	../lib/libmlr.la
+liboutput_la_LIBADD=	\
+                        ../lib/libmlr.la \
+                        ../containers/libcontainers.la
 liboutput_la_CPPFLAGS=	-I${srcdir}/../
 liboutput_la_CFLAGS=	-std=gnu99
diff --git a/c/unit_test/Makefile.am b/c/unit_test/Makefile.am
index e7341434c..011e3d592 100644
--- a/c/unit_test/Makefile.am
+++ b/c/unit_test/Makefile.am
@@ -18,14 +18,14 @@ AM_CPPFLAGS=		-I${srcdir}/..
 AM_CFLAGS=		-Wall -std=gnu99
 
 all_ldadd=		\
-			../cli/libcli.la \
+			../lib/libmlr.la \
 			../containers/libcontainers.la \
-			../stream/libstream.la \
+			../dsls/libdsl.la \
+			../cli/libcli.la \
 			../input/libinput.la \
 			../mapping/libmapping.la \
 			../output/liboutput.la \
-			../lib/libmlr.la \
-			../dsls/libdsl.la \
+			../stream/libstream.la \
 			-lm
 
 # Unit-test mains