diff --git a/.gitignore b/.gitignore
index 37e0e2fb..43877450 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,11 @@
 *.o
 out
+7zAll/x64/
+*.pdb
+*.tlog
+*.obj
+*.user
+*.log
+*.pch
+*.idb
+x64/
\ No newline at end of file
diff --git a/CPP/7zip/UI/Agent/ArchiveFolderOpen.cpp b/CPP/7zip/UI/Agent/ArchiveFolderOpen.cpp
index 62d5b1f8..749f39e5 100644
--- a/CPP/7zip/UI/Agent/ArchiveFolderOpen.cpp
+++ b/CPP/7zip/UI/Agent/ArchiveFolderOpen.cpp
@@ -3,7 +3,7 @@
 #include "StdAfx.h"
 
 #include "../../../Windows/DLL.h"
-
+#include "../Common/LoadCodecs.h"
 #include "Agent.h"
 
 void CArchiveFolderManager::LoadFormats()
diff --git a/CPP/7zip/UI/FileManager/SystemPage.cpp b/CPP/7zip/UI/FileManager/SystemPage.cpp
index 819443ee..05a0d058 100644
--- a/CPP/7zip/UI/FileManager/SystemPage.cpp
+++ b/CPP/7zip/UI/FileManager/SystemPage.cpp
@@ -35,11 +35,11 @@ static const UInt32 kLangIDs[] =
 CSysString CModifiedExtInfo::GetString() const
 {
   if (State == kExtState_7Zip)
-    return TEXT("7-Zip");
+    return AString("7-Zip");
   if (State == kExtState_Clear)
-    return TEXT("");
+    return AString("");
   if (Other7Zip)
-    return TEXT("[7-Zip]");
+    return AString("[7-Zip]");
   return ProgramKey;
 };
 
diff --git a/CPP/7zip/UI/FileManager/makefile b/CPP/7zip/UI/FileManager/makefile
index d9e81780..553bcfcb 100644
--- a/CPP/7zip/UI/FileManager/makefile
+++ b/CPP/7zip/UI/FileManager/makefile
@@ -24,6 +24,7 @@ COMMON_OBJS = \
   $O\StringToInt.obj \
   $O\UTFConvert.obj \
   $O\Wildcard.obj \
+  $O\LoadCodecs.obj \
 
 WIN_OBJS = $(WIN_OBJS) \
   $O\Clipboard.obj \