diff --git a/reactos/base/applications/charmap/about.c b/reactos/base/applications/charmap/about.c
index c8a0040564b..464591ee1c6 100644
--- a/reactos/base/applications/charmap/about.c
+++ b/reactos/base/applications/charmap/about.c
@@ -34,10 +34,10 @@ AboutDialogProc(HWND hDlg,
                                0);
             if (hIcon)
             {
-                SendMessage(hDlg,
-                            WM_SETICON,
-                            ICON_SMALL,
-                            (LPARAM)hIcon);
+                SendMessageW(hDlg,
+                             WM_SETICON,
+                             ICON_SMALL,
+                             (LPARAM)hIcon);
             }
 
             hLicenseEditWnd = GetDlgItem(hDlg,
diff --git a/reactos/base/applications/charmap/charmap.c b/reactos/base/applications/charmap/charmap.c
index 61d1b4433f5..7e4846c13b2 100644
--- a/reactos/base/applications/charmap/charmap.c
+++ b/reactos/base/applications/charmap/charmap.c
@@ -107,7 +107,7 @@ ChangeMapFont(HWND hDlg)
     {
         lpFontName = HeapAlloc(GetProcessHeap(),
                                0,
-                               (Len + 1) * sizeof(TCHAR));
+                               (Len + 1) * sizeof(WCHAR));
 
         if (lpFontName)
         {
@@ -138,7 +138,7 @@ AddCharToSelection(HWND hText,
     {
         lpText = HeapAlloc(GetProcessHeap(),
                            0,
-                           (Len + 2) * sizeof(TCHAR));
+                           (Len + 2) * sizeof(WCHAR));
 
         if (lpText)
         {
@@ -267,10 +267,10 @@ DlgProc(HWND hDlg,
 
                 case IDC_SELECT:
                 {
-                    TCHAR ch;
+                    WCHAR ch;
                     HWND hMap = GetDlgItem(hDlg, IDC_FONTMAP);
 
-                    ch = (TCHAR) SendMessageW(hMap, FM_GETCHAR, 0, 0);
+                    ch = (WCHAR) SendMessageW(hMap, FM_GETCHAR, 0, 0);
 
                     if (ch)
                     {
@@ -343,10 +343,10 @@ DlgProc(HWND hDlg,
 
 
 INT WINAPI
-_tWinMain(HINSTANCE hInst,
-          HINSTANCE hPrev,
-          LPTSTR Cmd,
-          int iCmd)
+wWinMain(HINSTANCE hInst,
+         HINSTANCE hPrev,
+         LPWSTR Cmd,
+         int iCmd)
 {
     INITCOMMONCONTROLSEX iccx;
     INT Ret = 1;
diff --git a/reactos/base/applications/charmap/lrgcell.c b/reactos/base/applications/charmap/lrgcell.c
index b94f288f9d6..fb40e16c610 100644
--- a/reactos/base/applications/charmap/lrgcell.c
+++ b/reactos/base/applications/charmap/lrgcell.c
@@ -29,7 +29,7 @@ SetLrgFont(PMAP infoPtr)
     {
         lpFontName = HeapAlloc(GetProcessHeap(),
                                0,
-                               (Len + 1) * sizeof(TCHAR));
+                               (Len + 1) * sizeof(WCHAR));
 
         if (lpFontName)
         {
diff --git a/reactos/base/applications/charmap/map.c b/reactos/base/applications/charmap/map.c
index bdb45101293..565d4d5ec67 100644
--- a/reactos/base/applications/charmap/map.c
+++ b/reactos/base/applications/charmap/map.c
@@ -220,10 +220,10 @@ NotifyParentOfSelection(PMAP infoPtr,
 
         mnmh.ch = ch;
 
-        Ret = SendMessage(infoPtr->hParent,
-                          WM_NOTIFY,
-                          (WPARAM)mnmh.hdr.idFrom,
-                          (LPARAM)&mnmh);
+        Ret = SendMessageW(infoPtr->hParent,
+                           WM_NOTIFY,
+                           (WPARAM)mnmh.hdr.idFrom,
+                           (LPARAM)&mnmh);
     }
 
     return Ret;
diff --git a/reactos/base/applications/charmap/precomp.h b/reactos/base/applications/charmap/precomp.h
index 0f1185b0f32..2f9713c3cb9 100644
--- a/reactos/base/applications/charmap/precomp.h
+++ b/reactos/base/applications/charmap/precomp.h
@@ -2,7 +2,6 @@
 #define __CHARMAP_PRECOMP_H
 #include <windows.h>
 #include <stdio.h>
-#include <tchar.h>
 #include <commctrl.h>
 #include "resource.h"