diff --git a/main.c b/main.c
index d42fd19..124af2a 100644
--- a/main.c
+++ b/main.c
@@ -1,7 +1,7 @@
-#include "SDL_blendmode.h"
-#include "SDL_error.h"
-#include "SDL_stdinc.h"
-#include "SDL_surface.h"
+#include "SDL3/SDL_blendmode.h"
+#include "SDL3/SDL_error.h"
+#include "SDL3/SDL_stdinc.h"
+#include "SDL3/SDL_surface.h"
 #include "mgba/core/config.h"
 #include <stdint.h>
 #define SDL_MAIN_USE_CALLBACKS 1
@@ -147,7 +147,8 @@ int SDL_AppInit(int argc, char *argv[]) {
     int devcount = 0;
     int i;
 
-    struct mArguments args = {};
+    struct mArguments args;
+    memset(&args, 0, sizeof(args));
     bool parsed = mArgumentsParse(&args, argc, argv, NULL, 0);
 
     /* Enable standard application logging */