diff --git a/src/fastfetch.c b/src/fastfetch.c
index 170a0107b..1ab4d03c1 100644
--- a/src/fastfetch.c
+++ b/src/fastfetch.c
@@ -1,4 +1,5 @@
 #include "fastfetch.h"
+#include "util/FFvaluestore.h"
 #include "common/printing.h"
 #include "common/parsing.h"
 
diff --git a/src/fastfetch.h b/src/fastfetch.h
index fcf3c98d5..6970076a9 100644
--- a/src/fastfetch.h
+++ b/src/fastfetch.h
@@ -14,7 +14,6 @@
 
 #include "util/FFstrbuf.h"
 #include "util/FFlist.h"
-#include "util/FFvaluestore.h"
 
 static inline void ffUnused(int dummy, ...) { (void) dummy; }
 #define FF_UNUSED(...) ffUnused(0, __VA_ARGS__);
diff --git a/tests/strbuf.c b/tests/strbuf.c
index 6d0eae8bc..cae266501 100644
--- a/tests/strbuf.c
+++ b/tests/strbuf.c
@@ -2,6 +2,7 @@
 
 #include <string.h>
 #include <stdarg.h>
+#include <stdlib.h>
 
 static void testFailed(const FFstrbuf* strbuf, const char* message, ...)
 {