diff --git a/android/phoenix/jni/apk-extract/apk-extract.c b/android/phoenix/jni/apk-extract/apk-extract.c
index 630176b9cb..ffa0439f12 100644
--- a/android/phoenix/jni/apk-extract/apk-extract.c
+++ b/android/phoenix/jni/apk-extract/apk-extract.c
@@ -1,9 +1,12 @@
-#include <file/file_extract.h>
-#include <file/file_path.h>
 
 #include <stdio.h>
 #include <string.h>
+
+#include <file/file_extract.h>
+#include <file/file_path.h>
+#include <retro_assert.h>
 #include <retro_miscellaneous.h>
+
 #include "../native/com_retroarch_browser_NativeInterface.h"
 
 //#define VERBOSE_LOG
diff --git a/libretro-common/compat/compat.c b/libretro-common/compat/compat.c
index 77b898bd4c..f2a3c2241a 100644
--- a/libretro-common/compat/compat.c
+++ b/libretro-common/compat/compat.c
@@ -21,21 +21,24 @@
  */
 
 #include <ctype.h>
+
+#ifndef HAVE_GETOPT_LONG
+#include <string.h>
+#include <boolean.h>
+#include <stddef.h>
+#include <stdlib.h>
+
+#include <retro_miscellaneous.h>
+#endif
+
 #include <compat/getopt.h>
 #include <compat/strl.h>
 #include <compat/strcasestr.h>
 #include <compat/posix_string.h>
 
+#include <retro_assert.h>
+
 #ifndef HAVE_GETOPT_LONG
-
-#include <string.h>
-#include <boolean.h>
-#include <stddef.h>
-#include <stdlib.h>
-#include <ctype.h>
-
-#include <retro_miscellaneous.h>
-
 char *optarg;
 int optind, opterr, optopt;