diff --git a/gui/aboutdlg.cc b/gui/aboutdlg.cc
index 4eb3539b4..9b6994dfc 100644
--- a/gui/aboutdlg.cc
+++ b/gui/aboutdlg.cc
@@ -21,11 +21,11 @@
 //
 
 #include "aboutdlg.h"
-#include <QTextCursor>                // for QTextCursor
-#include <QTextDocument>              // for QTextDocument
-#include <QTextEdit>                  // for QTextEdit
-#include "appname.h"                  // for appName
-#include "upgrade.h"                  // for UpgradeCheck
+#include <QTextCursor>    // for QTextCursor
+#include <QTextDocument>  // for QTextDocument
+#include <QTextEdit>      // for QTextEdit
+#include "appname.h"      // for appName
+#include "upgrade.h"      // for UpgradeCheck
 
 
 AboutDlg::AboutDlg(QWidget* parent, const QString& ver1,
diff --git a/gui/aboutdlg.h b/gui/aboutdlg.h
index 578d089e1..c5a5a0be6 100644
--- a/gui/aboutdlg.h
+++ b/gui/aboutdlg.h
@@ -23,10 +23,10 @@
 #ifndef ABOUTDLG_H
 #define ABOUTDLG_H
 
-#include <QString>            // for QString
-#include <QDialog>            // for QDialog
-#include <QWidget>            // for QWidget
-#include "ui_aboutui.h"       // for Ui_AboutDlg
+#include <QDialog>       // for QDialog
+#include <QString>       // for QString
+#include <QWidget>       // for QWidget
+#include "ui_aboutui.h"  // for Ui_AboutDlg
 
 class AboutDlg: public QDialog
 {
diff --git a/gui/advdlg.cc b/gui/advdlg.cc
index 6d3aae766..572e50313 100644
--- a/gui/advdlg.cc
+++ b/gui/advdlg.cc
@@ -19,11 +19,11 @@
 //  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301,
 //  USA.
 //
-#include <QMessageBox>
-#include <QProcess>
-#include <QFileDialog>
-#include <QSettings>
+
 #include "advdlg.h"
+#include <QCheckBox>         // for QCheckBox
+#include <QComboBox>         // for QComboBox
+#include <QDialogButtonBox>  // for QDialogButtonBox
 
 //------------------------------------------------------------------------
 AdvDlg::AdvDlg(QWidget* parent,
diff --git a/gui/advdlg.h b/gui/advdlg.h
index bf4fe7a1b..e1987a2a2 100644
--- a/gui/advdlg.h
+++ b/gui/advdlg.h
@@ -22,7 +22,11 @@
 #ifndef ADVDLG_H
 #define ADVDLG_H
 
-#include "ui_advui.h"
+#include <QDialog>      // for QDialog
+#include <QObject>      // for Q_OBJECT, slots
+#include <QPushButton>  // for QPushButton
+#include <QWidget>      // for QWidget
+#include "ui_advui.h"   // for Ui_AdvUi
 
 class AdvDlg: public QDialog
 {
diff --git a/gui/babeldata.h b/gui/babeldata.h
index 9adb4dcd5..b81254213 100644
--- a/gui/babeldata.h
+++ b/gui/babeldata.h
@@ -23,10 +23,15 @@
 #ifndef BABELDATA_H
 #define BABELDATA_H
 
-#include <QSettings>
-#include <QStringList>
-#include <QUuid>
-#include "setting.h"
+#include <QDate>        // for QDate
+#include <QDateTime>    // for QDateTime
+#include <QList>        // for QList
+#include <QSettings>    // for QSettings
+#include <QString>      // for QString
+#include <QStringList>  // for QStringList
+#include <QTime>        // for QTime
+#include <QUuid>        // for QUuid
+#include "setting.h"    // for SettingGroup, BoolSetting, StringSetting, IntSetting, DateTimeSetting
 
 
 class BabelData
diff --git a/gui/donate.cc b/gui/donate.cc
index 7671e5313..1b221a326 100644
--- a/gui/donate.cc
+++ b/gui/donate.cc
@@ -20,8 +20,11 @@
 //
 
 #include "donate.h"
-#include <QUrl>
-#include <QDesktopServices>
+#include <QAbstractButton>   // for QAbstractButton
+#include <QDesktopServices>  // for QDesktopServices
+#include <QPushButton>       // for QPushButton
+#include <QString>           // for QString
+#include <QUrl>              // for QUrl
 
 // A completely simple QDialog, in a class of its own for layout.
 Donate::Donate(QWidget* parent) : QDialog(parent)
diff --git a/gui/donate.h b/gui/donate.h
index 8e8f539b2..5a9371f9b 100644
--- a/gui/donate.h
+++ b/gui/donate.h
@@ -22,7 +22,12 @@
 #ifndef DONATE_H
 #define DONATE_H
 
-#include "ui_donate.h"
+#include <QCheckBox>    // for QCheckBox
+#include <QDialog>      // for QDialog
+#include <QLabel>       // for QLabel
+#include <QObject>      // for Q_OBJECT, slots
+#include <QWidget>      // for QWidget
+#include "ui_donate.h"  // for Ui_Donate
 
 class Donate: public QDialog
 {
diff --git a/gui/filterdata.cc b/gui/filterdata.cc
index 3c77d3a4a..8fbcfdca2 100644
--- a/gui/filterdata.cc
+++ b/gui/filterdata.cc
@@ -22,6 +22,9 @@
 //------------------------------------------------------------------------
 
 #include "filterdata.h"
+#include <QChar>    // for QChar
+#include <QDate>    // for QDate
+#include <QVector>  // for QVector
 
 QStringList WayPtsFilterData::makeOptionString()
 {
diff --git a/gui/filterdata.h b/gui/filterdata.h
index 9bde74b8a..beb3b5b6a 100644
--- a/gui/filterdata.h
+++ b/gui/filterdata.h
@@ -23,10 +23,13 @@
 #ifndef FILTERDATA_H
 #define FILTERDATA_H
 
-#include <QDateTime>
-#include <QSettings>
-#include <QStringList>
-#include "setting.h"
+#include <QDateTime>    // for QDateTime
+#include <QList>        // for QList
+#include <QSettings>    // for QSettings
+#include <QString>      // for QString
+#include <QStringList>  // for QStringList
+#include <QTime>        // for QTime
+#include "setting.h"    // for BoolSetting, SettingGroup, IntSetting, DoubleSetting, DateTimeSetting, StringSetting
 
 //------------------------------------------------------------------------
 
diff --git a/gui/filterdlg.cc b/gui/filterdlg.cc
index d00f6e1fd..0bd2e7d6c 100644
--- a/gui/filterdlg.cc
+++ b/gui/filterdlg.cc
@@ -21,10 +21,16 @@
 //
 //------------------------------------------------------------------------
 
-#include <QMessageBox>
 #include "filterdlg.h"
-#include "help.h"
-#include "appname.h"
+#include <QAbstractButton>  // for QAbstractButton
+#include <QFrame>           // for QFrame
+#include <QHBoxLayout>      // for QHBoxLayout
+#include <QListWidget>      // for QListWidget
+#include <QMessageBox>      // for QMessageBox, operator|
+#include <QPushButton>      // for QPushButton
+#include <Qt>               // for CheckState
+#include "appname.h"        // for appName
+#include "help.h"           // for ShowHelp
 
 int FilterDialog::lastPage_ = 0;
 
diff --git a/gui/filterdlg.h b/gui/filterdlg.h
index 3ec2e71d3..ddc3a6c15 100644
--- a/gui/filterdlg.h
+++ b/gui/filterdlg.h
@@ -23,10 +23,16 @@
 #ifndef FILTER_H
 #define FILTER_H
 
-#include <QStackedWidget>
-#include "ui_filterui.h"
-#include "filterdata.h"
-#include "filterwidgets.h"
+#include <QDialog>          // for QDialog
+#include <QList>            // for QList
+#include <QListWidgetItem>  // for QListWidgetItem
+#include <QObject>          // for Q_OBJECT, slots
+#include <QStackedWidget>   // for QStackedWidget
+#include <QString>          // for QString
+#include <QWidget>          // for QWidget
+#include "filterdata.h"     // for AllFiltersData
+#include "filterwidgets.h"  // for FilterWidget
+#include "ui_filterui.h"    // for Ui_FilterDlg
 
 class FilterDialog: public QDialog
 {
diff --git a/gui/filterwidgets.cc b/gui/filterwidgets.cc
index 9600149a9..521d0e8ff 100644
--- a/gui/filterwidgets.cc
+++ b/gui/filterwidgets.cc
@@ -27,13 +27,13 @@
 
 #include <QChar>         // for QChar
 #include <QCheckBox>     // for QCheckBox
-#include <QEvent>        // for QEvent, QEvent::LocaleChange
+#include <QEvent>        // for QEvent
 #include <QLabel>        // for QLabel
 #include <QRadioButton>  // for QRadioButton
 #if (QT_VERSION >= QT_VERSION_CHECK(6, 7, 0))
 #include <QTimeZone>     // for QTimeZone
 #endif
-#include <Qt>            // for LocalTime, UTC
+#include <Qt>            // for TimeSpec
 
 
 //------------------------------------------------------------------------
diff --git a/gui/format.cc b/gui/format.cc
index 1b27b132d..39bbc0710 100644
--- a/gui/format.cc
+++ b/gui/format.cc
@@ -21,7 +21,6 @@
 //
 //------------------------------------------------------------------------
 #include "format.h"
-#include "mainwindow.h"
 
 QString Format::htmlBase_ = QString();
 
diff --git a/gui/format.h b/gui/format.h
index 237740b76..e6000363b 100644
--- a/gui/format.h
+++ b/gui/format.h
@@ -23,10 +23,11 @@
 #ifndef FORMAT_H
 #define FORMAT_H
 
-#include <QString>
-#include <QVariant>
-#include <QStringList>
-#include <QSettings>
+#include <QList>        // for QList
+#include <QSettings>    // for QSettings
+#include <QString>      // for QString
+#include <QStringList>  // for QStringList
+#include <QVariant>     // for QVariant
 
 class FormatOption
 {
diff --git a/gui/formatload.cc b/gui/formatload.cc
index 046e16f12..8b7382259 100644
--- a/gui/formatload.cc
+++ b/gui/formatload.cc
@@ -22,19 +22,18 @@
 //------------------------------------------------------------------------
 
 #include "formatload.h"
-#include <QByteArray>                      // for QByteArray
-#include <QChar>                           // for operator==, QChar
-#include <QCoreApplication>                // for QCoreApplication
-#include <QObject>                         // for QObject
-#include <QProcess>                        // for QProcess
-#include <QRegularExpression>              // for QRegularExpression
-#include <QRegularExpressionMatch>         // for QRegularExpressionMatch
-#include <QString>                         // for QString, operator+
-#include <QTextStream>                     // for QTextStream
-#include <QVariant>                        // for QVariant
-#include <QApplication>                    // for QApplication
-#include <QMessageBox>                     // for QMessageBox
-#include "appname.h"                       // for appName
+#include <QApplication>        // for QApplication
+#include <QByteArray>          // for QByteArray
+#include <QChar>               // for QChar, operator==
+#include <QCoreApplication>    // for QCoreApplication
+#include <QMessageBox>         // for QMessageBox
+#include <QObject>             // for QObject
+#include <QProcess>            // for QProcess
+#include <QRegularExpression>  // for QRegularExpression, QRegularExpressionMatch
+#include <QString>             // for QString, operator+
+#include <QTextStream>         // for QTextStream
+#include <QVariant>            // for QVariant
+#include "appname.h"           // for appNam
 
 
 #ifdef GENERATE_CORE_STRINGS
diff --git a/gui/formatload.h b/gui/formatload.h
index 2bcacd130..1d07bead2 100644
--- a/gui/formatload.h
+++ b/gui/formatload.h
@@ -25,10 +25,10 @@
 #ifndef FORMATLOAD_H
 #define FORMATLOAD_H
 
-#include <QList>               // for QList
-#include <QStringList>         // for QStringList
+#include <QList>        // for QList
+#include <QStringList>  // for QStringList
 
-#include "format.h"            // for Format
+#include "format.h"     // for Format
 
 class FormatLoad
 {
diff --git a/gui/gmapdlg.cc b/gui/gmapdlg.cc
index 02de27d17..8ce1887dc 100644
--- a/gui/gmapdlg.cc
+++ b/gui/gmapdlg.cc
@@ -21,12 +21,24 @@
 //
 //------------------------------------------------------------------------
 
-#include <QStandardItemModel>
-#include <QMenu>
-#include <QHeaderView>
 #include "gmapdlg.h"
-#include "appname.h"
-#include "gpx.h"
+#include <QAbstractButton>      // for QAbstractButton
+#include <QAbstractItemView>    // for QAbstractItemView
+#include <QDateTime>            // for QDateTime, operator<, operator>
+#include <QFrame>               // for QFrame
+#include <QHBoxLayout>          // for QHBoxLayout
+#include <QHeaderView>          // for QHeaderView
+#include <QItemSelectionModel>  // for QItemSelectionModel
+#include <QMenu>                // for QMenu
+#include <QPushButton>          // for QPushButton
+#include <QStandardItemModel>   // for QStandardItemModel
+#include <QTreeView>            // for QTreeView
+#include <QVariant>             // for QVariant
+#include <Qt>                   // for CheckState, ContextMenuPolicy
+#include <QtGlobal>             // for QForeachContainer, qMakeForeachContainer, foreach
+#include "appname.h"            // for appName
+#include "gpx.h"                // for GpxWaypoint, GpxTrack, GpxRoute, Gpx, GpxItem, GpxTrackPoint, GpxTrackSegment
+#include "latlng.h"             // for LatLn
 
 //------------------------------------------------------------------------
 class StandardItem: public QStandardItem
diff --git a/gui/gmapdlg.h b/gui/gmapdlg.h
index 461c89cab..f8ab32bb6 100644
--- a/gui/gmapdlg.h
+++ b/gui/gmapdlg.h
@@ -23,12 +23,20 @@
 #ifndef GMAPDLG_H
 #define GMAPDLG_H
 
-#include <QStackedWidget>
-#include <QStandardItem>
-#include <QModelIndex>
-#include "ui_gmapui.h"
-#include "gpx.h"
-#include "map.h"
+#include <QDialog>             // for QDialog
+#include <QItemSelection>      // for QItemSelection
+#include <QList>               // for QList
+#include <QModelIndex>         // for QModelIndex
+#include <QObject>             // for Q_OBJECT, slots
+#include <QPlainTextEdit>      // for QPlainTextEdit
+#include <QPoint>              // for QPoint
+#include <QStandardItem>       // for QStandardItem
+#include <QStandardItemModel>  // for QStandardItemModel
+#include <QString>             // for QString
+#include <QWidget>             // for QWidget
+#include "gpx.h"               // for Gpx, GpxRoute, GpxTrack, GpxWaypoint
+#include "map.h"               // for Map
+#include "ui_gmapui.h"         // for Ui_GMapDlg
 
 class GMapDialog: public QDialog
 {
diff --git a/gui/gpx.cc b/gui/gpx.cc
index 32c99b31f..ba2ce2c08 100644
--- a/gui/gpx.cc
+++ b/gui/gpx.cc
@@ -21,13 +21,12 @@
 //
 //------------------------------------------------------------------------
 
-
+#include "gpx.h"
 #include <QFile>                 // for QFile
-#include <QIODevice>             // for QIODevice, QIODevice::ReadOnly
-#include <QStringView>           // for QStringView
+#include <QIODevice>             // for QIODevice
+#include <QStringView>           // for QStringView, operator==
 #include <QXmlStreamAttributes>  // for QXmlStreamAttributes
-#include <QXmlStreamReader>      // for QXmlStreamReader, QXmlStreamReader::Characters, QXmlStreamReader::EndDocument, QXmlStreamReader::EndElement, QXmlStreamReader::Invalid, QXmlStreamReader::StartElement
-#include "gpx.h"
+#include <QXmlStreamReader>      // for QXmlStreamReader
 
 
 static QDateTime decodeDateTime(const QString& s)
diff --git a/gui/gpx.h b/gui/gpx.h
index 8d7f1ff21..473cf178b 100644
--- a/gui/gpx.h
+++ b/gui/gpx.h
@@ -23,11 +23,11 @@
 #ifndef GPX_H
 #define GPX_H
 
-#include <QDateTime>             // for QDateTime
-#include <QList>                 // for QList
-#include <QString>               // for QString
-#include <QtGlobal>              // for foreach
-#include "latlng.h"              // for LatLng
+#include <QDateTime>         // for QDateTime
+#include <QList>             // for QList
+#include <QString>           // for QString
+#include <QtGlobal>          // for QForeachContainer, qMakeForeachContainer, foreach
+#include "latlng.h"          // for LatLng
 
 
 //------------------------------------------------------------------------
diff --git a/gui/help.cc b/gui/help.cc
index cc169d735..f939da2fa 100644
--- a/gui/help.cc
+++ b/gui/help.cc
@@ -22,12 +22,12 @@
 //------------------------------------------------------------------------
 #include "help.h"
 
-#include <QRegularExpression>         // for QRegularExpression
-#include <QString>                    // for QString
-#include <QUrl>                       // for QUrl
-#include <QDesktopServices>           // for QDesktopServices
+#include <QDesktopServices>    // for QDesktopServices
+#include <QRegularExpression>  // for QRegularExpression
+#include <QString>             // for QString, operator+
+#include <QUrl>                // for QUrl
 
-#include "format.h"                   // for Format
+#include "format.h"            // for Format
 
 //------------------------------------------------------------------------
 void ShowHelp(const QString& urlIn)
diff --git a/gui/help.h b/gui/help.h
index d7b8b1370..8880cdeec 100644
--- a/gui/help.h
+++ b/gui/help.h
@@ -22,7 +22,7 @@
 
 #ifndef HELP_H
 #define HELP_H
-#include <QString>         // for QString
+#include <QString>  // for QString
 
 extern void ShowHelp(const QString& name);
 
diff --git a/gui/latlng.cc b/gui/latlng.cc
index 748366527..7f697462d 100644
--- a/gui/latlng.cc
+++ b/gui/latlng.cc
@@ -21,7 +21,7 @@
 //
 //------------------------------------------------------------------------
 #include "latlng.h"
-#include <cmath>
+#include <cmath>  // for cos, sin, asin, sqrt
 
 
 // copied from the web somewhere.
diff --git a/gui/main.cc b/gui/main.cc
index 84b08c1fe..a6f942dfc 100644
--- a/gui/main.cc
+++ b/gui/main.cc
@@ -20,11 +20,12 @@
 //  USA.
 //
 //------------------------------------------------------------------------
-#include <QtGlobal>                // for QT_VERSION, QT_VERSION_CHECK
-#include <QIcon>                   // for QIcon
-#include <QApplication>            // for QApplication
+#include <QApplication>  // for QApplication
+#include <QIcon>         // for QIcon
+#include <QString>       // for QString
+#include <QtGlobal>      // for QT_VERSION, QT_VERSION_CHECK
 
-#include "mainwindow.h"             // for MainWindow
+#include "mainwindow.h"  // for MainWindow
 
 //------------------------------------------------------------------------
 int main(int argc, char** argv)
diff --git a/gui/mainwindow.cc b/gui/mainwindow.cc
index e1b0ad734..643ca9bcb 100644
--- a/gui/mainwindow.cc
+++ b/gui/mainwindow.cc
@@ -19,62 +19,61 @@
 //  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301,
 //  USA.
 //
-#include <QByteArray>                  // for QByteArray
-#include <QDate>                       // for QDate
-#include <QDateTime>                   // for QDateTime
-#include <QDir>                        // for QDir
-#include <QEvent>                      // for QEvent (& QEvent::LanguageChange, QEvent::LocaleChange)
-#include <QFile>                       // for QFile
-#include <QFileInfo>                   // for QFileInfo
-#include <QLibraryInfo>                // for QLibraryInfo, QLibraryInfo::TranslationsPath
-#include <QLocale>                     // for QLocale
-#include <QMimeData>                   // for QMimeData
-#include <QProcess>                    // for QProcess, QProcess::NotRunning
-#include <QSettings>                   // for QSettings
-#include <QString>                     // for QString
-#include <QStringList>                 // for QStringList
-#include <QTemporaryFile>              // for QTemporaryFile
-#include <QTime>                       // for QTime
-#include <QUrl>                        // for QUrl
-#include <QVariant>                    // for QVariant
-#include <Qt>                          // for SmoothTransformation, WaitCursor
-#include <QtGlobal>                    // for foreach
-#include <QCursor>                     // for QCursor
-#include <QDesktopServices>            // for QDesktopServices
-#include <QIcon>                       // for QIcon
-#include <QImage>                      // for QImage
-#include <QTextCharFormat>             // for QTextCharFormat
-#include <QAbstractButton>             // for QAbstractButton
-#include <QApplication>                // for QApplication, qApp
-#include <QCheckBox>                   // for QCheckBox
-#include <QDialogButtonBox>            // for QDialogButtonBox
-#include <QFileDialog>                 // for QFileDialog
-#include <QMessageBox>                 // for QMessageBox, operator|, QMessageBox::Yes, QMessageBox::No
-#include <QPlainTextEdit>              // for QPlainTextEdit
-#include <QPushButton>                 // for QPushButton
-#include <QRadioButton>                // for QRadioButton
-#include <QStackedWidget>              // for QStackedWidget
-
-#include <cstdlib>                     // for exit
-
 #include "mainwindow.h"
-#include "gbversion.h"                 // for VERSION
-#include "aboutdlg.h"                  // for AboutDlg
-#include "advdlg.h"                    // for AdvDlg
-#include "appname.h"                   // for appName
-#include "babeldata.h"                 // for BabelData
-#include "donate.h"                    // for Donate
-#include "filterdlg.h"                 // for FilterDialog
-#include "formatload.h"                // for FormatLoad
+#include <QAbstractButton>     // for QAbstractButton
+#include <QAction>             // for QAction
+#include <QApplication>        // for QApplication, qApp
+#include <QByteArray>          // for QByteArray
+#include <QCheckBox>           // for QCheckBox
+#include <QCursor>             // for QCursor
+#include <QDate>               // for QDate
+#include <QDateTime>           // for QDateTime
+#include <QDesktopServices>    // for QDesktopServices
+#include <QDialogButtonBox>    // for QDialogButtonBox
+#include <QDir>                // for QDir
+#include <QEvent>              // for QEvent
+#include <QFile>               // for QFile
+#include <QFileDialog>         // for QFileDialog
+#include <QFileInfo>           // for QFileInfo
+#include <QGradientStop>       // for QBrush
+#include <QImage>              // for QImage
+#include <QLibraryInfo>        // for QLibraryInfo
+#include <QLocale>             // for QLocale
+#include <QMessageBox>         // for QMessageBox, operator|
+#include <QMimeData>           // for QMimeData
+#include <QPlainTextEdit>      // for QPlainTextEdit
+#include <QProcess>            // for QProcess
+#include <QPushButton>         // for QPushButton
+#include <QRadioButton>        // for QRadioButton
+#include <QSettings>           // for QSettings
+#include <QStackedWidget>      // for QStackedWidget
+#include <QString>             // for QString, operator+, operator==, operator!=
+#include <QStringList>         // for QStringList
+#include <QTemporaryFile>      // for QTemporaryFile
+#include <QTextCharFormat>     // for QTextCharFormat
+#include <QTime>               // for QTime, operator==
+#include <QUrl>                // for QUrl
+#include <QVariant>            // for QVariant, operator!=
+#include <Qt>                  // for TransformationMode, DateFormat, CursorShape, GlobalColor
+#include <QtGlobal>            // for QForeachContainer, qMakeForeachContainer, foreach
+#include <cstdlib>             // for exit
+#include "aboutdlg.h"          // for AboutDlg
+#include "advdlg.h"            // for AdvDlg
+#include "appname.h"           // for appName
+#include "babeldata.h"         // for BabelData
+#include "donate.h"            // for Donate
+#include "filterdlg.h"         // for FilterDialog
+#include "formatload.h"        // for FormatLoad
+#include "gbversion.h"         // for VERSION, kVersionDate, kVersionSHA
 #ifndef DISABLE_MAPPREVIEW
-#include "gmapdlg.h"                   // for GMapDialog
+#include "gmapdlg.h"           // for GMapDialog
 #endif
-#include "help.h"                      // for ShowHelp
-#include "optionsdlg.h"                // for OptionsDlg
-#include "preferences.h"               // for Preferences
-#include "runmachine.h"                // for RunMachine
-#include "upgrade.h"                   // for UpgradeCheck
-#include "version_mismatch.h"          // for VersionMismatch
+#include "help.h"              // for ShowHelp
+#include "optionsdlg.h"        // for OptionsDlg
+#include "preferences.h"       // for Preferences
+#include "runmachine.h"        // for RunMachine
+#include "upgrade.h"           // for UpgradeCheck
+#include "version_mismatch.h"  // for VersionMismatch
 
 
 
diff --git a/gui/mainwindow.h b/gui/mainwindow.h
index c4e724204..99c77794e 100644
--- a/gui/mainwindow.h
+++ b/gui/mainwindow.h
@@ -22,28 +22,27 @@
 #ifndef MAINWINDOW_H
 #define MAINWINDOW_H
 
-#include <QEvent>                 // for QEvent
-#include <QList>                  // for QList
-#include <QObject>                // for QObject (& Q_OBJECT, slots)
-#include <QString>                // for QString
-#include <QStringList>            // for QStringList
-#include <QTranslator>            // for QTranslator
-#include <QCloseEvent>            // for QCloseEvent
-#include <QDragEnterEvent>        // for QDragEnterEvent
-#include <QDropEvent>             // for QDropEvent
-#include <QPixmap>                // for QPixmap
-#include <QAction>                // for QAction
-#include <QComboBox>              // for QComboBox
-#include <QLabel>                 // for QLabel
-#include <QLineEdit>              // for QLineEdit
-#include <QMainWindow>            // for QMainWindow
-#include <QWidget>                // for QWidget
-
-#include "babeldata.h"            // for BabelData
-#include "filterdata.h"           // for AllFiltersData
-#include "format.h"               // for Format
-#include "ui_mainwinui.h"         // for Ui_MainWindow
-#include "upgrade.h"              // for UpgradeCheck
+#include <QCloseEvent>      // for QCloseEvent
+#include <QComboBox>        // for QComboBox
+#include <QDragEnterEvent>  // for QDragEnterEvent
+#include <QDropEvent>       // for QDropEvent
+#include <QEvent>           // for QEvent
+#include <QLabel>           // for QLabel
+#include <QLineEdit>        // for QLineEdit
+#include <QList>            // for QList
+#include <QMainWindow>      // for QMainWindow
+#include <QObject>          // for Q_OBJECT, slots
+#include <QPixmap>          // for QPixmap
+#include <QString>          // for QString
+#include <QStringList>      // for QStringList
+#include <QTranslator>      // for QTranslator
+#include <QWidget>          // for QWidget
+
+#include "babeldata.h"      // for BabelData
+#include "filterdata.h"     // for AllFiltersData
+#include "format.h"         // for Format
+#include "ui_mainwinui.h"   // for Ui_MainWindow
+#include "upgrade.h"        // for UpgradeCheck
 
 
 class MainWindow: public QMainWindow
diff --git a/gui/map.cc b/gui/map.cc
index e6e82fa60..547a3f571 100644
--- a/gui/map.cc
+++ b/gui/map.cc
@@ -26,20 +26,19 @@
 #include <QChar>                  // for QChar, operator!=
 #include <QCursor>                // for QCursor
 #include <QFile>                  // for QFile
-#include <QIODevice>              // for QIODevice, operator|, QIODevice::ReadOnly, QIODevice::Truncate, QIODevice::WriteOnly
+#include <QIODevice>              // for QIODevice
 #include <QLatin1String>          // for QLatin1String
 #include <QMessageBox>            // for QMessageBox
 #include <QNetworkAccessManager>  // for QNetworkAccessManager
-#include <QStringLiteral>         // for QStringLiteral
+#include <QStringLiteral>         // for qMakeStringPrivate, QStringLiteral
 #include <QUrl>                   // for QUrl
 #include <QWebChannel>            // for QWebChannel
 #include <QWebEnginePage>         // for QWebEnginePage
-#include <QWebEngineSettings>     // for QWebEngineSettings, QWebEngineSettings::LocalContentCanAccessRemoteUrls
+#include <QWebEngineSettings>     // for QWebEngineSettings
 #include <QWebEngineView>         // for QWebEngineView
-#include <Qt>                     // for WaitCursor
-#include <QtGlobal>               // for foreach
+#include <Qt>                     // for CursorShape
+#include <QtGlobal>               // for QForeachContainer, qMakeForeachContainer, foreach
 
-#include <algorithm>              // for max
 #include <string>                 // for string
 #include <vector>                 // for vector
 
diff --git a/gui/map.h b/gui/map.h
index 892a3e840..bf1d7b19f 100644
--- a/gui/map.h
+++ b/gui/map.h
@@ -25,15 +25,13 @@
 
 #include <QByteArray>             // for QByteArray
 #include <QElapsedTimer>          // for QElapsedTimer
-#include <QFile>                  // for QFile
 #include <QList>                  // for QList
 #include <QNetworkAccessManager>  // for QNetworkAccessManager
-#include <QObject>                // for QObject, Q_OBJECT, emit, signals, slots
+#include <QObject>                // for QObject, emit, Q_OBJECT, signals, slots
 #include <QPlainTextEdit>         // for QPlainTextEdit
 #include <QResizeEvent>           // for QResizeEvent
 #include <QString>                // for QString
 #include <QStringList>            // for QStringList
-#include <QTextStream>            // for QTextStream
 #include <QWebEngineView>         // for QWebEngineView
 #include <QWidget>                // for QWidget
 
diff --git a/gui/optionsdlg.cc b/gui/optionsdlg.cc
index 59fabc516..dce863b8e 100644
--- a/gui/optionsdlg.cc
+++ b/gui/optionsdlg.cc
@@ -21,15 +21,22 @@
 //
 //------------------------------------------------------------------------
 
-#include <QVBoxLayout>
-#include <QDoubleValidator>
-#include <QIntValidator>
-#include <QPushButton>
-#include <QFileDialog>
-#include <QIcon>
-#include <QSpinBox>
 #include "optionsdlg.h"
-#include "help.h"
+#include <QAbstractButton>   // for QAbstractButton
+#include <QDoubleValidator>  // for QDoubleValidator
+#include <QFileDialog>       // for QFileDialog
+#include <QHBoxLayout>       // for QHBoxLayout
+#include <QIcon>             // for QIcon
+#include <QIntValidator>     // for QIntValidator
+#include <QPushButton>       // for QPushButton
+#include <QSizePolicy>       // for QSizePolicy
+#include <QSpacerItem>       // for QSpacerItem
+#include <QSpinBox>          // for QSpinBox
+#include <QVBoxLayout>       // for QVBoxLayout
+#include <QVariant>          // for QVariant
+#include <Qt>                // for Orientation
+#include <QtGlobal>          // for qMax, qMin
+#include "help.h"            // for ShowHelp
 
 //------------------------------------------------------------------------
 static void SetSizeStuff(QWidget* w)
diff --git a/gui/optionsdlg.h b/gui/optionsdlg.h
index c10d9ac96..074f2431c 100644
--- a/gui/optionsdlg.h
+++ b/gui/optionsdlg.h
@@ -24,13 +24,16 @@
 #ifndef OPTIONSDLG_H
 #define OPTIONSDLG_H
 
-#include <QDialog>
-#include <QDialogButtonBox>
-#include <QCheckBox>
-#include <QLineEdit>
-#include <QToolButton>
-
-#include "format.h"
+#include <QCheckBox>         // for QCheckBox
+#include <QDialog>           // for QDialog
+#include <QDialogButtonBox>  // for QDialogButtonBox
+#include <QLineEdit>         // for QLineEdit
+#include <QList>             // for QList
+#include <QObject>           // for QObject, Q_OBJECT, slots
+#include <QString>           // for QString
+#include <QToolButton>       // for QToolButton
+#include <QWidget>           // for QWidget
+#include "format.h"          // for FormatOptio
 
 class FileDlgManager: public QObject
 {
diff --git a/gui/preferences.cc b/gui/preferences.cc
index f37c91d76..1cef2afd6 100644
--- a/gui/preferences.cc
+++ b/gui/preferences.cc
@@ -18,6 +18,13 @@
 
 
 #include "preferences.h"
+#include <QAbstractButton>   // for QAbstractButton
+#include <QCheckBox>         // for QCheckBox
+#include <QDialogButtonBox>  // for QDialogButtonBox
+#include <QListWidget>       // for QListWidget
+#include <QListWidgetItem>   // for QListWidgetItem
+#include <QPushButton>       // for QPushButton
+#include <Qt>                // for CheckState
 
 class FormatListEntry : public QListWidgetItem
 {
diff --git a/gui/preferences.h b/gui/preferences.h
index bd293058c..714988158 100644
--- a/gui/preferences.h
+++ b/gui/preferences.h
@@ -19,10 +19,13 @@
 //  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301,
 //  USA.
 
-#include "ui_preferences.h"
-
-#include "babeldata.h"
-#include "format.h"
+#include <QDialog>           // for QDialog
+#include <QList>             // for QList
+#include <QObject>           // for Q_OBJECT, slots
+#include <QWidget>           // for QWidget
+#include "babeldata.h"       // for BabelData
+#include "format.h"          // for Format
+#include "ui_preferences.h"  // for Ui_Preferences
 
 class Preferences : public QDialog
 {
diff --git a/gui/processwait.cc b/gui/processwait.cc
index 5337dba21..ac8afd440 100644
--- a/gui/processwait.cc
+++ b/gui/processwait.cc
@@ -22,17 +22,17 @@
 //------------------------------------------------------------------------
 #include "processwait.h"
 
-#include <QByteArray>                 // for QByteArray
-#include <Qt>                         // for Horizontal, WindowContextHelpButtonHint
-#include <QTextCursor>                // for QTextCursor, QTextCursor::End
-#include <QAbstractButton>            // for QAbstractButton
-#include <QPushButton>                // for QPushButton
-#include <QVBoxLayout>                // for QVBoxLayout
+#include <QAbstractButton>  // for QAbstractButton
+#include <QByteArray>       // for QByteArray
+#include <QPushButton>      // for QPushButton
+#include <QTextCursor>      // for QTextCursor
+#include <QVBoxLayout>      // for QVBoxLayout
+#include <Qt>               // for Orientation, WindowType
 
-#include <cstdlib>                    // for abs
-#include <string>                     // for string
+#include <cstdlib>          // for abs
+#include <string>           // for string
 
-#include "appname.h"                  // for appName
+#include "appname.h"        // for appName
 
 
 //------------------------------------------------------------------------
diff --git a/gui/processwait.h b/gui/processwait.h
index f13f7dc0d..930a3f859 100644
--- a/gui/processwait.h
+++ b/gui/processwait.h
@@ -23,17 +23,17 @@
 #ifndef PROCESSWAIT_H
 #define PROCESSWAIT_H
 
-#include <QByteArray>                  // for QByteArray
-#include <QObject>                     // for QObject
-#include <QProcess>                    // for QProcess, QProcess::ExitStatus, QProcess::ProcessError
-#include <QString>                     // for QString
-#include <QTimer>                      // for QTimer
-#include <QCloseEvent>                 // for QCloseEvent
-#include <QDialog>                     // for QDialog
-#include <QDialogButtonBox>            // for QDialogButtonBox
-#include <QPlainTextEdit>              // for QPlainTextEdit
-#include <QProgressBar>                // for QProgressBar
-#include <QWidget>                     // for QWidget
+#include <QByteArray>        // for QByteArray
+#include <QCloseEvent>       // for QCloseEvent
+#include <QDialog>           // for QDialog
+#include <QDialogButtonBox>  // for QDialogButtonBox
+#include <QObject>           // for Q_OBJECT, slots
+#include <QPlainTextEdit>    // for QPlainTextEdit
+#include <QProcess>          // for QProcess
+#include <QProgressBar>      // for QProgressBar
+#include <QString>           // for QString
+#include <QTimer>            // for QTimer
+#include <QWidget>           // for QWidget
 
 
 //------------------------------------------------------------------------
diff --git a/gui/runmachine.cc b/gui/runmachine.cc
index 7633a06aa..142d45c72 100644
--- a/gui/runmachine.cc
+++ b/gui/runmachine.cc
@@ -19,12 +19,12 @@
 
 #include "runmachine.h"
 
-#include <QDebug>       // for operator<<, QDebug
-#include <QEventLoop>   // for QEventLoop
-#include <Qt>           // for QueuedConnection
-#include <QtGlobal>     // for qDebug
+#include <QDebug>      // for QDebug, operator<<
+#include <QEventLoop>  // for QEventLoop
+#include <Qt>          // for ConnectionType
+#include <QtGlobal>    // for qDebug
 
-#include "appname.h"    // for appName
+#include "appname.h"   // for appName
 
 
 QString RunMachine::decodeProcessError(QProcess::ProcessError err)
diff --git a/gui/runmachine.h b/gui/runmachine.h
index a5330f29e..293260554 100644
--- a/gui/runmachine.h
+++ b/gui/runmachine.h
@@ -22,7 +22,7 @@
 
 #include <QList>          // for QList
 #include <QObject>        // for Q_ENUM, Q_OBJECT, Q_SIGNALS
-#include <QProcess>       // for QProcess, QProcess::ProcessError, QProcess::ExitStatus
+#include <QProcess>       // for QProcess
 #include <QString>        // for QString
 #include <QStringList>    // for QStringList
 #include <QWidget>        // for QWidget
diff --git a/gui/serial_win.cc b/gui/serial_win.cc
index 367428905..26ea09eaa 100644
--- a/gui/serial_win.cc
+++ b/gui/serial_win.cc
@@ -22,6 +22,7 @@
 #include <QComboBox>        // for QComboBox
 #include <QList>            // for QList
 #include <QSerialPortInfo>  // for QSerialPortInfo
+#include <QString>          // for QString
 
 #include "mainwindow.h"     // for MainWindow
 
diff --git a/gui/setting.h b/gui/setting.h
index 28bb13b5b..fd3ba4df5 100644
--- a/gui/setting.h
+++ b/gui/setting.h
@@ -23,8 +23,11 @@
 #ifndef SETTING_H
 #define SETTING_H
 
-#include <QSettings>
-#include <QDate>
+#include <QDateTime>  // for QDateTime
+#include <QList>      // for QList
+#include <QSettings>  // for QSettings
+#include <QString>    // for QAnyStringView::QAnyStringView, QString
+#include <QVariant>   // for QVariant
 
 
 //------------------------------------------------------------------------
diff --git a/gui/upgrade.cc b/gui/upgrade.cc
index 3009b6a72..9dd0afce1 100644
--- a/gui/upgrade.cc
+++ b/gui/upgrade.cc
@@ -29,16 +29,16 @@
 #include <QDomNode>               // for QDomNode
 #include <QDomNodeList>           // for QDomNodeList
 #include <QLocale>                // for QLocale
-#include <QMessageBox>            // for QMessageBox, QMessageBox::Yes, operator|, QMessageBox::No
+#include <QMessageBox>            // for QMessageBox, operator|
 #include <QNetworkAccessManager>  // for QNetworkAccessManager
-#include <QNetworkReply>          // for QNetworkReply, QNetworkReply::NoError
-#include <QNetworkRequest>        // for QNetworkRequest, QNetworkRequest::ContentTypeHeader, QNetworkRequest::HttpReasonPhraseAttribute, QNetworkRequest::HttpStatusCodeAttribute, QNetworkRequest::NoLessSafeRedirectPolicy, QNetworkRequest::RedirectPolicyAttribute, QNetworkRequest::RedirectionTar...
+#include <QNetworkReply>          // for QNetworkReply
+#include <QNetworkRequest>        // for QNetworkRequest
 #include <QSysInfo>               // for QSysInfo
 #include <QUrl>                   // for QUrl
 #include <QVariant>               // for QVariant, operator!=
 #include <QVersionNumber>         // for QVersionNumber, operator<, operator==
-#include <Qt>                     // for ISODate, RichText
-#include <QtGlobal>               // for qDebug, qsizetype, QT_VERSION, QT_VERSION_CHECK
+#include <Qt>                     // for DateFormat, TextFormat
+#include <QtGlobal>               // for qDebug, QT_VERSION, QT_VERSION_CHECK, qsizetype
 
 #include "babeldata.h"            // for BabelData
 #include "format.h"               // for Format
diff --git a/gui/upgrade.h b/gui/upgrade.h
index d5a3780d1..ba02052cf 100644
--- a/gui/upgrade.h
+++ b/gui/upgrade.h
@@ -19,16 +19,16 @@
 
  */
 
-#include <QDateTime>                        // for QDateTime
-#include <QList>                            // for QList
-#include <QObject>                          // for QObject
-#include <QString>                          // for QString
-#include <QUrl>                             // for QUrl
-#include <QNetworkAccessManager>            // for QNetworkAccessManager
-#include <QNetworkReply>                    // for QNetworkReply
-#include <QWidget>                          // for QWidget
-#include "babeldata.h"                      // for BabelData
-#include "format.h"                         // for Format
+#include <QDateTime>              // for QDateTime
+#include <QList>                  // for QList
+#include <QNetworkAccessManager>  // for QNetworkAccessManager
+#include <QNetworkReply>          // for QNetworkReply
+#include <QObject>                // for QObject, Q_OBJECT, slots
+#include <QString>                // for QString
+#include <QUrl>                   // for QUrl
+#include <QWidget>                // for QWidget
+#include "babeldata.h"            // for BabelData
+#include "format.h"               // for Format
 
 
 class UpgradeCheck : public QObject
diff --git a/gui/version_mismatch.cc b/gui/version_mismatch.cc
index 7d2a353a9..653accd3e 100644
--- a/gui/version_mismatch.cc
+++ b/gui/version_mismatch.cc
@@ -21,6 +21,8 @@
 
 #include "version_mismatch.h"
 
+#include <QLabel>  // for QLabel
+
 VersionMismatch::VersionMismatch(QWidget* parent, const QString& ver1,
                                  const QString& ver2): QDialog(parent)
 {
diff --git a/gui/version_mismatch.h b/gui/version_mismatch.h
index 0afe782af..7f551952c 100644
--- a/gui/version_mismatch.h
+++ b/gui/version_mismatch.h
@@ -22,9 +22,12 @@
 #ifndef VERSION_MISMATCH_H
 #define VERSION_MISMATCH_H
 
-#include <QDialog>
+#include <QCheckBox>              // for QCheckBox
+#include <QDialog>                // for QDialog
+#include <QString>                // for QString
+#include <QWidget>                // for QWidget
 
-#include "ui_version_mismatch.h"
+#include "ui_version_mismatch.h"  // for Ui_VersionMismatch
 
 class VersionMismatch: public QDialog
 {