diff --git a/Makefile.common b/Makefile.common
index 12d949d4de..d2abb79bc9 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -874,8 +874,8 @@ endif
 
 
 ifeq ($(HAVE_ZLIB), 1)
-   OBJ += libretro-common/file/file_archive.o \
-          libretro-common/file/file_archive_zlib.o \
+   OBJ += libretro-common/file/archive_file.o \
+          libretro-common/file/archive_file_zlib.o \
           tasks/task_decompress.o
    OBJ += $(ZLIB_OBJS)
    DEFINES += -DHAVE_ZLIB
diff --git a/content.c b/content.c
index 4dd1fccb2d..f88d1a7a03 100644
--- a/content.c
+++ b/content.c
@@ -40,7 +40,7 @@
 #include <compat/posix_string.h>
 #include <file/file_path.h>
 #ifdef HAVE_COMPRESSION
-#include <file/file_archive.h>
+#include <file/archive_file.h>
 #endif
 #include <string/stdstring.h>
 
diff --git a/core_info.c b/core_info.c
index fd2c359692..0191ed4df5 100644
--- a/core_info.c
+++ b/core_info.c
@@ -17,7 +17,7 @@
 
 #include <file/file_path.h>
 #include <lists/dir_list.h>
-#include <file/file_archive.h>
+#include <file/archive_file.h>
 #include <compat/strl.h>
 
 #include <string/stdstring.h>
diff --git a/database_info.h b/database_info.h
index 612c1c6dec..4cd4e16962 100644
--- a/database_info.h
+++ b/database_info.h
@@ -21,7 +21,7 @@
 #include <stdint.h>
 #include <stddef.h>
 
-#include <file/file_archive.h>
+#include <file/archive_file.h>
 
 #include "libretro-db/libretrodb.h"
 
diff --git a/griffin/griffin.c b/griffin/griffin.c
index dc108cfca0..034a65fc13 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -45,9 +45,13 @@ CONSOLE EXTENSIONS
 
 #endif
 
+/*============================================================
+ARCHIVE FILE
+============================================================ */
+
 #ifdef HAVE_ZLIB
-#include "../libretro-common/file/file_archive.c"
-#include "../libretro-common/file/file_archive_zlib.c"
+#include "../libretro-common/file/archive_file.c"
+#include "../libretro-common/file/archive_file_zlib.c"
 #endif
 
 /*============================================================
diff --git a/libretro-common/file/file_archive.c b/libretro-common/file/archive_file.c
similarity index 99%
rename from libretro-common/file/file_archive.c
rename to libretro-common/file/archive_file.c
index f1227b954e..e975cbc775 100644
--- a/libretro-common/file/file_archive.c
+++ b/libretro-common/file/archive_file.c
@@ -1,7 +1,7 @@
-/* Copyright  (C) 2010-2015 The RetroArch team
+/* Copyright  (C) 2010-2016 The RetroArch team
  *
  * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (file_archive.c).
+ * The following license statement only applies to this file (archive_file.c).
  * ---------------------------------------------------------------------------------------
  *
  * Permission is hereby granted, free of charge,
@@ -39,7 +39,7 @@
 #endif
 
 #include <compat/strl.h>
-#include <file/file_archive.h>
+#include <file/archive_file.h>
 #include <file/file_path.h>
 #include <retro_file.h>
 #include <retro_stat.h>
diff --git a/libretro-common/file/file_archive_zlib.c b/libretro-common/file/archive_file_zlib.c
similarity index 96%
rename from libretro-common/file/file_archive_zlib.c
rename to libretro-common/file/archive_file_zlib.c
index 8faf97ebc4..b08e5ae04c 100644
--- a/libretro-common/file/file_archive_zlib.c
+++ b/libretro-common/file/archive_file_zlib.c
@@ -1,7 +1,7 @@
-/* Copyright  (C) 2010-2015 The RetroArch team
+/* Copyright  (C) 2010-2016 The RetroArch team
  *
  * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (file_archive_zlib.c).
+ * The following license statement only applies to this file (archive_file_zlib.c).
  * ---------------------------------------------------------------------------------------
  *
  * Permission is hereby granted, free of charge,
@@ -23,7 +23,7 @@
 #include <stdlib.h>
 
 #include <compat/zlib.h>
-#include <file/file_archive.h>
+#include <file/archive_file.h>
 #include <retro_file.h>
 
 static void *zlib_stream_new(void)
diff --git a/libretro-common/formats/png/rpng.c b/libretro-common/formats/png/rpng.c
index 712d234abc..35e3aae25e 100644
--- a/libretro-common/formats/png/rpng.c
+++ b/libretro-common/formats/png/rpng.c
@@ -32,7 +32,7 @@
 #include <boolean.h>
 #include <file/nbio.h>
 #include <formats/rpng.h>
-#include <file/file_archive.h>
+#include <file/archive_file.h>
 
 #include "rpng_internal.h"
 
diff --git a/libretro-common/include/file/file_archive.h b/libretro-common/include/file/archive_file.h
similarity index 96%
rename from libretro-common/include/file/file_archive.h
rename to libretro-common/include/file/archive_file.h
index e745430e60..1700718acd 100644
--- a/libretro-common/include/file/file_archive.h
+++ b/libretro-common/include/file/archive_file.h
@@ -1,7 +1,7 @@
-/* Copyright  (C) 2010-2015 The RetroArch team
+/* Copyright  (C) 2010-2016 The RetroArch team
  *
  * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (file_archive.h).
+ * The following license statement only applies to this file (archive_file.h).
  * ---------------------------------------------------------------------------------------
  *
  * Permission is hereby granted, free of charge,
@@ -20,8 +20,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#ifndef FILE_ARCHIVE_H__
-#define FILE_ARCHIVE_H__
+#ifndef LIBRETRO_SDK_ARCHIVE_FILE_H__
+#define LIBRETRO_SDK_ARCHIVE_FILE_H__
 
 #include <stdint.h>
 #include <stddef.h>
diff --git a/libretro-common/include/formats/rpng.h b/libretro-common/include/formats/rpng.h
index ee44b76874..7997edadde 100644
--- a/libretro-common/include/formats/rpng.h
+++ b/libretro-common/include/formats/rpng.h
@@ -27,7 +27,7 @@
 #include <stddef.h>
 
 #include <boolean.h>
-#include <file/file_archive.h>
+#include <file/archive_file.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c
index 73c127d720..515bdd4132 100644
--- a/menu/menu_displaylist.c
+++ b/menu/menu_displaylist.c
@@ -18,7 +18,7 @@
 #include <lists/file_list.h>
 #include <lists/dir_list.h>
 #include <file/file_path.h>
-#include <file/file_archive.h>
+#include <file/archive_file.h>
 #include <retro_stat.h>
 #include <string/stdstring.h>
 
diff --git a/patch.c b/patch.c
index 737a6d87d6..3df3808753 100644
--- a/patch.c
+++ b/patch.c
@@ -24,7 +24,7 @@
 
 #include <compat/msvc.h>
 #include <file/file_path.h>
-#include <file/file_archive.h>
+#include <file/archive_file.h>
 #include <retro_file.h>
 #include <retro_stat.h>
 #include <string/stdstring.h>
diff --git a/tasks/task_decompress.c b/tasks/task_decompress.c
index f25cd2adb1..3e383b5c96 100644
--- a/tasks/task_decompress.c
+++ b/tasks/task_decompress.c
@@ -20,7 +20,7 @@
 #include <lists/string_list.h>
 #include <string/stdstring.h>
 #include <file/file_path.h>
-#include <file/file_archive.h>
+#include <file/archive_file.h>
 #include <retro_miscellaneous.h>
 #include <retro_stat.h>
 
diff --git a/tasks/task_http.c b/tasks/task_http.c
index 3d069493a8..b75c6a64cb 100644
--- a/tasks/task_http.c
+++ b/tasks/task_http.c
@@ -20,7 +20,7 @@
 #include <string/stdstring.h>
 #include <compat/strl.h>
 #include <file/file_path.h>
-#include <file/file_archive.h>
+#include <file/archive_file.h>
 #include <net/net_compat.h>
 #include <retro_file.h>
 #include <retro_stat.h>