diff --git a/griffin/griffin.c b/griffin/griffin.c
index 248e56f934..cf07f9a218 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -54,12 +54,16 @@ ALGORITHMS
 /*============================================================
 ARCHIVE FILE
 ============================================================ */
+#include "../libretro-common/file/archive_file.c"
 
 #ifdef HAVE_ZLIB
-#include "../libretro-common/file/archive_file.c"
 #include "../libretro-common/file/archive_file_zlib.c"
 #endif
 
+#ifdef HAVE_7ZIP
+#include "../libretro-common/file/archive_file_7z.c"
+#endif
+
 /*============================================================
 ENCODINGS
 ============================================================ */
diff --git a/libretro-common/encodings/encoding_utf.c b/libretro-common/encodings/encoding_utf.c
index 443dd4c4d1..b7beafd1d5 100644
--- a/libretro-common/encodings/encoding_utf.c
+++ b/libretro-common/encodings/encoding_utf.c
@@ -224,7 +224,7 @@ uint32_t utf8_walk(const char **string)
    return ret | (first&7)<<6;
 }
 
-static bool utf16_to_char(uint8_t **utf_data,
+bool utf16_to_char(uint8_t **utf_data,
       size_t *dest_len, const uint16_t *in)
 {
    unsigned len    = 0;
diff --git a/libretro-common/file/archive_file.c b/libretro-common/file/archive_file.c
index 8c2e34c988..c113f00bf8 100644
--- a/libretro-common/file/archive_file.c
+++ b/libretro-common/file/archive_file.c
@@ -621,7 +621,6 @@ int file_archive_compressed_read(
       const char* optional_filename, ssize_t *length)
 {
    int ret                            = 0;
-   const char* file_ext               = NULL;
    struct string_list *str_list       = file_archive_filename_split(path);
 
    /* Safety check.