diff --git a/src/m8/checkm8.c b/src/m8/checkm8.c
index d2bf74b..9d34ba0 100644
--- a/src/m8/checkm8.c
+++ b/src/m8/checkm8.c
@@ -1,7 +1,9 @@
 #include "checkm8.h"
 
+#include <stdlib.h>
 #include <stdint.h>
 #include <stddef.h>
+#include <string.h>
 
 #include "payload.h"
 #include "dfu.h"
diff --git a/src/m8/run.c b/src/m8/run.c
index 7a3fb9f..0673eec 100644
--- a/src/m8/run.c
+++ b/src/m8/run.c
@@ -1,5 +1,6 @@
 #include "run.h"
 
+#include <stdlib.h>
 #include <stdatomic.h>
 #include <stdbool.h>
 #include <pthread.h>
@@ -152,10 +153,7 @@ static void *pongo_thread(void *arg)
 bool exploit(void) {
     pthread_t t1, t2;
 
-    shared_t state = {
-        .stop = ATOMIC_VAR_INIT(false),
-        .result = ATOMIC_VAR_INIT(0)
-    };
+    shared_t state;
 
     pthread_create(&t1, NULL, exploit_thread, &state);
     pthread_create(&t2, NULL, pongo_thread, &state);
diff --git a/src/pongo/pongo_helper.c b/src/pongo/pongo_helper.c
index 17cd989..39f408f 100644
--- a/src/pongo/pongo_helper.c
+++ b/src/pongo/pongo_helper.c
@@ -1,5 +1,6 @@
 #include "pongo_helper.h"
 
+#include <stdlib.h>
 #include <string.h>
 
 #include <lz4.h>
diff --git a/src/usb/usb_libusb.c b/src/usb/usb_libusb.c
index 8527c53..217f91a 100644
--- a/src/usb/usb_libusb.c
+++ b/src/usb/usb_libusb.c
@@ -2,7 +2,10 @@
 
 #include "usb_libusb.h"
 
+#include <stdlib.h>
+#include <string.h>
 #include <stdbool.h>
+
 #include <libusb-1.0/libusb.h>
 
 #include "../utils.h"
diff --git a/src/usb/usb_shim.c b/src/usb/usb_shim.c
index e72d0d3..2e85189 100644
--- a/src/usb/usb_shim.c
+++ b/src/usb/usb_shim.c
@@ -1,5 +1,8 @@
 #include "usb_shim.h"
 
+#include <stdlib.h>
+#include <string.h>
+
 #ifdef __APPLE__
 # include "usb_iokit.h"
 #else