diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3e2a0657..7dbef242 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -124,6 +124,7 @@ SET(SRC_FEX
     fex/7z_C/7zAlloc.c
     fex/7z_C/7zBuf.c
     fex/7z_C/7zCrc.c
+    fex/7z_C/7zCrcOpt.c
     fex/7z_C/7zDecode.c
     fex/7z_C/7zExtract.c
     fex/7z_C/7zHeader.c
@@ -131,8 +132,11 @@ SET(SRC_FEX
     fex/7z_C/7zItem.c
     fex/7z_C/7zStream.c
     fex/7z_C/Bcj2.c
+    fex/7z_C/Bra.c
     fex/7z_C/Bra86.c
+    fex/7z_C/CpuArch.c
     fex/7z_C/LzmaDec.c
+    fex/7z_C/Lzma2Dec.c
     fex/fex/Binary_Extractor.cpp
     fex/fex/blargg_common.cpp
     fex/fex/blargg_errors.cpp
diff --git a/fex/fex/Data_Reader.cpp b/fex/fex/Data_Reader.cpp
index dc46c3f0..e5a8d49a 100644
--- a/fex/fex/Data_Reader.cpp
+++ b/fex/fex/Data_Reader.cpp
@@ -5,6 +5,7 @@
 #include "blargg_endian.h"
 #include <stdio.h>
 #include <errno.h>
+#include <wchar.h>
 
 #if BLARGG_UTF8_PATHS
 	#include <windows.h>
diff --git a/fex/fex/Zip7_Extractor.cpp b/fex/fex/Zip7_Extractor.cpp
index f4131607..41710251 100644
--- a/fex/fex/Zip7_Extractor.cpp
+++ b/fex/fex/Zip7_Extractor.cpp
@@ -220,7 +220,11 @@ blargg_err_t Zip7_Extractor::next_v()
 
 				time_t _time = time;
 				
+			#ifdef _WIN32
 				localtime_s( &tm, &_time );
+			#else
+				localtime_r( &_time, &tm );
+			#endif
 
 				date = ( tm.tm_sec >> 1 ) & 0x1F |
 					(( tm.tm_min & 0x3F ) << 5 ) |