Index: rtl/win/wininc/messages.inc
===================================================================
--- rtl/win/wininc/messages.inc	(revision 8109)
+++ rtl/win/wininc/messages.inc	(working copy)
@@ -729,10 +729,13 @@
      TCM_GETITEMA = 4869;
      TCM_INSERTITEMA = 4871;
      TCM_SETITEMA = 4870;
+     TCM_SETUNICODEFORMAT = 8197; // = CCM_SETUNICODEFORMAT
+     TCM_GETUNICODEFORMAT = 8198; // = CCM_GETUNICODEFORMAT
+
 {$ifdef UNICODE}
 
   const
-     TCM_GETITEM = TCM_GETITEM;
+     TCM_GETITEM = TCM_GETITEMW;
      TCM_INSERTITEM = TCM_INSERTITEMW;
      TCM_SETITEM = TCM_SETITEMW;
 {$else}