diff --git a/ide/environmentopts.pp b/ide/environmentopts.pp
index 11075010da..ea370c5f52 100644
--- a/ide/environmentopts.pp
+++ b/ide/environmentopts.pp
@@ -1127,7 +1127,6 @@ var
 
 var
   Path: String;
-  SubPath: String;
   CurPath: String;
   i, j: Integer;
   Rec: PIDEOptionsGroupRec;
@@ -1525,7 +1524,6 @@ var
 
 var
   Path: String;
-  SubPath: String;
   i, j: Integer;
   NodeName: String;
   Rec: PIDEOptionsGroupRec;
diff --git a/ide/frames/toolbar_options.pas b/ide/frames/toolbar_options.pas
index 0d88163536..b6bc25cc75 100644
--- a/ide/frames/toolbar_options.pas
+++ b/ide/frames/toolbar_options.pas
@@ -66,8 +66,8 @@ type
     procedure cbBorderStyleChange(Sender: TObject);
     procedure cbGrabStyleChange(Sender: TObject);
     procedure cbToolBarVisibleClick(Sender: TObject);
-    procedure CoolBarMouseDown(Sender: TObject; Button: TMouseButton;
-      Shift: TShiftState; X, Y: integer);
+    procedure CoolBarMouseDown(Sender: TObject; {%H-}Button: TMouseButton;
+      {%H-}Shift: TShiftState; X, Y: integer);
     procedure CoolbarResize(Sender: TObject);
     procedure spGrabWidthChange(Sender: TObject);
     procedure tmWaitTimer(Sender: TObject);
@@ -82,7 +82,7 @@ type
     constructor Create(AOwner: TComponent); override;
     destructor Destroy; override;
     function GetTitle: string; override;
-    procedure Setup(ADialog: TAbstractOptionsEditorDialog); override;
+    procedure Setup({%H-}ADialog: TAbstractOptionsEditorDialog); override;
     procedure ReadSettings(AOptions: TAbstractIDEOptions); override;
     procedure WriteSettings(AOptions: TAbstractIDEOptions); override;
     class function SupportedOptionsClass: TAbstractIDEOptionsClass; override;
diff --git a/ide/newdialog.pas b/ide/newdialog.pas
index b2886b4f28..af92fc1511 100644
--- a/ide/newdialog.pas
+++ b/ide/newdialog.pas
@@ -71,7 +71,7 @@ type
     function IndexOf(const CategoryName: string): integer; override;
     function FindByName(const CategoryName: string): TNewIDEItemCategory; override;
     procedure RegisterItem(const Paths: string; NewItem: TNewIDEItemTemplate); override;
-    procedure UnregisterItem(NewItem: TNewIDEItemTemplate); override;
+    procedure UnregisterItem({%H-}NewItem: TNewIDEItemTemplate); override;
     function FindCategoryByPath(const Path: string;
       ErrorOnNotFound: boolean): TNewIDEItemCategory; override;
   end;
diff --git a/ide/sourceeditor.pp b/ide/sourceeditor.pp
index 9612d66a1c..e3efd47e6d 100644
--- a/ide/sourceeditor.pp
+++ b/ide/sourceeditor.pp
@@ -292,7 +292,7 @@ type
     procedure UpdateIfDefNodeStates(Force: Boolean = False);
   protected
     procedure DoMultiCaretBeforeCommand(Sender: TObject; ACommand: TSynEditorCommand;
-      var AnAction: TSynMultiCaretCommandAction; var AFlags: TSynMultiCaretCommandFlags);
+      var AnAction: TSynMultiCaretCommandAction; var {%H-}AFlags: TSynMultiCaretCommandFlags);
     procedure ProcessCommand(Sender: TObject;
        var Command: TSynEditorCommand; var AChar: TUTF8Char; {%H-}Data: pointer);
     procedure ProcessUserCommand(Sender: TObject;
diff --git a/ide/toolbarconfig.pas b/ide/toolbarconfig.pas
index 8f48d59a35..f5ddf4b1e1 100644
--- a/ide/toolbarconfig.pas
+++ b/ide/toolbarconfig.pas
@@ -73,9 +73,9 @@ type
     procedure btnMoveUpClick(Sender: TObject);
     procedure btnRemoveClick(Sender: TObject);
     procedure lvToolbarDrawItem(Sender: TCustomListView; AItem: TListItem;
-      ARect: TRect; AState: TOwnerDrawState);
-    procedure lvToolbarSelectItem(Sender: TObject; Item: TListItem;
-      Selected: Boolean);
+      ARect: TRect; {%H-}AState: TOwnerDrawState);
+    procedure lvToolbarSelectItem(Sender: TObject; {%H-}Item: TListItem;
+      {%H-}Selected: Boolean);
     procedure TVSelectionChanged(Sender: TObject);
   private
     Image: TBitMap;
@@ -91,9 +91,9 @@ type
     procedure LoadCategories;
     procedure AddMenuItem(ParentNode: TTreeNode; Item: TIDEMenuItem; Level: Integer);
     function RootNodeCaption(Item: TIDEMenuItem): string;
-    procedure AddListItem(Item: TIDEMenuItem; PMask: Integer);
-    procedure AddToolBarItem(Item: TIDEMenuItem; PMask: Integer);
-    procedure AddDivider(PMask: Integer);
+    procedure AddListItem(Item: TIDEMenuItem);
+    procedure AddToolBarItem(Item: TIDEMenuItem);
+    procedure AddDivider;
     procedure FillToolBar;
   public
     procedure LoadSettings(const SL: TStringList);
@@ -521,7 +521,7 @@ begin
   end;
 end;
 
-procedure TToolBarConfig.AddListItem(Item: TIDEMenuItem; PMask: Integer);
+procedure TToolBarConfig.AddListItem(Item: TIDEMenuItem);
 var
   aListItem: TLvItem;
 begin
@@ -536,7 +536,7 @@ begin
   end;
 end;
 
-procedure TToolBarConfig.AddToolBarItem(Item: TIDEMenuItem; PMask: Integer);
+procedure TToolBarConfig.AddToolBarItem(Item: TIDEMenuItem);
 Var
   n: TTreeNode;
   ACaption: string;
@@ -561,7 +561,7 @@ begin
   end;
 end;
 
-procedure TToolBarConfig.AddDivider(PMask: Integer);
+procedure TToolBarConfig.AddDivider;
 var
   lvItem: TListItem;
 begin
@@ -578,7 +578,6 @@ var
   I: Integer;
   aListItem: TLvItem;
   aCaption: string;
-  aPMask: Integer;
   mi: TIDEMenuItem;
 begin
   for I:= 0 to MainList.Count -1 do
@@ -587,9 +586,9 @@ begin
     mi := aListItem.Item;
     aCaption  := MainList.Strings[I];
     if aCaption = cDivider then
-      AddDivider(aPMask)
+      AddDivider
     else
-      AddToolBarItem(mi, aPMask);
+      AddToolBarItem(mi);
     aListItem.LvIndex:= lvToolbar.Items.Count - 1;
   end;
 end;
@@ -607,11 +606,11 @@ begin
     begin
       if Value = cDivider then
       begin
-        AddListItem(nil, 0);
+        AddListItem(nil);
         Continue;
       end;
       MI := IDEMenuRoots.FindByPath(Value, false);
-      AddListItem(MI, 0);
+      AddListItem(MI);
     end;
   end;
   FillToolBar;