diff --git a/Makefile.am b/Makefile.am
index 6a98e981..b8424856 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -98,7 +98,7 @@ unittest_sources = \
 	src/event/client_events.c src/event/client_events.h \
 	src/ui/tray.h src/ui/tray.c \
 	tests/unittests/xmpp/stub_xmpp.c \
-	tests/unittests/ui/stub_ui.c \
+	tests/unittests/ui/stub_ui.c tests/unittests/ui/stub_ui.h \
 	tests/unittests/log/stub_log.c \
 	tests/unittests/config/stub_accounts.c \
 	tests/unittests/tools/stub_http_upload.c \
diff --git a/src/tools/http_upload.c b/src/tools/http_upload.c
index 5254009c..fc41ec5e 100644
--- a/src/tools/http_upload.c
+++ b/src/tools/http_upload.c
@@ -34,6 +34,8 @@
 
 #define _GNU_SOURCE 1
 
+#include "config.h"
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>