diff --git a/src/Gui/ComboView.h b/src/Gui/ComboView.h
index b63e2cf856..7ef119fe6c 100644
--- a/src/Gui/ComboView.h
+++ b/src/Gui/ComboView.h
@@ -23,7 +23,6 @@
 #ifndef GUI_DOCKWND_COMBOVIEW_H
 #define GUI_DOCKWND_COMBOVIEW_H
 
-#include <Base/Parameter.h>
 #include "DockWindow.h"
 
 
@@ -82,8 +81,8 @@ public:
     friend class Gui::ControlSingleton;
 
 private:
-    Gui::PropertyView                  * prop;
-    Gui::TreePanel                     * tree;
+    Gui::PropertyView * prop;
+    Gui::TreePanel    * tree;
 };
 
 } // namespace DockWnd
diff --git a/src/Gui/DockWindowManager.cpp b/src/Gui/DockWindowManager.cpp
index bf94522cb1..8ae9bb88cf 100644
--- a/src/Gui/DockWindowManager.cpp
+++ b/src/Gui/DockWindowManager.cpp
@@ -36,7 +36,6 @@
 #include <boost/algorithm/string/predicate.hpp>
 
 #include <App/Application.h>
-#include <Base/Console.h>
 #include <Base/Tools.h>
 
 #include "DockWindowManager.h"
diff --git a/src/Gui/OverlayManager.cpp b/src/Gui/OverlayManager.cpp
index 634440d7cb..04deb73581 100644
--- a/src/Gui/OverlayManager.cpp
+++ b/src/Gui/OverlayManager.cpp
@@ -1855,7 +1855,7 @@ bool OverlayManager::eventFilter(QObject *o, QEvent *ev)
 namespace {
 class  MouseGrabberGuard {
 public:
-    MouseGrabberGuard(QWidget *grabber)
+    explicit MouseGrabberGuard(QWidget *grabber)
     {
         if (grabber && grabber == QWidget::mouseGrabber()) {
             _grabber = grabber;
diff --git a/src/Gui/OverlayManager.h b/src/Gui/OverlayManager.h
index e9c01e455c..0e098c2b17 100644
--- a/src/Gui/OverlayManager.h
+++ b/src/Gui/OverlayManager.h
@@ -41,7 +41,7 @@ class GuiExport OverlayManager : public QObject {
     Q_OBJECT
 public:
     OverlayManager();
-    virtual ~OverlayManager();
+    ~OverlayManager() override;
 
     /// restore states
     void restore();
@@ -164,7 +164,7 @@ public:
     class Private;
 
 protected:
-    bool eventFilter(QObject *, QEvent *ev);
+    bool eventFilter(QObject* obj, QEvent* ev) override;
 
     /// Register a named docked widget with an overlay tab widget
     void registerDockWidget(const QString &name, OverlayTabWidget *);
diff --git a/src/Gui/OverlayWidgets.h b/src/Gui/OverlayWidgets.h
index 32831bd7de..66dbad626d 100644
--- a/src/Gui/OverlayWidgets.h
+++ b/src/Gui/OverlayWidgets.h
@@ -299,16 +299,16 @@ public:
 
 protected:
 #if QT_VERSION < QT_VERSION_CHECK(6,0,0)
-    void enterEvent(QEvent*);
+    void enterEvent(QEvent* ev) override;
 #else
-    void enterEvent(QEnterEvent*);
+    void enterEvent(QEnterEvent* ev) override;
 #endif
-    void leaveEvent(QEvent*);
-    void changeEvent(QEvent*);
-    void resizeEvent(QResizeEvent*);
-    void paintEvent(QPaintEvent *);
-    bool event(QEvent *ev);
-    bool eventFilter(QObject *, QEvent *ev);
+    void leaveEvent(QEvent* ev) override;
+    void changeEvent(QEvent* ev) override;
+    void resizeEvent(QResizeEvent* ev) override;
+    void paintEvent(QPaintEvent* ev) override;
+    bool event(QEvent* ev) override;
+    bool eventFilter(QObject* obj, QEvent* ev) override;
 
     void retranslate();
     void refreshIcons();
@@ -388,6 +388,7 @@ private:
     std::map<QDockWidget *, int> _sizemap;
     bool _saving = false;
 
+    // NOLINTBEGIN
     static OverlayDragFrame *_DragFrame;
     static QDockWidget *_DragFloating;
     static QWidget *_Dragging;
@@ -395,6 +396,7 @@ private:
     static OverlayTabWidget *_RightOverlay;
     static OverlayTabWidget *_TopOverlay;
     static OverlayTabWidget *_BottomOverlay;
+    // NOLINTEND
 };
 
 /// A translucent frame as a visual indicator when dragging a dock widget
@@ -402,12 +404,12 @@ class OverlayDragFrame: public QWidget
 {
     Q_OBJECT
 public:
-    OverlayDragFrame(QWidget * parent);
-    QSize sizeHint() const;
-    QSize minimumSizeHint() const;
+    explicit OverlayDragFrame(QWidget * parent);
+    QSize sizeHint() const override;
+    QSize minimumSizeHint() const override;
 
 protected:
-    void paintEvent(QPaintEvent*);
+    void paintEvent(QPaintEvent* ev) override;
 };
 
 /// Title bar for OverlayTabWidget
@@ -415,17 +417,17 @@ class OverlayTitleBar: public QWidget
 {
     Q_OBJECT
 public:
-    OverlayTitleBar(QWidget * parent);
+    explicit OverlayTitleBar(QWidget * parent);
     void setTitleItem(QLayoutItem *);
     void endDrag();
 
 protected:
-    void mouseMoveEvent(QMouseEvent *);
-    void mousePressEvent(QMouseEvent *);
-    void mouseReleaseEvent(QMouseEvent *);
-    void paintEvent(QPaintEvent*);
-    void keyPressEvent(QKeyEvent *ke);
-    void timerEvent(QTimerEvent *);
+    void mouseMoveEvent(QMouseEvent* ev) override;
+    void mousePressEvent(QMouseEvent* ev) override;
+    void mouseReleaseEvent(QMouseEvent* ev) override;
+    void paintEvent(QPaintEvent* ev) override;
+    void keyPressEvent(QKeyEvent* ke) override;
+    void timerEvent(QTimerEvent* te) override;
 
 private:
     QPoint dragOffset;
@@ -449,10 +451,10 @@ Q_SIGNALS:
     void dragMove(const QPoint &globalPos);
 
 protected:
-    void paintEvent(QPaintEvent*);
-    void mouseMoveEvent(QMouseEvent *);
-    void mousePressEvent(QMouseEvent *);
-    void mouseReleaseEvent(QMouseEvent *);
+    void paintEvent(QPaintEvent* ev) override;
+    void mouseMoveEvent(QMouseEvent* ev) override;
+    void mousePressEvent(QMouseEvent* ev) override;
+    void mouseReleaseEvent(QMouseEvent* ev) override;
     const QPixmap &pixmap() const;
 
 private:
@@ -464,11 +466,11 @@ class OverlaySplitter : public QSplitter
 {
     Q_OBJECT
 public:
-    OverlaySplitter(QWidget *parent);
+    explicit OverlaySplitter(QWidget *parent);
     void retranslate();
 
 protected:
-    virtual QSplitterHandle *createHandle();
+    QSplitterHandle *createHandle() override;
 };
 
 
@@ -491,19 +493,19 @@ public:
 
 protected:
 #if QT_VERSION < QT_VERSION_CHECK(6,0,0)
-    virtual void enterEvent(QEvent *);
+    void enterEvent(QEvent* ev) override;
 #else
-    virtual void enterEvent(QEnterEvent *);
+    void enterEvent(QEnterEvent* ev) override;
 #endif
-    virtual void showEvent(QShowEvent *);
-    virtual void leaveEvent(QEvent *);
-    virtual void paintEvent(QPaintEvent*);
-    virtual void changeEvent(QEvent*);
-    virtual void mouseMoveEvent(QMouseEvent *);
-    virtual void mousePressEvent(QMouseEvent *);
-    virtual void mouseReleaseEvent(QMouseEvent *);
-    virtual void keyPressEvent(QKeyEvent *);
-    virtual QSize sizeHint() const;
+    void showEvent(QShowEvent* ev) override;
+    void leaveEvent(QEvent* ev) override;
+    void paintEvent(QPaintEvent* ev) override;
+    void changeEvent(QEvent* ev) override;
+    void mouseMoveEvent(QMouseEvent* ev) override;
+    void mousePressEvent(QMouseEvent* ev) override;
+    void mouseReleaseEvent(QMouseEvent* ev) override;
+    void keyPressEvent(QKeyEvent* ev) override;
+    QSize sizeHint() const override;
 
 protected:
     void onAction();
@@ -526,7 +528,7 @@ class OverlayToolButton: public QToolButton
 {
     Q_OBJECT
 public:
-    OverlayToolButton(QWidget *parent);
+    explicit OverlayToolButton(QWidget *parent);
 };
 
 /** Class for handling visual hint for bringing back hidden overlay dock widget
@@ -545,7 +547,7 @@ class OverlayProxyWidget: public QWidget
     Q_PROPERTY(QBrush hintColor READ hintColor WRITE setHintColor) // clazy:exclude=qproperty-without-notify
 
 public:
-    OverlayProxyWidget(OverlayTabWidget *);
+    explicit OverlayProxyWidget(OverlayTabWidget *);
 
     OverlayTabWidget *getOwner() const {return owner;}
 
@@ -576,19 +578,19 @@ public:
 
 protected:
 #if QT_VERSION < QT_VERSION_CHECK(6,0,0)
-    void enterEvent(QEvent*);
+    void enterEvent(QEvent* ev) override;
 #else
-    void enterEvent(QEnterEvent*);
+    void enterEvent(QEnterEvent* ev) override;
 #endif
-    void hideEvent(QHideEvent*);
-    void paintEvent(QPaintEvent*);
+    void hideEvent(QHideEvent* ev) override;
+    void paintEvent(QPaintEvent* ev) override;
 
 protected:
     void onTimer();
 
 private:
     OverlayTabWidget* owner;
-    int drawLine = false;
+    bool drawLine = false;
     int dockArea;
     QTimer timer;
     QBrush _hintColor;
@@ -602,10 +604,10 @@ class OverlayGraphicsEffect: public QGraphicsEffect
 {
     Q_OBJECT
 public:
-    OverlayGraphicsEffect(QObject *parent);
+    explicit OverlayGraphicsEffect(QObject *parent);
 
-    virtual void draw(QPainter* painter);
-    virtual QRectF boundingRectFor(const QRectF& rect) const;
+    void draw(QPainter* painter) override;
+    QRectF boundingRectFor(const QRectF& rect) const override;
 
     inline void setSize(const QSize &size)
         { if(_size!=size){_size = size; updateBoundingRect(); } }
diff --git a/src/Gui/Tree.cpp b/src/Gui/Tree.cpp
index 3fa911e9b0..57b7024c2a 100644
--- a/src/Gui/Tree.cpp
+++ b/src/Gui/Tree.cpp
@@ -364,7 +364,7 @@ namespace Gui {
 class TreeWidgetItemDelegate: public QStyledItemDelegate {
     typedef QStyledItemDelegate inherited;
 public:
-    TreeWidgetItemDelegate(QObject* parent=0);
+    explicit TreeWidgetItemDelegate(QObject* parent=nullptr);
 
     virtual QWidget* createEditor(QWidget *parent,
             const QStyleOptionViewItem &, const QModelIndex &index) const;
diff --git a/src/Gui/Widgets.cpp b/src/Gui/Widgets.cpp
index 64855bd53d..c12b70bbd5 100644
--- a/src/Gui/Widgets.cpp
+++ b/src/Gui/Widgets.cpp
@@ -40,7 +40,6 @@
 # include <QToolTip>
 #endif
 
-#include <Base/Console.h>
 #include <Base/Tools.h>
 #include <Base/Exception.h>
 #include <Base/Interpreter.h>