diff --git a/mfapi/apicalls/device_get_changes.c b/mfapi/apicalls/device_get_changes.c
index a3222ff..d90ed70 100644
--- a/mfapi/apicalls/device_get_changes.c
+++ b/mfapi/apicalls/device_get_changes.c
@@ -21,11 +21,10 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <inttypes.h>
+#include <stdint.h>
 
 #include "../../utils/http.h"
 #include "../../utils/json.h"
-#include "../../utils/strings.h"
-#include "../folder.h"
 #include "../mfconn.h"
 #include "../apicalls.h"        // IWYU pragma: keep
 
diff --git a/mfapi/apicalls/device_get_status.c b/mfapi/apicalls/device_get_status.c
index 7cb55a8..f2d13dd 100644
--- a/mfapi/apicalls/device_get_status.c
+++ b/mfapi/apicalls/device_get_status.c
@@ -20,6 +20,7 @@
 #include <jansson.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <stdint.h>
 
 #include "../../utils/http.h"
 #include "../../utils/json.h"
diff --git a/mfapi/apicalls/folder_get_content.c b/mfapi/apicalls/folder_get_content.c
index e0e21a9..1d0c315 100644
--- a/mfapi/apicalls/folder_get_content.c
+++ b/mfapi/apicalls/folder_get_content.c
@@ -20,14 +20,14 @@
 #define _XOPEN_SOURCE           // for strptime
 #include <time.h>
 #include <jansson.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <stddef.h>
 
 #include "../../utils/http.h"
 #include "../../utils/json.h"
-#include "../../utils/strings.h"
 #include "../folder.h"
+#include "../file.h"
 #include "../mfconn.h"
 #include "../apicalls.h"        // IWYU pragma: keep
 
diff --git a/mfshell/commands/changes.c b/mfshell/commands/changes.c
index c043c62..3110608 100644
--- a/mfshell/commands/changes.c
+++ b/mfshell/commands/changes.c
@@ -19,6 +19,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <stdint.h>
 
 #include "../../mfapi/apicalls.h"
 #include "../mfshell.h"
diff --git a/mfshell/commands/status.c b/mfshell/commands/status.c
index a7e3ebf..9aa8cad 100644
--- a/mfshell/commands/status.c
+++ b/mfshell/commands/status.c
@@ -19,6 +19,7 @@
 
 #include <stdio.h>
 #include <inttypes.h>
+#include <stdint.h>
 
 #include "../../mfapi/apicalls.h"
 #include "../mfshell.h"