diff --git a/inc/config.h b/inc/config.h
index 16a5f82..66b5c36 100644
--- a/inc/config.h
+++ b/inc/config.h
@@ -19,11 +19,12 @@
 #define CONFIG_H
 
 #include <map.h>
-#include <utils.h>
 
+#include <stdio.h>
 #include <stdint.h>
 #include <stdarg.h>
-#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
 
 void config_put(struct map* map, char* line);
 
diff --git a/inc/wofi.h b/inc/wofi.h
index 7b9cffa..41f513c 100644
--- a/inc/wofi.h
+++ b/inc/wofi.h
@@ -20,6 +20,7 @@
 
 #include <wofi_api.h>
 
+#include <utils.h>
 #include <config.h>
 #include <property_box.h>
 
diff --git a/src/config.c b/src/config.c
index 7c90862..bc5f576 100644
--- a/src/config.c
+++ b/src/config.c
@@ -81,7 +81,7 @@ uint8_t config_get_mnemonic(struct map* config, const char* key, char* def_opt,
 	uint8_t result = 0;
 	for(uint8_t i = 0; i < num_choices; i++) {
 		char* cmp_str = va_arg(ap, char*);
-		if (strcmp(opt, cmp_str) == 0) {
+		if(strcmp(opt, cmp_str) == 0) {
 			result = i;
 			break;
 		}