diff --git a/src/plat/win32/win32Init.h b/src/plat/win32/win32Init.h
index 8e12bef..565d1b6 100644
--- a/src/plat/win32/win32Init.h
+++ b/src/plat/win32/win32Init.h
@@ -25,3 +25,4 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "../../common.h"
 
 extern App app;
+extern Dev dev;
diff --git a/src/system/i18n.c b/src/system/i18n.c
index 7283929..5328afa 100644
--- a/src/system/i18n.c
+++ b/src/system/i18n.c
@@ -54,9 +54,9 @@ void setLanguage(char *applicationName, char *languageCode)
 
 				if (c[0] != '\0')
 				{
-					strncat(language, "_", MAX_MESSAGE_LENGTH - strlen(language) - 1);
+					strncat(language, "_", MAX_DESCRIPTION_LENGTH - strlen(language) - 1);
 
-					strncat(language, c, MAX_MESSAGE_LENGTH - strlen(language) - 1);
+					strncat(language, c, MAX_DESCRIPTION_LENGTH - strlen(language) - 1);
 				}
 			}
 		#else
diff --git a/src/system/i18n.h b/src/system/i18n.h
index a3263e1..d73d04f 100644
--- a/src/system/i18n.h
+++ b/src/system/i18n.h
@@ -19,6 +19,10 @@ Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA.
 
 #include "../common.h"
 
+#ifdef _WIN32
+	#include <windows.h>
+#endif
+
 #define TABLE_SIZE	255
 
 char *getTranslatedString(char *);