Index: functions.h
===================================================================
--- functions.h	(revision 2334)
+++ functions.h	(working copy)
@@ -254,6 +254,9 @@
 void *ReadFileToMem(const char *filename, size_t *lenp, size_t maxsize);
 int GetLanguageList(char **languages, int max);
 
+byte *OpenTTDToUTF8(const char *iso, uint32 memsize);
+char *UTF8ToOpenTTD(const byte *utf, uint32 memsize);
+
 void CheckSwitchToEuro(void);
 
 void LoadFromConfig(void);
Index: stdafx.h
===================================================================
--- stdafx.h	(revision 2334)
+++ stdafx.h	(working copy)
@@ -158,6 +158,12 @@
 typedef unsigned __int64 uint64;
 #endif
 
+/*
+ * unichar for Unicode characters to avoid potential collisions with wchar_t
+ * and to differ from uint32's numerical usage.
+ */
+typedef unsigned int unichar;
+
 // Setup alignment and conversion macros
 #if defined(TTD_BIG_ENDIAN)