diff --git a/src/cheat/CheatCodeDialog.cxx b/src/cheat/CheatCodeDialog.cxx
index 7c7aa526f..45bccd57e 100644
--- a/src/cheat/CheatCodeDialog.cxx
+++ b/src/cheat/CheatCodeDialog.cxx
@@ -36,7 +36,7 @@ CheatCodeDialog::CheatCodeDialog(OSystem& osystem, DialogContainer& parent,
   : Dialog(osystem, parent, font, "Cheat codes")
 {
   const int lineHeight   = Dialog::lineHeight(),
-            fontHeight   = Dialog::fontHeight(),
+            //fontHeight   = Dialog::fontHeight(),
             fontWidth    = Dialog::fontWidth(),
             buttonHeight = Dialog::buttonHeight(),
             buttonWidth  = Dialog::buttonWidth("One shot "),
diff --git a/src/gui/BrowserDialog.cxx b/src/gui/BrowserDialog.cxx
index 050e56831..5506c4bc3 100644
--- a/src/gui/BrowserDialog.cxx
+++ b/src/gui/BrowserDialog.cxx
@@ -35,8 +35,8 @@ BrowserDialog::BrowserDialog(GuiObject* boss, const GUI::Font& font,
   _w = max_w;
   _h = max_h;
   const int lineHeight   = Dialog::lineHeight(),
-            fontHeight   = Dialog::fontHeight(),
-            fontWidth    = Dialog::fontWidth(),
+            //fontHeight   = Dialog::fontHeight(),
+            //fontWidth    = Dialog::fontWidth(),
             buttonHeight = Dialog::buttonHeight(),
             buttonWidth  = Dialog::buttonWidth("Base Dir"),
             BUTTON_GAP   = Dialog::buttonGap(),
diff --git a/src/gui/Dialog.hxx b/src/gui/Dialog.hxx
index 478080760..43069d0bb 100644
--- a/src/gui/Dialog.hxx
+++ b/src/gui/Dialog.hxx
@@ -135,10 +135,10 @@ class Dialog : public GuiObject
       return _font.getStringWidth(label) + fontWidth() * 2.5;
     }
     int buttonGap() const { return fontWidth(); }
-    int hBorder() const { return fontWidth() * 1.25; };
-    int vBorder() const { return fontHeight() / 2; };
-    int vGap() const { return fontHeight() / 4; };
-    int indent() const { return fontWidth() * 2; };
+    int hBorder() const { return fontWidth() * 1.25; }
+    int vBorder() const { return fontHeight() / 2; }
+    int vGap() const { return fontHeight() / 4; }
+    int indent() const { return fontWidth() * 2; }
 
   protected:
     void draw() override { }
diff --git a/src/gui/GlobalPropsDialog.cxx b/src/gui/GlobalPropsDialog.cxx
index bc58e5012..1bf158ccb 100644
--- a/src/gui/GlobalPropsDialog.cxx
+++ b/src/gui/GlobalPropsDialog.cxx
@@ -136,8 +136,8 @@ GlobalPropsDialog::GlobalPropsDialog(GuiObject* boss, const GUI::Font& font)
 int GlobalPropsDialog::addHoldWidgets(const GUI::Font& font, int x, int y,
                                       WidgetArray& wid)
 {
-  const int fontHeight = Dialog::fontHeight(),
-            fontWidth  = Dialog::fontWidth(),
+  const int fontWidth  = Dialog::fontWidth(),
+            //fontHeight = Dialog::fontHeight(),
             VGAP       = Dialog::vGap();
   int xpos = x, ypos = y, xdiff = CheckboxWidget::boxSize(font) - 9;
 
diff --git a/src/gui/LauncherDialog.cxx b/src/gui/LauncherDialog.cxx
index e392f2150..ffb191157 100644
--- a/src/gui/LauncherDialog.cxx
+++ b/src/gui/LauncherDialog.cxx
@@ -71,8 +71,7 @@ LauncherDialog::LauncherDialog(OSystem& osystem, DialogContainer& parent,
             BUTTON_GAP   = Dialog::buttonGap(),
             VBORDER      = Dialog::vBorder(),
             HBORDER      = Dialog::hBorder(),
-            VGAP         = Dialog::vGap(),
-            INDENT       = Dialog::indent();
+            VGAP         = Dialog::vGap();
   const int LBL_GAP      = fontWidth,
             buttonHeight = myUseMinimalUI ? lineHeight - VGAP * 2: Dialog::buttonHeight(),
             buttonWidth  = (_w - 2 * HBORDER - BUTTON_GAP * (4 - 1));
diff --git a/src/gui/OptionsDialog.cxx b/src/gui/OptionsDialog.cxx
index 73e423807..397306ce1 100644
--- a/src/gui/OptionsDialog.cxx
+++ b/src/gui/OptionsDialog.cxx
@@ -54,12 +54,10 @@ OptionsDialog::OptionsDialog(OSystem& osystem, DialogContainer& parent,
 {
   // do not show basic settings options in debugger
   bool minSettings = osystem.settings().getBool("minimal_ui") && mode != Menu::AppMode::debugger;
-  const int lineHeight   = Dialog::lineHeight(),
-            buttonHeight = Dialog::buttonHeight(),
+  const int buttonHeight = Dialog::buttonHeight(),
             VBORDER      = Dialog::vBorder(),
             HBORDER      = Dialog::hBorder(),
-            VGAP         = Dialog::vGap(),
-            INDENT       = Dialog::indent();
+            VGAP         = Dialog::vGap();
   const int HGAP      = Dialog::buttonGap(),
             rowHeight = buttonHeight + VGAP;
   int buttonWidth = Dialog::buttonWidth("Game Properties" + ELLIPSIS);