diff --git a/language/common_res.h b/language/common_res.h
index 7c994b5c7..acd5fdd2d 100644
--- a/language/common_res.h
+++ b/language/common_res.h
@@ -1,3 +1,5 @@
+#ifndef _COMMON_RES_H_
+#define _COMMON_RES_H_
 //{{NO_DEPENDENCIES}}
 // common language (MUI) defines
 //
@@ -256,3 +258,5 @@
 #define IDM_HELP_ADMINEXE               40603
 #define IDM_HELP_UPDATEWEBSITE          40604
 #define IDM_EDIT_INSERT_GUID            40605
+
+#endif
diff --git a/src/Helpers.c b/src/Helpers.c
index 97b72c175..298ccbc6e 100644
--- a/src/Helpers.c
+++ b/src/Helpers.c
@@ -278,7 +278,7 @@ DWORD GetLastErrorToMsgBox(LPWSTR lpszFunction, DWORD dwErrID)
     FORMAT_MESSAGE_IGNORE_INSERTS,
     NULL,
     dwErrID,
-    MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
+    MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), // g_iPrefLngLocID ?
     (LPTSTR)&lpMsgBuf,
     0, NULL);
 
diff --git a/src/Notepad3.c b/src/Notepad3.c
index 5af0bd387..717c54e4a 100644
--- a/src/Notepad3.c
+++ b/src/Notepad3.c
@@ -132,6 +132,7 @@ bool          g_bSaveFindReplace;
 bool          g_bFindReplCopySelOrClip = true;
 
 WCHAR         g_tchPrefLngLocName[MINI_BUFFER];
+LANGID        g_iPrefLngLocID = 1033; // en-US
 HMODULE       g_hLngResContainer = NULL;
 static WCHAR* const   g_tchAvailableLanguages = L"af-AF fr-FR de-DE es-ES en-UK";
 static LANGID const  g_iAvailableLanguages[5] = { 1078, 1036, 1031, 3082, 2057 };
@@ -661,22 +662,22 @@ int WINAPI WinMain(HINSTANCE hInstance,HINSTANCE hPrevInst,LPSTR lpCmdLine,int n
   // ----------------------------------------------------
   // MultiLingual
   //
-  LANGID langID = GetUserDefaultUILanguage();
+  g_iPrefLngLocID = GetUserDefaultUILanguage();
   bool bPrefLngNotAvail = false;
 
   if (StringCchLenW(g_tchPrefLngLocName, COUNTOF(g_tchPrefLngLocName)) > 0)
   {
     DWORD dwLangID = 0;
     GetLocaleInfoEx(g_tchPrefLngLocName, LOCALE_ILANGUAGE | LOCALE_RETURN_NUMBER, (LPWSTR)&dwLangID, sizeof(DWORD));
-    langID = (LANGID)dwLangID;
+    g_iPrefLngLocID = (LANGID)dwLangID;
   }
 
-  g_hLngResContainer = _LoadLanguageResources(langID);
+  g_hLngResContainer = _LoadLanguageResources(g_iPrefLngLocID);
 
   if (!g_hLngResContainer) // fallback en-US (1033)
   {
     g_hLngResContainer = g_hInstance; 
-    if (langID != 1033) { bPrefLngNotAvail = true; }
+    if (g_iPrefLngLocID != 1033) { bPrefLngNotAvail = true; }
   }
   // ----------------------------------------------------
 
diff --git a/src/resource.h b/src/resource.h
index 1c1e13064..c65485fb4 100644
--- a/src/resource.h
+++ b/src/resource.h
@@ -178,7 +178,6 @@
 #define ___SCI_CMD__SCEN_CHANGE___      768
 
 
-
 #define IDS_READONLY                    10005
 #define IDS_STATUS_DOCLINE              10006
 #define IDS_STATUS_DOCCOLUMN            10007