--- np2/wince/np2.cpp	2005/02/11 21:17:23	1.21
+++ np2/wince/np2.cpp	2005/03/24 04:40:33	1.23
@@ -5,6 +5,9 @@
 #endif
 #include	"resource.h"
 #include	"strres.h"
+#if defined(UNICODE) && defined(OSLANG_UTF8)
+#include	"codecnv.h"
+#endif
 #include	"np2.h"
 #include	"dosio.h"
 #include	"commng.h"
@@ -108,11 +111,11 @@ static int flagload(const OEMCHAR *ext, 
 	id = DID_YES;
 	ret = statsave_check(path, buf, NELEMENTS(buf));
 	if (ret & (~STATFLAG_DISKCHG)) {
-		menumbox("Couldn't restart", title, MBOX_OK | MBOX_ICONSTOP);
+		menumbox(OEMTEXT("Couldn't restart"), title, MBOX_OK | MBOX_ICONSTOP);
 		id = DID_NO;
 	}
 	else if ((!force) && (ret & STATFLAG_DISKCHG)) {
-		OEMSPRINTF(buf2, "Conflict!\n\n%s\nContinue?", buf);
+		OEMSPRINTF(buf2, OEMTEXT("Conflict!\n\n%s\nContinue?"), buf);
 		id = menumbox(buf2, title, MBOX_YESNOCAN | MBOX_ICONQUESTION);
 	}
 	if (id == DID_YES) {
@@ -322,14 +325,14 @@ static DWORD _GetModuleFileName(HMODULE 
 	}
 	return(nSize);
 }
-#elif defined(OSLANG_UTF8)
+#elif defined(UNICODE) && defined(OSLANG_UTF8)
 static DWORD _GetModuleFileName(HMODULE hModule,
 										OEMCHAR *lpFileName, DWORD nSize) {
 
 	UINT16	ucs2[MAX_PATH];
 
 	GetModuleFileName(hModule, ucs2, NELEMENTS(ucs2));
-	nSize = ucscnv_ucs2toutf8(lpFileName, nSize, ucs2, (UINT)-1);
+	nSize = codecnv_ucs2toutf8(lpFileName, nSize, ucs2, (UINT)-1);
 	if (nSize) {
 		nSize--;
 	}