diff --git a/lib/EAPBase_UI/include/EAP_UI.h b/lib/EAPBase_UI/include/EAP_UI.h
index 2831a3b..eeb0c04 100644
--- a/lib/EAPBase_UI/include/EAP_UI.h
+++ b/lib/EAPBase_UI/include/EAP_UI.h
@@ -122,11 +122,6 @@ inline wxString wxEAPGetProviderName(const std::wstring &id);
 ///
 inline void wxInitializeConfig();
 
-///
-/// Inizializes wxWidgets localization scheme
-///
-inline bool wxInitializeLocale(wxLocale &locale);
-
 
 namespace eap
 {
@@ -994,29 +989,6 @@ inline void wxInitializeConfig()
 }
 
 
-inline bool wxInitializeLocale(wxLocale &locale)
-{
-    // Read language from configuration.
-    wxLanguage lang_code;
-    wxString lang;
-    if (wxConfigBase::Get()->Read(wxT("Language"), &lang)) {
-        const wxLanguageInfo *lang_info = wxLocale::FindLanguageInfo(lang);
-        lang_code = lang_info ? (wxLanguage)lang_info->Language : wxLANGUAGE_DEFAULT;
-    } else
-        lang_code = wxLANGUAGE_DEFAULT;
-
-    if (wxLocale::IsAvailable(lang_code)) {
-        // Language is "available". Well... Known actually.
-        wxString sPath;
-        if (wxConfigBase::Get()->Read(wxT("LocalizationRepositoryPath"), &sPath))
-            locale.AddCatalogLookupPathPrefix(sPath);
-        return locale.Init(lang_code);
-    }
-
-    return false;
-}
-
-
 namespace eap
 {
     class monitor_ui
diff --git a/lib/TTLS_UI/build/TTLS_UI.props b/lib/TTLS_UI/build/TTLS_UI.props
index 4997b71..fe94d27 100644
--- a/lib/TTLS_UI/build/TTLS_UI.props
+++ b/lib/TTLS_UI/build/TTLS_UI.props
@@ -5,7 +5,7 @@
   <PropertyGroup />
   <ItemDefinitionGroup>
     <ClCompile>
-      <AdditionalIncludeDirectories>..\..\Events\build\temp\Events.$(Platform).$(Configuration).$(PlatformToolset);..\..\WinStd\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\Events\build\temp\Events.$(Platform).$(Configuration).$(PlatformToolset);..\..\WinStd\include;..\..\wxExtend\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup />
diff --git a/lib/TTLS_UI/src/StdAfx.h b/lib/TTLS_UI/src/StdAfx.h
index b497c2f..b5f516e 100644
--- a/lib/TTLS_UI/src/StdAfx.h
+++ b/lib/TTLS_UI/src/StdAfx.h
@@ -29,5 +29,7 @@
 #include "../../PAP_UI/include/PAP_UI.h"
 #include "../../MSCHAPv2_UI/include/MSCHAPv2_UI.h"
 
+#include <wxex/common.h>
+
 #include <wx/app.h>
 #include <wx/thread.h>
diff --git a/lib/wxExtend b/lib/wxExtend
index d7ac16d..887a2c8 160000
--- a/lib/wxExtend
+++ b/lib/wxExtend
@@ -1 +1 @@
-Subproject commit d7ac16dd8dea0bc0d1e9618093f57e57538c1503
+Subproject commit 887a2c8116b1bd639cf1583cc88a05778f7626bb