diff --git a/Makefile.am b/Makefile.am
index 49ab604..157a61b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -101,10 +101,10 @@ tests_test_jid_CFLAGS = $(STROPHE_FLAGS) -I$(top_srcdir)/src
 tests_test_jid_LDADD = $(STROPHE_LIBS)
 tests_test_jid_LDFLAGS = -static
 
-tests_test_resolver_SOURCES = tests/test_resolver.c tests/test.h
+tests_test_resolver_SOURCES = tests/test_resolver.c tests/test.h \
+	src/resolver.c src/snprintf.c
 tests_test_resolver_CFLAGS = $(STROPHE_FLAGS) -I$(top_srcdir)/src
-tests_test_resolver_LDADD = $(STROPHE_LIBS)
-tests_test_resolver_LDFLAGS = -static
+tests_test_resolver_LDADD = $(RESOLV_LIBS)
 
 tests_test_rand_SOURCES = tests/test_rand.c tests/test.c src/sha1.c
 tests_test_rand_CFLAGS = $(STROPHE_FLAGS) -I$(top_srcdir)/src
diff --git a/src/resolver.c b/src/resolver.c
index 2e9d3c3..ac9cbd2 100644
--- a/src/resolver.c
+++ b/src/resolver.c
@@ -21,9 +21,9 @@
 
 #include <string.h>             /* strncpy */
 
-#include "common.h"
-#include "resolver.h"
 #include "ostypes.h"
+#include "snprintf.h"
+#include "resolver.h"
 
 #define MESSAGE_HEADER_LEN 12
 #define MESSAGE_RESPONSE 1
diff --git a/tests/test_resolver.c b/tests/test_resolver.c
index 2062087..91cb5b7 100644
--- a/tests/test_resolver.c
+++ b/tests/test_resolver.c
@@ -9,7 +9,10 @@
  *  This program is dual licensed under the MIT and GPLv3 licenses.
  */
 
-/* gcc -o test_resolver -I. -I./src tests/test_resolver.c -static -lstrophe */
+/*
+ * gcc -o test_resolver -I./src tests/test_resolver.c src/resolver.c \
+ * src/snprintf.c
+ */
 
 #include <assert.h>
 #include <stdio.h>