diff --git a/src/driver.h b/src/driver.h
index cac5e49c..c0d738f5 100644
--- a/src/driver.h
+++ b/src/driver.h
@@ -13,7 +13,9 @@ FILE *FCEUD_UTF8fopen(const char *fn, const char *mode);
 inline FILE *FCEUD_UTF8fopen(const std::string &n, const char *mode) { return FCEUD_UTF8fopen(n.c_str(),mode); }
 std::fstream* FCEUD_UTF8_fstream(const char *n, const char *m);
 inline std::fstream* FCEUD_UTF8_fstream(const std::string &n, const char *m) { return FCEUD_UTF8_fstream(n.c_str(),m); }
-
+FCEUFILE* FCEUD_OpenArchiveIndex(ArchiveScanRecord& asr, std::string& fname, int innerIndex);
+FCEUFILE* FCEUD_OpenArchive(ArchiveScanRecord& asr, std::string& fname, std::string* innerFilename);
+ArchiveScanRecord FCEUD_ScanArchive(std::string fname);
 
 //mbg 7/23/06
 const char *FCEUD_GetCompilerString();
diff --git a/src/drivers/win/archive.cpp b/src/drivers/win/archive.cpp
index 2df42051..65a0e31b 100644
--- a/src/drivers/win/archive.cpp
+++ b/src/drivers/win/archive.cpp
@@ -451,7 +451,7 @@ ArchiveScanRecord FCEUD_ScanArchive(std::string fname)
 
 extern HWND hAppWnd;
 
-FCEUFILE* FCEUD_OpenArchive(ArchiveScanRecord& asr, std::string& fname, std::string* innerFilename, int innerIndex)
+static FCEUFILE* FCEUD_OpenArchive(ArchiveScanRecord& asr, std::string& fname, std::string* innerFilename, int innerIndex)
 {
 	FCEUFILE* fp = 0;
 	
diff --git a/src/file.cpp b/src/file.cpp
index b1127d0c..88c9f5b2 100644
--- a/src/file.cpp
+++ b/src/file.cpp
@@ -30,10 +30,6 @@
 #include <zlib.h>
 #endif
 
-#ifdef WIN32
-#include <drivers/win/archive.h>
-#endif
-
 #include "types.h"
 #include "file.h"
 #include "utils/endian.h"
@@ -175,46 +171,6 @@ FileBaseInfo CurrentFileBase() {
 }
 
 FileBaseInfo DetermineFileBase(const char *f) {
-	//const char *tp1,*tp3;
-
-	//char FileBase[2048];
-	//char FileBaseDirectory[2048];
-	//char FileExt[2048];
-
-	//#if PSS_STYLE==4
-	//	tp1=((char *)strrchr(f,':'));
-	//#elif PSS_STYLE==1
-	//	tp1=((char *)strrchr(f,'/'));
-	//#else
-	//	tp1=((char *)strrchr(f,'\\'));
-	//#if PSS_STYLE!=3
-	//	tp3=((char *)strrchr(f,'/'));
-	//	if(tp1<tp3) tp1=tp3;
-	//#endif
-	//#endif
-	//if(!tp1)
-	//{
-	//	tp1=f;
-	//	strcpy(FileBaseDirectory,".");
-	//}
-	//else
-	//{
-	//	memcpy(FileBaseDirectory,f,tp1-f);
-	//	FileBaseDirectory[tp1-f]=0;
-	//	tp1++;
-	//}
-
-	//if(((tp3=strrchr(f,'.'))!=NULL) && (tp3>tp1))
-	//{
-	//	memcpy(FileBase,tp1,tp3-tp1);
-	//	FileBase[tp3-tp1]=0;
-	//	strcpy(FileExt,tp3);
-	//}
-	//else
-	//{
-	//	strcpy(FileBase,tp1);
-	//	FileExt[0]=0;
-	//}
 
 	char drv[PATH_MAX], dir[PATH_MAX], name[PATH_MAX], ext[PATH_MAX];
 	splitpath(f,drv,dir,name,ext);