diff --git a/Source/Core/Common/Src/SysConf.cpp b/Source/Core/Common/Src/SysConf.cpp
index 48e42920aa..137696120e 100644
--- a/Source/Core/Common/Src/SysConf.cpp
+++ b/Source/Core/Common/Src/SysConf.cpp
@@ -71,8 +71,9 @@ bool SysConf::LoadFromFile(const char *filename)
 	return false;
 }
 
-bool SysConf::LoadFromFileInternal(File::IOFile f)
+bool SysConf::LoadFromFileInternal(FILE *fh)
 {
+	File::IOFile f(fh);
 	// Fill in infos
 	SSysConfHeader s_Header;
 	f.ReadArray(s_Header.version, 4);
diff --git a/Source/Core/Common/Src/SysConf.h b/Source/Core/Common/Src/SysConf.h
index 5e0881ea8b..84c21a3e51 100644
--- a/Source/Core/Common/Src/SysConf.h
+++ b/Source/Core/Common/Src/SysConf.h
@@ -179,7 +179,7 @@ public:
 	bool Reload();
 
 private:
-	bool LoadFromFileInternal(File::IOFile f);
+	bool LoadFromFileInternal(FILE *fh);
 	void GenerateSysConf();
 	void Clear();
 
diff --git a/Source/Core/DiscIO/Src/DriveBlob.cpp b/Source/Core/DiscIO/Src/DriveBlob.cpp
index 3df1628fcc..e69f8ff34c 100644
--- a/Source/Core/DiscIO/Src/DriveBlob.cpp
+++ b/Source/Core/DiscIO/Src/DriveBlob.cpp
@@ -129,8 +129,8 @@ bool DriveReader::ReadMultipleAlignedBlocks(u64 block_num, u64 num_blocks, u8 *o
 		return false;
 	}
 #else
-	fseeko(file_, m_blocksize*block_num, SEEK_SET);
-	if(fread(out_ptr, 1, m_blocksize * num_blocks, file_) != m_blocksize * num_blocks)
+	fseeko(file_.GetHandle(), m_blocksize*block_num, SEEK_SET);
+	if(fread(out_ptr, 1, m_blocksize * num_blocks, file_.GetHandle()) != m_blocksize * num_blocks)
 		return false;
 #endif
 	return true;
diff --git a/Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp b/Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp
index 4daac17376..ea3bb98123 100644
--- a/Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp
+++ b/Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp
@@ -796,9 +796,10 @@ u32 GCMemcard::ImportGci(const char *inputFile, std::string outputFile)
 	return result;
 }
 
-u32 GCMemcard::ImportGciInternal(File::IOFile gci, const char *inputFile, std::string outputFile)
+u32 GCMemcard::ImportGciInternal(FILE* gcih, const char *inputFile, std::string outputFile)
 {
-	int offset;
+	File::IOFile gci(gcih);
+	unsigned int offset;
 	char tmp[0xD];
 	std::string fileType;
 	SplitPath(inputFile, NULL, NULL, &fileType);
diff --git a/Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.h b/Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.h
index fdd0af9783..2fd1187f95 100644
--- a/Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.h
+++ b/Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.h
@@ -228,7 +228,7 @@ public:
 	// if remove > 0 it will pad bat.map with 0's sizeof remove
 	u32 ImportFile(DEntry& direntry, u8* contents, int remove);
 private:
-	u32 ImportGciInternal(File::IOFile gci, const char *inputFile, std::string outputFile);
+	u32 ImportGciInternal(FILE* gcih, const char *inputFile, std::string outputFile);
 
 public:
 	// delete a file from the directory
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
index 7de7c8e950..aafc2ddc55 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
@@ -1158,7 +1158,7 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons
 	}
 
 	// Frame dumps are handled a little differently in Windows
-#if defined _WIN32 || defined HAVE_LIBAV && 0
+#if defined _WIN32 || defined HAVE_LIBAV
 	if (g_ActiveConfig.bDumpFrames)
 	{
 		std::lock_guard<std::mutex> lk(s_criticalScreenshot);