diff --git a/lcl/include/application.inc b/lcl/include/application.inc
index ff6df83154..5dba7ff4fd 100644
--- a/lcl/include/application.inc
+++ b/lcl/include/application.inc
@@ -859,7 +859,8 @@ begin
     //DebugLn(['TApplication.ShowHintWindow FHintWindow.Color=',dbgs(FHintWindow.Color),' HintInfo.HintColor=',dbgs(HintInfo.HintColor)]);
 
     //debugln('TApplication.ShowHintWindow B HintWinRect=',dbgs(HintWinRect),' HintStr="',DbgStr(HintInfo.HintStr),'"');
-    FHintWindow.ActivateWithData(HintWinRect, HintInfo.HintStr, HintInfo.HintData);
+    FHintWindow.HintRectAdjust := HintWinRect;
+    FHintWindow.ActivateText(HintInfo.HintStr);
     FHintRect := HintInfo.CursorRect;
     // start hide timer
     StartHintTimer(HintInfo.HideTimeout,ahttHideHint);
diff --git a/lcl/include/sysenvapis_mac.inc b/lcl/include/sysenvapis_mac.inc
index b0f3d1a7df..c5eb067761 100644
--- a/lcl/include/sysenvapis_mac.inc
+++ b/lcl/include/sysenvapis_mac.inc
@@ -3,7 +3,6 @@
 // Open a given URL with the default browser
 function OpenURL(AURL: String): Boolean;
 var
-  cf: CFStringRef;
   url: CFURLRef;
 begin
   if AURL = '' then