diff --git a/Makefile b/Makefile
index 237eb1b..54e2e18 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
-all: tests/tests
-
-tests/tests: tests/test.m src/XMPPConnection.m src/XMPPStanza.m src/XMPPJID.m
-	objfw-compile -o $@ $^ -lidn -Wall -Werror -Isrc
+all:
+	cd src && ${MAKE} ${MFLAGS}
+	cd tests && ${MAKE} ${MFLAGS}
 
 clean:
-	rm -f src/*.o tests/*.o tests/tests
+	cd src && ${MAKE} ${MFLAGS} clean
+	cd tests && ${MAKE} ${MFLAGS} clean
diff --git a/src/Makefile b/src/Makefile
new file mode 100644
index 0000000..280cf05
--- /dev/null
+++ b/src/Makefile
@@ -0,0 +1,6 @@
+all:
+	objfw-compile --lib 0.0 -o objxmpp *.m \
+		`pkg-config --cflags --libs libidn`
+
+clean:
+	rm -f *.o *.so *.dylib *.dll
diff --git a/src/XMPPConnection.h b/src/XMPPConnection.h
index b6649eb..3d8d738 100644
--- a/src/XMPPConnection.h
+++ b/src/XMPPConnection.h
@@ -1,5 +1,6 @@
 #import <ObjFW/ObjFW.h>
-#import <XMPPJID.h>
+
+#import "XMPPJID.h"
 
 @class XMPPConnection;
 @class XMPPIQ;
diff --git a/tests/Makefile b/tests/Makefile
new file mode 100644
index 0000000..bb5f371
--- /dev/null
+++ b/tests/Makefile
@@ -0,0 +1,5 @@
+all:
+	objfw-compile -o tests *.m -I../src -L../src -lobjxmpp
+
+clean:
+	rm -f tests *.o
diff --git a/tests/test.m b/tests/test.m
index 98a665c..87dbdc7 100644
--- a/tests/test.m
+++ b/tests/test.m
@@ -1,5 +1,7 @@
 #include <assert.h>
+
 #import <ObjFW/ObjFW.h>
+
 #import "XMPPConnection.h"
 #import "XMPPStanza.h"