diff --git a/c/Makefile b/c/Makefile
index c3c37bc..ba350d2 100644
--- a/c/Makefile
+++ b/c/Makefile
@@ -1,23 +1,24 @@
-LIBS=`pkg-config --libs xmms2-client`
-GLIB=`pkg-config --libs xmms2-client-glib` `pkg-config --libs glib-2.0`
+CFLAGS_XMMS2=`pkg-config --cflags xmms2-client`
+CFLAGS_GLIB=`pkg-config --cflags glib-2.0`
+LIBS_XMMS2=`pkg-config --libs xmms2-client`
+LIBS_GLIB=`pkg-config --libs xmms2-client-glib` `pkg-config --libs glib-2.0`
 
-all: tut1 tut2 tut3 tut4 tut5 tut6 tut7 tut8
+all: xmms2 xmms2glib
+
+xmms2: CFLAGS=$(CFLAGS_XMMS2)
+xmms2: LIBS=$(LIBS_XMMS2)
+xmms2: tut1 tut2 tut3 tut4 tut5
+
+xmms2glib: CFLAGS=$(CFLAGS_XMMS2) $(CFLAGS_GLIB)
+xmms2glib: LIBS=$(LIBS_XMMS2) $(LIBS_GLIB)
+xmms2glib: tut6 tut7 tut8
 
 %.o: %.c
-	gcc `pkg-config --cflags xmms2-client glib-2.0` -Wall -c -o $@ $< 
+	gcc $(CFLAGS) -Wall -c -o $@ $< 
 
 tut%: tut%.o
 	gcc -o $@ $< $(LIBS)
 
-tut6: tut6.o
-	gcc -o $@ $< $(LIBS) $(GLIB)
-
-tut7: tut7.o
-	gcc -o $@ $< $(LIBS) $(GLIB)
-
-tut8: tut8.o
-	gcc -o $@ $< $(LIBS) $(GLIB)
-
 clean:
 	rm -f tut? *.o
 
diff --git a/c/tut1.c b/c/tut1.c
index 8987890..f878aba 100644
--- a/c/tut1.c
+++ b/c/tut1.c
@@ -15,6 +15,7 @@
  */
 
 #include <stdlib.h>
+#include <stdio.h>
 
 /* include xmmsclient header */
 #include <xmmsclient/xmmsclient.h>
diff --git a/c/tut2.c b/c/tut2.c
index 781ffb3..20b2448 100644
--- a/c/tut2.c
+++ b/c/tut2.c
@@ -16,6 +16,7 @@
  */
 
 #include <stdlib.h>
+#include <stdio.h>
 
 /* include xmmsclient header */
 #include <xmmsclient/xmmsclient.h>
diff --git a/c/tut3.c b/c/tut3.c
index baa3ee0..093e1e9 100644
--- a/c/tut3.c
+++ b/c/tut3.c
@@ -17,6 +17,7 @@
  */
 
 #include <stdlib.h>
+#include <stdio.h>
 
 /* include xmmsclient header */
 #include <xmmsclient/xmmsclient.h>
diff --git a/c/tut4.c b/c/tut4.c
index fe617f3..1a28353 100644
--- a/c/tut4.c
+++ b/c/tut4.c
@@ -16,6 +16,7 @@
  */
 
 #include <stdlib.h>
+#include <stdio.h>
 
 /* include xmmsclient header */
 #include <xmmsclient/xmmsclient.h>
diff --git a/c/tut5.c b/c/tut5.c
index af80b8f..412f5cd 100644
--- a/c/tut5.c
+++ b/c/tut5.c
@@ -16,6 +16,7 @@
  */
 
 #include <stdlib.h>
+#include <stdio.h>
 
 /* include xmmsclient header */
 #include <xmmsclient/xmmsclient.h>
@@ -131,7 +132,7 @@ main (int argc, char **argv)
 	 * Values that we need later
 	 */
 
-	connection = xmmsc_init ("tutorial1");
+	connection = xmmsc_init ("tutorial5");
 	if (!connection) {
 		fprintf (stderr, "OOM!\n");
 		exit (EXIT_FAILURE);
diff --git a/c/tut6.c b/c/tut6.c
index af97edb..dcab64b 100644
--- a/c/tut6.c
+++ b/c/tut6.c
@@ -16,6 +16,7 @@
  */
 
 #include <stdlib.h>
+#include <stdio.h>
 
 /* include xmmsclient header */
 #include <xmmsclient/xmmsclient.h>
@@ -89,7 +90,7 @@ main (int argc, char **argv)
 	 * normal. Read up on this in earlier
 	 * tutorials if you need.
 	 */
-	connection = xmmsc_init ("tutorial6");
+	connection = xmmsc_init ("tutorial7");
 	if (!connection) {
 		fprintf (stderr, "OOM!\n");
 		exit (EXIT_FAILURE);
diff --git a/c/tut7.c b/c/tut7.c
index 810088c..bc952bf 100644
--- a/c/tut7.c
+++ b/c/tut7.c
@@ -16,6 +16,7 @@
  */
 
 #include <stdlib.h>
+#include <stdio.h>
 
 /* include xmmsclient header */
 #include <xmmsclient/xmmsclient.h>
@@ -113,7 +114,7 @@ main (int argc, char **argv)
 	 * normal. Read up on this in earlier
 	 * tutorials if you need.
 	 */
-	connection = xmmsc_init ("tutorial6");
+	connection = xmmsc_init ("tutorial8");
 	if (!connection) {
 		fprintf (stderr, "OOM!\n");
 		exit (EXIT_FAILURE);
diff --git a/c/tut8.c b/c/tut8.c
index 5b0c975..a7eeedf 100644
--- a/c/tut8.c
+++ b/c/tut8.c
@@ -16,6 +16,7 @@
  */
 
 #include <stdlib.h>
+#include <stdio.h>
 
 /* include xmmsclient header */
 #include <xmmsclient/xmmsclient.h>