diff --git a/src/ce_gdb.pas b/src/ce_gdb.pas
index 49e84292..e7317ad5 100644
--- a/src/ce_gdb.pas
+++ b/src/ce_gdb.pas
@@ -234,10 +234,10 @@ begin
     nme := doc.fileName;
     if not nme.fileExists then
       continue;
-    {$WARNINGS OFF}
+    {$PUSH}{$WARNINGS OFF}{$HINTS OFF}
     for j := 0 to doc.breakPointsCount-1 do
       fFileLineBrks.AddObject(nme, TObject(pointer(doc.BreakPointLine(j))));
-    {$WARNINGS ON}
+    {$POP}
   end;
 end;
 
diff --git a/src/ce_symlist.pas b/src/ce_symlist.pas
index 7bb5d452..9b29dfb9 100644
--- a/src/ce_symlist.pas
+++ b/src/ce_symlist.pas
@@ -641,9 +641,9 @@ begin
   if Tree.Selected.isNil then exit;
   if Tree.Selected.Data.isNil then exit;
   //
-  {$HINTS OFF}
+  {$PUSH}{$WARNINGS OFF}{$HINTS OFF}
   line := NativeUInt(Tree.Selected.Data);
-  {$HINTS ON}
+  {$POP}
   fDoc.CaretY := line;
   fDoc.SelectLine;
 end;
@@ -727,9 +727,9 @@ var
   i: Integer;
 begin
   cat := getCatNode(origin, sym.symType);
-  {$HINTS OFF}
+  {$PUSH}{$WARNINGS OFF}{$HINTS OFF}
   node := tree.Items.AddChildObject(cat, sym.name, Pointer(sym.fline));
-  {$HINTS ON}
+  {$POP}
   if not fShowChildCategories then node := nil;
   cat.Visible:=true;
   for i := 0 to sym.subs.Count-1 do
@@ -796,9 +796,9 @@ var
         'Alias', 'Enum', 'Import', 'Variable':
           continue;
       end;
-      {$HINTS OFF}
+      {$PUSH}{$WARNINGS OFF}{$HINTS OFF}
       line := NativeUInt(root.Items[i].Data);
-      {$HINTS ON}
+      {$POP}
       if line > target then
         continue;
       if line > nearest then